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
..
bom	[material request] Added feature to pull items from BOM	2013-10-11 14:34:46 +05:30
bom_explosion_item	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
bom_item	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
bom_operation	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
bom_replace_tool	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
production_order	Merge branch 'master' of github.com:webnotes/erpnext into wsgi	2013-10-15 12:18:46 +05:30
production_plan_item	[Production Order] [minor] Cleanup	2013-08-08 14:16:39 +05:30
production_plan_sales_order	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
production_planning_tool	[wsgi] [minor] fixed flags	2013-10-08 18:23:05 +05:30
workstation	mass replace sql with webnotes.conn.sql	2013-09-18 12:20:53 +05:30
__init__.py	merge, fixed production cleanup patch	2012-12-10 19:28:38 +05:30