mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-03 16:40:19 +00:00
fix: filter fully ordered items when creating RFQ from Material Request (#58534)
This commit is contained in:
@@ -141,6 +141,15 @@ def make_purchase_order(
|
||||
|
||||
@frappe.whitelist()
|
||||
def make_request_for_quotation(source_name: str, target_doc: str | dict | Document | None = None):
|
||||
def update_item(obj, target, source_parent):
|
||||
qty = obj.ordered_qty or obj.received_qty
|
||||
target.qty = flt(flt(obj.stock_qty) - flt(qty)) / target.conversion_factor
|
||||
target.stock_qty = target.qty * target.conversion_factor
|
||||
|
||||
def select_item(d):
|
||||
qty = d.ordered_qty or d.received_qty
|
||||
return qty < d.stock_qty
|
||||
|
||||
doclist = get_mapped_doc(
|
||||
"Material Request",
|
||||
source_name,
|
||||
@@ -157,6 +166,8 @@ def make_request_for_quotation(source_name: str, target_doc: str | dict | Docume
|
||||
["project", "project_name"],
|
||||
["cost_center", "cost_center"],
|
||||
],
|
||||
"postprocess": update_item,
|
||||
"condition": select_item,
|
||||
},
|
||||
},
|
||||
target_doc,
|
||||
|
||||
@@ -14,6 +14,7 @@ from erpnext.stock.doctype.material_request.mapper import (
|
||||
create_pick_list,
|
||||
make_in_transit_stock_entry,
|
||||
make_purchase_order,
|
||||
make_request_for_quotation,
|
||||
make_stock_entry,
|
||||
make_supplier_quotation,
|
||||
)
|
||||
@@ -52,6 +53,26 @@ class TestMaterialRequest(ERPNextTestSuite):
|
||||
self.assertEqual(po.doctype, "Purchase Order")
|
||||
self.assertEqual(len(po.get("items")), len(mr.get("items")))
|
||||
|
||||
def test_make_request_for_quotation_skips_ordered_items(self):
|
||||
mr = frappe.copy_doc(self.globalTestRecords["Material Request"][0]).insert()
|
||||
mr = frappe.get_doc("Material Request", mr.name)
|
||||
mr.submit()
|
||||
|
||||
# fully order the first item, leave the second pending
|
||||
po = make_purchase_order(mr.name)
|
||||
po.supplier = "_Test Supplier"
|
||||
po.schedule_date = today()
|
||||
po.items = [po.items[0]]
|
||||
po.items[0].schedule_date = today()
|
||||
po.insert()
|
||||
po.submit()
|
||||
|
||||
rfq = make_request_for_quotation(mr.name)
|
||||
|
||||
self.assertEqual(len(rfq.get("items")), 1)
|
||||
self.assertEqual(rfq.items[0].material_request_item, mr.items[1].name)
|
||||
self.assertEqual(rfq.items[0].qty, mr.items[1].qty)
|
||||
|
||||
def test_make_subcontracted_purchase_order(self):
|
||||
from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
|
||||
from erpnext.stock.doctype.item.test_item import create_item, make_item
|
||||
|
||||
Reference in New Issue
Block a user