Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats 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)
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