brotherton-erpnext

History

Anand Doshi 0dc79f4de0 Merge remote-tracking branch 'frappe/v4.x.x' into develop

Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py

2015-04-06 13:21:07 +05:30

doctype

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

page

[breadcrumbs] refactor

2015-03-09 15:48:16 +05:30

report

minor fixes

2015-04-05 17:18:07 +05:30

__init__.py

moved modules inside erpnext folder