diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 0c8e485f620..d3deb06b5b7 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -13,7 +13,7 @@ from erpnext.accounts.party import get_party_account_currency, validate_party_fr from erpnext.exceptions import InvalidCurrency from six import text_type -force_item_fields = ("item_group", "brand", "stock_uom") +force_item_fields = ("item_group", "brand", "stock_uom", "is_fixed_asset") class AccountsController(TransactionBase): def __init__(self, *args, **kwargs): diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index 45b9d785bff..771687962c6 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -586,6 +586,7 @@ class BuyingController(StockController): asset.supplier = None asset.flags.ignore_validate_update_after_submit = True + asset.flags.ignore_mandatory = True if asset.docstatus == 0: asset.flags.ignore_validate = True