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
..
js	[fix] [minor] take correct docname when creating contact/address from a previous document	2013-08-14 17:22:14 +05:30
__init__.py	fixes in tax controller and test purchase receipt	2012-12-04 11:49:37 +05:30
accounts_controller.py	Merge branch 'master' of github.com:webnotes/erpnext into wsgi	2013-10-15 12:18:46 +05:30
buying_controller.py	Merge branch 'master' of github.com:webnotes/erpnext into wsgi	2013-10-15 12:18:46 +05:30
queries.py	[usability] item price moved to price list	2013-09-11 13:05:24 +05:30
selling_controller.py	Merge branch 'master' of github.com:webnotes/erpnext into wsgi	2013-10-15 12:18:46 +05:30
status_updater.py	[minor] [fix] status updater, only change communication status when called explicitly	2013-10-04 13:33:24 +05:30
stock_controller.py	[fix] [minor] perpetual inventory: account for each warehouse	2013-09-17 15:15:16 +05:30
trends.py	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30