Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: landed cost voucher not submitting because of incorrect reference (backport #39898) (#39900)

Browse Source 
fix: landed cost voucher not submitting because of incorrect reference (#39898)

(cherry picked from commit 6239fd704b7d7a60c54b8042a8cc83b5c9e75eab)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot] 2024-02-14 15:57:40 +05:30 committed by GitHub
parent f08b424972
commit a548f12941
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/buying_controller.py
View File

@ -217,8 +217,8 @@ class BuyingController(SubcontractingController):
lc_voucher_data = frappe.db.sql( lc_voucher_data = frappe.db.sql(
"""select sum(applicable_charges), cost_center """select sum(applicable_charges), cost_center
from `tabLanded Cost Item` from `tabLanded Cost Item`
where docstatus = 1 and purchase_receipt_item = %s""", where docstatus = 1 and purchase_receipt_item = %s and receipt_document = %s""",
d.name, (d.name, self.name),
) )
d.landed_cost_voucher_amount = lc_voucher_data[0][0] if lc_voucher_data else 0.0 d.landed_cost_voucher_amount = lc_voucher_data[0][0] if lc_voucher_data else 0.0
if not d.cost_center and lc_voucher_data and lc_voucher_data[0][1]: if not d.cost_center and lc_voucher_data and lc_voucher_data[0][1]:

21
erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
View File

@ -65,6 +65,7 @@ class LandedCostVoucher(Document):
def validate(self): def validate(self):
self.check_mandatory() self.check_mandatory()
self.validate_receipt_documents() self.validate_receipt_documents()
self.validate_line_items()
init_landed_taxes_and_totals(self) init_landed_taxes_and_totals(self)
self.set_total_taxes_and_charges() self.set_total_taxes_and_charges()
if not self.get("items"): if not self.get("items"):
@ -72,6 +73,26 @@ class LandedCostVoucher(Document):
self.set_applicable_charges_on_item() self.set_applicable_charges_on_item()
def validate_line_items(self):
for d in self.get("items"):
if (
d.docstatus == 0
and d.purchase_receipt_item
and not frappe.db.exists(
d.receipt_document_type + " Item",
{"name": d.purchase_receipt_item, "parent": d.receipt_document},
)
):
frappe.throw(
_("Row {0}: {2} Item {1} does not exist in {2} {3}").format(
d.idx,
frappe.bold(d.purchase_receipt_item),
d.receipt_document_type,
frappe.bold(d.receipt_document),
),
title=_("Incorrect Reference Document (Purchase Receipt Item)"),
)
def check_mandatory(self): def check_mandatory(self):
if not self.get("purchase_receipts"): if not self.get("purchase_receipts"):
frappe.throw(_("Please enter Receipt Document")) frappe.throw(_("Please enter Receipt Document"))