nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 21:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(accounts): include asset items in purchase receipt validation (#55150)

Browse Source 
(cherry picked from commit d0d9411700)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
This commit is contained in:
Pandiyan P
2026-06-03 13:11:50 +05:30
committed by Mergify
parent 5a80de43fa
commit 611849f953
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -633,15 +633,21 @@ class PurchaseInvoice(BuyingController):
throw(msg, title=_("Mandatory Purchase Order")) throw(msg, title=_("Mandatory Purchase Order"))
def pr_required(self): def pr_required(self):
<<<<<<< HEAD
stock_items = self.get_stock_items() stock_items = self.get_stock_items()
if frappe.db.get_value("Buying Settings", None, "pr_required") == "Yes": if frappe.db.get_value("Buying Settings", None, "pr_required") == "Yes":
=======
if frappe.db.get_single_value("Buying Settings", "pr_required") == "Yes":
stock_and_asset_items = self.get_stock_items()
stock_and_asset_items.extend(self.get_asset_items())
>>>>>>> d0d9411700 (fix(accounts): include asset items in purchase receipt validation (#55150))
if frappe.get_value( if frappe.get_value(
"Supplier", self.supplier, "allow_purchase_invoice_creation_without_purchase_receipt" "Supplier", self.supplier, "allow_purchase_invoice_creation_without_purchase_receipt"
): ):
return return
for d in self.get("items"): for d in self.get("items"):
if not d.purchase_receipt and d.item_code in stock_items: if not d.purchase_receipt and d.item_code in stock_and_asset_items:
msg = _("Purchase Receipt Required for item {}").format(frappe.bold(d.item_code)) msg = _("Purchase Receipt Required for item {}").format(frappe.bold(d.item_code))
msg += "<br><br>" msg += "<br><br>"
msg += _( msg += _(