Anand Doshi
7e9048570e
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
controllers/selling_controller.py
patches/patch_list.py
selling/doctype/lead/lead.py
selling/doctype/opportunity/opportunity.py
selling/doctype/quotation/quotation.py
selling/doctype/quotation/quotation.txt
selling/doctype/sales_order/sales_order.txt
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
2013-10-15 12:18:46 +05:30
..
2013-10-02 16:29:45 +05:30
2013-10-02 16:40:14 +05:30
2013-10-10 16:04:40 +05:30
2013-10-03 18:12:36 +05:30
2013-10-03 19:32:23 +05:30
2013-10-04 13:33:24 +05:30
2013-10-10 12:03:11 +05:30
2013-10-14 18:59:16 +05:30
2013-10-10 16:04:40 +05:30
2013-10-10 19:07:42 +05:30
2013-10-11 18:31:33 +05:30
2013-10-10 16:04:40 +05:30