d35354cc06
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 |
||
---|---|---|
.. | ||
__init__.py | ||
apply_user_permissions.py | ||
countrywise_coa.py | ||
create_custom_fields_for_india_specific_fields.py | ||
create_price_list_if_missing.py | ||
customer_discount_to_pricing_rule.py | ||
fields_to_be_renamed.py | ||
fix_address_template.py | ||
fix_case_of_hr_module_def.py | ||
fix_contact_address.py | ||
fix_employee_user_id.py | ||
global_defaults_to_system_settings.py | ||
import_country_codes.py | ||
map_charge_to_taxes_and_charges.py | ||
move_warehouse_user_to_restrictions.py | ||
new_address_template.py | ||
reload_sales_print_format.py | ||
remove_employee_role_if_no_employee.py | ||
remove_module_home_pages.py | ||
rename_sitemap_to_route.py | ||
reset_permissions_for_masters.py | ||
save_default_letterhead.py | ||
set_naming_series_property_setter.py | ||
set_pricing_rule_for_buying_or_selling.py | ||
split_email_settings.py | ||
update_account_root_type.py | ||
update_custom_print_formats_for_renamed_fields.py | ||
update_incharge_name_to_sales_person_in_maintenance_schedule.py | ||
update_other_charges_in_custom_purchase_print_formats.py | ||
update_tax_amount_after_discount.py | ||
update_user_properties.py | ||
update_users_report_view_settings.py | ||
validate_v3_patch.py |