Anand Doshi 70902da4da Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: patches/december_2012/deprecate_tds.py patches/june_2012/reports_list_permission.py selling/doctype/sales_bom/locale/_messages_doc.json selling/doctype/sales_bom/locale/ar-doc.json selling/doctype/sales_bom/locale/de-doc.json selling/doctype/sales_bom/locale/es-doc.json selling/doctype/sales_bom/locale/fr-doc.json selling/doctype/sales_bom/locale/hi-doc.json selling/doctype/sales_bom/locale/hr-doc.json selling/doctype/sales_bom/locale/nl-doc.json selling/doctype/sales_bom/locale/pt-BR-doc.json selling/doctype/sales_bom/locale/pt-doc.json selling/doctype/sales_bom/locale/sr-doc.json selling/doctype/sales_bom/locale/ta-doc.json selling/doctype/sales_bom/locale/th-doc.json selling/doctype/sales_bom_item/locale/_messages_doc.json selling/doctype/sales_bom_item/locale/ar-doc.json selling/doctype/sales_bom_item/locale/de-doc.json selling/doctype/sales_bom_item/locale/es-doc.json selling/doctype/sales_bom_item/locale/fr-doc.json selling/doctype/sales_bom_item/locale/hi-doc.json selling/doctype/sales_bom_item/locale/hr-doc.json selling/doctype/sales_bom_item/locale/nl-doc.json selling/doctype/sales_bom_item/locale/pt-BR-doc.json selling/doctype/sales_bom_item/locale/pt-doc.json selling/doctype/sales_bom_item/locale/sr-doc.json selling/doctype/sales_bom_item/locale/ta-doc.json selling/doctype/sales_bom_item/locale/th-doc.json		2013-06-26 14:07:29 +05:30
..
campaign	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
customer	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
industry_type	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
installation_note	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
installation_note_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
lead	[email] [fix] decode subject	2013-06-25 16:21:58 +05:30
opportunity	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
opportunity_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
quotation	[shopping cart] show items, editable qty and show amount for that item	2013-06-19 17:19:20 +05:30
quotation_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
sales_bom	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-26 14:07:29 +05:30
sales_bom_item	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-26 14:07:29 +05:30
sales_common	[bug fixes] [global defaults] [cleanup]	2013-06-24 18:18:46 +05:30
sales_order	[merge]	2013-06-24 15:47:02 +05:30
sales_order_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
sales_team	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
selling_settings	[global defaults] breakup added buying settings and selling settings	2013-06-25 11:54:37 +05:30
sms_center	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-26 14:07:29 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30