diff --git a/erpnext/domains/stocks.yaml b/erpnext/domains/stocks.yaml index 09acac69be9465ed2607ce243d8c34a156f707b6..1ab3f3c6bf21d3d9db13897956a387eac77a398c 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 cfe62b16b119414377b8da48076e6965238b0864..c45f7b07339a7b9b9358b98b3dd39bb718117feb 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(): setup_address_and_contact_permissions() 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 165e7a24f6f8c3c410780c0af88f2280f617af8b..d8d1691fb6889af5eed0a388d37c3a953cf5e91b 100644 --- a/erpnext/setup/setup_wizard/operations/install_fixtures.py +++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py @@ -32,12 +32,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