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
..
stock_ageing	[docs] added for stock module	2013-06-11 12:04:01 +05:30
stock_analytics	[docs] added for stock module	2013-06-11 12:04:01 +05:30
stock_balance	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-26 14:07:29 +05:30
stock_home	[patch] breakup global defaults	2013-06-25 11:46:07 +05:30
stock_ledger	[docs] added for stock module	2013-06-11 12:04:01 +05:30
stock_level	[docs] added for stock module	2013-06-11 12:04:01 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30