diff --git a/erpnext/domains/stocks.yaml b/erpnext/domains/stocks.yaml index cc26f7c8727ce6d7d6fee6d7f0ed63d18bc7ba92..09f3696a5eb89bcc335bc89b725232a6fabad8c4 100644 --- a/erpnext/domains/stocks.yaml +++ b/erpnext/domains/stocks.yaml @@ -25,7 +25,7 @@ restricted_fields: - default_warehouse -properties: +disabled_properties: - doctype: "Sales Invoice Item" fieldname: "conversion_factor" property: "default" diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index 69702676e84376a9b5458e39f71704798081b1fd..0b57aa072f105ba5752198e01a915b49aa2cd49b 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -4,6 +4,7 @@ import click import frappe from frappe import _ +from frappe.core.doctype.domain_settings.domain_settings import update_domains from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to from frappe.modules.utils import sync_customizations_for_doctype @@ -37,6 +38,7 @@ def after_install(): hide_workspaces() update_roles() make_default_operations() + update_domains() frappe.db.commit() diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py index 23ca929e417f5561f19577e6dec0d8dc6417f80f..0442cb8cd13af5698fca30f9a8cefef42eaabf03 100644 --- a/erpnext/setup/setup_wizard/operations/install_fixtures.py +++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py @@ -25,12 +25,6 @@ def read_lines(filename: str) -> list[str]: def install(country=None): records = [ - # domains - {"doctype": "Domain", "domain": "Accounting"}, - {"doctype": "Domain", "domain": "Manufacturing"}, - {"doctype": "Domain", "domain": "Stocks"}, - {"doctype": "Domain", "domain": "Assets"}, - {"doctype": "Domain", "domain": "Quality"}, # ensure at least an empty Address Template exists for this Country {"doctype": "Address Template", "country": country}, # item group