Anand Doshi
4543884021
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
selling/doctype/quotation/quotation.txt
selling/doctype/quotation_item/quotation_item.txt
selling/doctype/sales_order_item/sales_order_item.txt
stock/doctype/delivery_note_item/delivery_note_item.txt
stock/doctype/item/item.txt
2013-05-23 15:22:47 +05:30
..
2013-05-23 15:22:47 +05:30
2013-02-20 18:44:10 +05:30
2013-05-13 16:29:28 +05:30
2012-12-11 15:20:53 +05:30
2013-05-13 16:29:28 +05:30
2013-02-18 13:49:15 +05:30
2013-01-16 17:48:17 +05:30
2013-05-21 19:35:06 +05:30