Skip to content

Commit

Permalink
Merge pull request #39279 from frappe/mergify/bp/version-15-hotfix/pr…
Browse files Browse the repository at this point in the history
…-39191

fix: Ignore asset qty and status validation while cancelling LCV (backport #39191)
  • Loading branch information
nabinhait authored Jan 10, 2024
2 parents 24cfcf3 + 87d1b0f commit 38c1350
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ def update_landed_cost(self):
for d in self.get("purchase_receipts"):
doc = frappe.get_doc(d.receipt_document_type, d.receipt_document)
# check if there are {qty} assets created and linked to this receipt document
self.validate_asset_qty_and_status(d.receipt_document_type, doc)
if self.docstatus != 2:
self.validate_asset_qty_and_status(d.receipt_document_type, doc)

# set landed cost voucher amount in pr item
doc.set_landed_cost_voucher_amount()
Expand Down Expand Up @@ -235,20 +236,20 @@ def validate_asset_qty_and_status(self, receipt_document_type, receipt_document)
filters={receipt_document_type: item.receipt_document, "item_code": item.item_code},
fields=["name", "docstatus"],
)
if not docs or len(docs) != item.qty:
if not docs or len(docs) < item.qty:
frappe.throw(
_(
"There are not enough asset created or linked to {0}. Please create or link {1} Assets with respective document."
).format(item.receipt_document, item.qty)
"There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
).format(len(docs), item.receipt_document, item.qty)
)
if docs:
for d in docs:
if d.docstatus == 1:
frappe.throw(
_(
"{2} <b>{0}</b> has submitted Assets. Remove Item <b>{1}</b> from table to continue."
"{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
).format(
item.receipt_document, item.item_code, item.receipt_document_type
item.receipt_document_type, item.receipt_document, item.item_code
)
)

Expand Down

0 comments on commit 38c1350

Please sign in to comment.