schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Resolved conflict

Browse Source
This commit is contained in:
Nabin Hait
2024-01-10 11:59:54 +05:30
committed by GitHub
parent d6d54ed220
commit afefae08af
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/assets/doctype/asset/asset.py
View File

@@ -316,16 +316,12 @@ class Asset(AccountsController):
frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError) frappe.throw(_("Gross Purchase Amount is mandatory"), frappe.MandatoryError)
if is_cwip_accounting_enabled(self.asset_category): 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 ( if (
not self.is_existing_asset not self.is_existing_asset
and not self.is_composite_asset and not self.is_composite_asset
and not self.purchase_receipt and not self.purchase_receipt
and not self.purchase_invoice and not self.purchase_invoice
): ):
>>>>>>> c34f09c503 (fix: Purchase date and amount is not mandatory for composite asset creation)
frappe.throw( frappe.throw(
_("Please create purchase receipt or purchase invoice for the item {0}").format( _("Please create purchase receipt or purchase invoice for the item {0}").format(
self.item_code self.item_code