Anand Doshi 5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi ... Conflicts: accounts/doctype/account/account.py accounts/doctype/gl_entry/gl_entry.py accounts/doctype/period_closing_voucher/period_closing_voucher.py stock/doctype/delivery_note/delivery_note.py stock/doctype/landed_cost_wizard/landed_cost_wizard.py stock/doctype/purchase_receipt/purchase_receipt.py stock/doctype/stock_ledger/stock_ledger.py stock/doctype/warehouse/warehouse.py stock/stock_ledger.py		2013-09-25 19:55:41 +05:30
..
bom	mass replace sql with webnotes.conn.sql	2013-09-18 12:20:53 +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-09-25 19:55:41 +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	mass replace sql with webnotes.conn.sql	2013-09-18 12:20:53 +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