Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8e332ffd16
brotherton-erpnext/erpnext/projects
History
Anand Doshi 8e332ffd16 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 
Conflicts:
	erpnext/accounts/page/accounts_browser/accounts_browser.css
	erpnext/controllers/buying_controller.py
	erpnext/manufacturing/doctype/production_order/production_order.py
	erpnext/patches/patch_list.py
	erpnext/selling/doctype/customer/customer.txt
	erpnext/selling/doctype/sales_order/sales_order.py
	erpnext/selling/doctype/sales_order/test_sales_order.py
	erpnext/setup/doctype/features_setup/features_setup.txt
	erpnext/stock/doctype/stock_entry/test_stock_entry.py
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	startup/query_handlers.py
2013-12-26 19:12:51 +05:30
..
doctype Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions 2013-12-26 19:12:51 +05:30
page moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
report moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
__init__.py moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30
utils.py moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30