From afefae08afa57d68fc72b1ee385b3c315878e8b1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 10 Jan 2024 11:59:54 +0530 Subject: [PATCH] fix: Resolved conflict --- erpnext/assets/doctype/asset/asset.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py index d2d859a9eb..a7e6ae9afb 100644 --- a/erpnext/assets/doctype/asset/asset.py +++ b/erpnext/assets/doctype/asset/asset.py @@ -316,16 +316,12 @@ class Asset(AccountsController): frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError) if is_cwip_accounting_enabled(self.asset_category): -<<<<<<< HEAD - if not self.is_existing_asset and not (self.purchase_receipt or self.purchase_invoice): -======= if ( not self.is_existing_asset and not self.is_composite_asset and not self.purchase_receipt and not self.purchase_invoice ): ->>>>>>> c34f09c503 (fix: Purchase date and amount is not mandatory for composite asset creation) frappe.throw( _("Please create purchase receipt or purchase invoice for the item {0}").format( self.item_code