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
..
batch	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
bin	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
delivery_note	[patch] breakup global defaults	2013-06-25 11:46:07 +05:30
delivery_note_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
delivery_note_packing_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
item	[webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods	2013-06-17 15:42:38 +05:30
item_customer_detail	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
item_price	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
item_quality_inspection_parameter	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
item_reorder	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
item_supplier	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
item_tax	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
item_website_specification	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
landed_cost_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
landed_cost_purchase_receipt	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
landed_cost_wizard	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
material_request	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
material_request_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
packing_slip	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
packing_slip_item	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
purchase_receipt	[patch] breakup global defaults	2013-06-25 11:46:07 +05:30
purchase_receipt_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
serial_no	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-21 12:22:52 +05:30
stock_entry	[bug fixes] [global defaults] [cleanup]	2013-06-24 18:18:46 +05:30
stock_entry_detail	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
stock_ledger	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
stock_ledger_entry	[bug fixes] [global defaults] [cleanup]	2013-06-24 18:18:46 +05:30
stock_reconciliation	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
stock_settings	[bug fixes] [global defaults] [cleanup]	2013-06-24 18:18:46 +05:30
stock_uom_replace_utility	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
uom_conversion_detail	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
warehouse	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
warehouse_user	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30