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

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
commit d54a4741a9
2 changed files with 2 additions and 2 deletions

View File

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

View File

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