brotherton-erpnext

History

Anand Doshi d35354cc06 Merge remote-tracking branch 'frappe/develop' into v5.0

Conflicts:
	erpnext/__version__.py
	erpnext/accounts/doctype/budget_distribution/test_budget_distribution.py
	erpnext/accounts/doctype/chart_of_accounts/charts/account_properties.py
	erpnext/hooks.py
	erpnext/patches.txt
	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
	erpnext/stock/get_item_details.py
	erpnext/translations/ar.csv
	erpnext/translations/bs.csv
	erpnext/translations/ca.csv
	erpnext/translations/el.csv
	erpnext/translations/es.csv
	erpnext/translations/fr.csv
	erpnext/translations/hr.csv
	erpnext/translations/id.csv
	erpnext/translations/is.csv
	erpnext/translations/ja.csv
	erpnext/translations/nl.csv
	erpnext/translations/pl.csv
	erpnext/translations/pt-BR.csv
	erpnext/translations/ru.csv
	erpnext/translations/tr.csv
	erpnext/translations/zh-cn.csv
	erpnext/translations/zh-tw.csv
	setup.py

2015-02-24 18:12:17 +05:30

__init__.py

Item, Item Group and Partner Web Page generators moved from Shopping Cart to ERPNext

2014-04-18 16:20:07 +05:30

address.html

shopping cart fix

2014-10-27 11:03:09 +05:30

address.py

Moved flags like ignore_mandatory, ignore_validate etc to doc.flags

2015-02-10 14:41:27 +05:30

addresses.html

[minor] auto-create Fiscal Year, loading, general ledger