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

4_0 patch dir renamed to v4_0

2014-05-12 17:44:55 +05:30

apply_user_permissions.py

Moved flags like ignore_mandatory, ignore_validate etc to doc.flags

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

countrywise_coa.py

4_0 patch dir renamed to v4_0

2014-05-12 17:44:55 +05:30

create_custom_fields_for_india_specific_fields.py

[refactor modules]

2014-09-16 15:08:02 +05:30

create_price_list_if_missing.py

Table Field Renaming: code replace, JV and budget distribution renamed

2014-12-25 16:01:55 +05:30

customer_discount_to_pricing_rule.py

Fix in pricing rule patch

2014-06-24 15:26:40 +05:30

fields_to_be_renamed.py

Reports and print formats modified for renamed fields

2014-05-13 16:12:37 +05:30

fix_address_template.py

Fixed Address Template

2014-06-06 17:07:50 +05:30

fix_case_of_hr_module_def.py

Fix in HR patch

2014-06-09 15:04:00 +05:30

fix_contact_address.py

[fix] Added unicode_literals if missing in py files

2015-02-24 12:24:53 +05:30

fix_employee_user_id.py

Fixes in user permissions patches

2014-06-04 17:48:56 +05:30

global_defaults_to_system_settings.py

Moved flags like ignore_mandatory, ignore_validate etc to doc.flags

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

import_country_codes.py

[refactor modules]

2014-09-16 15:08:02 +05:30

map_charge_to_taxes_and_charges.py

4_0 patch dir renamed to v4_0

2014-05-12 17:44:55 +05:30

move_warehouse_user_to_restrictions.py

Role and User Permissions

2014-06-04 17:48:54 +05:30

new_address_template.py

[fix] Added unicode_literals if missing in py files

2015-02-24 12:24:53 +05:30

reload_sales_print_format.py

[patch] remove reloading of removed print formats

2014-07-31 14:31:58 +05:30

remove_employee_role_if_no_employee.py

Fixes in patches for migration

2014-06-04 17:48:56 +05:30

remove_module_home_pages.py

4_0 patch dir renamed to v4_0

2014-05-12 17:44:55 +05:30

rename_sitemap_to_route.py

[fix] Added unicode_literals if missing in py files

2015-02-24 12:24:53 +05:30

reset_permissions_for_masters.py

[rename] Support Ticket -> Issue

2014-11-28 11:46:10 +05:30

save_default_letterhead.py

Save default letterhead

2014-06-09 18:01:14 +05:30

set_naming_series_property_setter.py

Fixes for discount amount

2015-02-24 10:02:27 +05:30

set_pricing_rule_for_buying_or_selling.py

Reload pricing rule in patch

2014-06-20 16:30:44 +05:30

split_email_settings.py

[mailbox] removed separate email settings for jobs, sales, support

2014-09-16 15:12:18 +05:30

update_account_root_type.py

hotfix: update_account_root_type.py patch

2014-05-28 15:22:34 +05:30

update_custom_print_formats_for_renamed_fields.py

update custom print formats for renamed fields

2014-06-10 10:41:37 +05:30

update_incharge_name_to_sales_person_in_maintenance_schedule.py

Table Field Renaming: code replace, JV and budget distribution renamed

2014-12-25 16:01:55 +05:30

update_other_charges_in_custom_purchase_print_formats.py

Table Field Renaming: code replace, JV and budget distribution renamed

2014-12-25 16:01:55 +05:30

update_tax_amount_after_discount.py

Reload sales taxes and charges in patch

2014-06-10 14:52:49 +05:30

update_user_properties.py

Role and User Permissions

2014-06-04 17:48:54 +05:30

update_users_report_view_settings.py

Patch: update users report view settings for rename fields

2014-06-18 10:29:53 +05:30

validate_v3_patch.py

4_0 patch dir renamed to v4_0

2014-05-12 17:44:55 +05:30