Bárbara Perretti 4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n ... Conflicts: accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js public/js/complete_setup.js selling/doctype/opportunity/opportunity.js selling/doctype/quotation/quotation.js		2013-10-16 15:09:18 -03:00
..
bom	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
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 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
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	Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n	2013-10-16 15:09:18 -03:00
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