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-02-27 17:36:23 +01:00
2012-09-24 19:13:42 +05:30
2013-05-08 17:40:35 +05:30
2013-05-22 16:19:10 +05:30
2013-05-23 15:22:47 +05:30
2013-05-02 14:46:12 +05:30