commit d54a4741a9f938028e1ddd23e2ac47ce8c7dc2e5
author Anand Doshi <anand@erpnext.com> Wed Apr 24 12:02:54 2013 +0530
committer Anand Doshi <anand@erpnext.com> Wed Apr 24 12:02:54 2013 +0530
tree 7f5e6921390424e08c10b8de3ed642bdd02e082e
parent a5d19955d1dba159694670d61bfad92c30efdba7
parent deb31432ddc96932c757d1fe866f7532ce2db499

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

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt

accounts/doctype/sales_invoice/sales_invoice.txt

diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index d15f2a9..9d8f54e 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -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"
  }, 

stock/doctype/item/item.txt

diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index 5461b3b..5c2f48d 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -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"
  },