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
..
april_2012	first cut error fixes	2013-01-09 15:23:05 +05:30
april_2013	[webshop] territories in price list, taxes, updates in shopping cart settings	2013-06-21 17:55:31 +05:30
august_2012	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30
december_2012	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30
february_2013	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30
january_2013	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30
july_2012	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30
june_2012	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30
june_2013	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-26 14:07:29 +05:30
mar_2012	[patches] [fix] replace sync with reload_doc in old patches	2013-05-16 15:28:19 +05:30
march_2013	fixe sin patch	2013-04-11 16:02:06 +05:30
may_2012	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30
may_2013	[fixes][merge conflict]	2013-06-05 12:53:53 +05:30
november_2012	[cleanup] deprecated search criteria, amendment_date, cancel_reason	2013-06-11 16:23:18 +05:30
october_2012	[cleanup] deprecated search criteria, amendment_date, cancel_reason	2013-06-11 16:23:18 +05:30
september_2012	[merge]	2013-06-24 15:47:02 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30
patch_list.py	[reports][fix] removed old reports	2013-06-25 12:17:43 +05:30