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

repair_tools

[rename] Customer Issue -> Warranty Claim

2015-02-17 10:45:50 +05:30

v4_0

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

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

v4_1

some fixes for renaming patch

2015-01-01 13:40:54 +05:30

v4_2

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