nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Browse Source 
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
This commit is contained in:
Anand Doshi
2013-04-24 12:02:54 +05:30
parent a5d19955d1 deb31432dd
commit d54a4741a9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/sales_invoice/sales_invoice.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-04-19 11:00:14", "creation": "2013-04-19 11:00:14",
"docstatus": 0, "docstatus": 0,
"modified": "2013-04-22 11:59:28", "modified": "2013-04-22 11:59:40",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },

2
stock/doctype/item/item.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-03-28 15:56:38", "creation": "2013-03-28 15:56:38",
"docstatus": 0, "docstatus": 0,
"modified": "2013-04-23 11:44:39", "modified": "2013-04-23 11:44:50",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },