Merge pull request #39905 from rohitwaghchaure/fixed-item-reference-9906
fix: party item code in Blanket Order
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index fb68010..27ac9d5 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -217,8 +217,8 @@
lc_voucher_data = frappe.db.sql(
"""select sum(applicable_charges), cost_center
from `tabLanded Cost Item`
- where docstatus = 1 and purchase_receipt_item = %s""",
- d.name,
+ where docstatus = 1 and purchase_receipt_item = %s and receipt_document = %s""",
+ (d.name, self.name),
)
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]:
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index b942842..fdef8fe 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -652,7 +652,10 @@
"project": self.project,
}
- key = (d.item_code, d.sales_order, d.warehouse)
+ key = (d.item_code, d.sales_order, d.sales_order_item, d.warehouse)
+ if self.combine_items:
+ key = (d.item_code, d.sales_order, d.warehouse)
+
if not d.sales_order:
key = (d.name, d.item_code, d.warehouse)
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index dec7506..baff540 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -65,6 +65,7 @@
def validate(self):
self.check_mandatory()
self.validate_receipt_documents()
+ self.validate_line_items()
init_landed_taxes_and_totals(self)
self.set_total_taxes_and_charges()
if not self.get("items"):
@@ -72,6 +73,26 @@
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):
if not self.get("purchase_receipts"):
frappe.throw(_("Please enter Receipt Document"))