brotherton-erpnext/manufacturing
Anand Doshi 7e9048570e Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	controllers/selling_controller.py
	patches/patch_list.py
	selling/doctype/lead/lead.py
	selling/doctype/opportunity/opportunity.py
	selling/doctype/quotation/quotation.py
	selling/doctype/quotation/quotation.txt
	selling/doctype/sales_order/sales_order.txt
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py
2013-10-15 12:18:46 +05:30
..
doctype Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-10-15 12:18:46 +05:30
page [manufacturing] Added New Reports 2013-08-12 14:18:09 +05:30
report [manufacturing] Added New Reports 2013-08-12 14:18:09 +05:30
__init__.py install from txt files, part 1 2013-01-16 17:48:17 +05:30
README.md [docs] added for manufacturing module 2013-06-11 14:36:48 +05:30

Plan and manage manufacturing operations, bill of materials for manufacturing.