fix: removed unrelated code modification

(cherry picked from commit 360c3b36ed)
This commit is contained in:
Khushi Rawat
2024-05-10 14:39:59 +05:30
committed by Mergify
parent 9b3f309598
commit 0aca1e8e05
3 changed files with 4 additions and 13 deletions

View File

@@ -15,7 +15,6 @@
"asset_owner_company",
"is_existing_asset",
"is_composite_asset",
"is_composite_component",
"supplier",
"customer",
"image",
@@ -203,7 +202,8 @@
"fieldname": "purchase_date",
"fieldtype": "Date",
"label": "Purchase Date",
"mandatory_depends_on": "eval:!doc.is_existing_asset && !doc.is_composite_asset"
"mandatory_depends_on": "eval:!doc.is_existing_asset && !doc.is_composite_asset",
"read_only_depends_on": "eval:!doc.is_existing_asset && !doc.is_composite_asset"
},
{
"fieldname": "disposal_date",
@@ -234,7 +234,7 @@
"fieldname": "available_for_use_date",
"fieldtype": "Date",
"label": "Available-for-use Date",
"mandatory_depends_on": "eval:(!doc.is_composite_component && doc.docstatus==1)"
"mandatory_depends_on": "eval:(!doc.is_composite_asset || doc.docstatus==1)"
},
{
"default": "0",
@@ -509,7 +509,7 @@
},
{
"default": "0",
"depends_on": "eval:(!doc.is_existing_asset && !doc.is_composite_component)",
"depends_on": "eval:!doc.is_existing_asset",
"fieldname": "is_composite_asset",
"fieldtype": "Check",
"label": "Is Composite Asset"
@@ -538,13 +538,6 @@
"options": "Company:company:default_currency",
"read_only": 1
},
{
"default": "0",
"depends_on": "eval:(!doc.is_existing_asset && !doc.is_composite_asset)",
"fieldname": "is_composite_component",
"fieldtype": "Check",
"label": "Is Composite Component"
},
{
"fieldname": "purchase_amount",
"fieldtype": "Currency",

View File

@@ -80,7 +80,6 @@ class Asset(AccountsController):
insured_value: DF.Data | None
insurer: DF.Data | None
is_composite_asset: DF.Check
is_composite_component: DF.Check
is_existing_asset: DF.Check
is_fully_depreciated: DF.Check
item_code: DF.Link

View File

@@ -617,7 +617,6 @@ class AssetCapitalization(StockController):
asset_doc.purchase_date = self.posting_date
asset_doc.gross_purchase_amount = total_target_asset_value
asset_doc.purchase_amount = total_target_asset_value
asset_doc.purchase_amount = total_target_asset_value
asset_doc.capitalized_in = self.name
asset_doc.flags.ignore_validate = True
asset_doc.flags.asset_created_via_asset_capitalization = True