nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 14:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: not able to make PO for returned qty from material request (backport #44540) (#44547)

Browse Source 
fix: not able to make PO for returned qty from material request (#44540)

(cherry picked from commit 024c442087)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-12-05 15:52:04 +05:30
committed by GitHub
parent 99a327155e
commit 5ef063c634
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/stock/doctype/material_request/material_request.js
View File

@@ -107,6 +107,14 @@ frappe.ui.form.on("Material Request", {
if (flt(frm.doc.per_received, precision) < 100) { if (flt(frm.doc.per_received, precision) < 100) {
frm.add_custom_button(__("Stop"), () => frm.events.update_status(frm, "Stopped")); frm.add_custom_button(__("Stop"), () => frm.events.update_status(frm, "Stopped"));
if (frm.doc.material_request_type === "Purchase") {
frm.add_custom_button(
__("Purchase Order"),
() => frm.events.make_purchase_order(frm),
__("Create")
);
}
} }
if (flt(frm.doc.per_ordered, precision) < 100) { if (flt(frm.doc.per_ordered, precision) < 100) {
@@ -149,14 +157,6 @@ frappe.ui.form.on("Material Request", {
); );
} }
if (frm.doc.material_request_type === "Purchase") {
frm.add_custom_button(
__("Purchase Order"),
() => frm.events.make_purchase_order(frm),
__("Create")
);
}
if (frm.doc.material_request_type === "Purchase") { if (frm.doc.material_request_type === "Purchase") {
frm.add_custom_button( frm.add_custom_button(
__("Request for Quotation"), __("Request for Quotation"),

8
erpnext/stock/doctype/material_request/material_request.py
View File

@@ -378,7 +378,9 @@ def set_missing_values(source, target_doc):
def update_item(obj, target, source_parent): def update_item(obj, target, source_parent):
target.conversion_factor = obj.conversion_factor target.conversion_factor = obj.conversion_factor
target.qty = flt(flt(obj.stock_qty) - flt(obj.ordered_qty)) / target.conversion_factor
qty = obj.received_qty or obj.ordered_qty
target.qty = flt(flt(obj.stock_qty) - flt(qty)) / target.conversion_factor
target.stock_qty = target.qty * target.conversion_factor target.stock_qty = target.qty * target.conversion_factor
if getdate(target.schedule_date) < getdate(nowdate()): if getdate(target.schedule_date) < getdate(nowdate()):
target.schedule_date = None target.schedule_date = None
@@ -430,7 +432,9 @@ def make_purchase_order(source_name, target_doc=None, args=None):
filtered_items = args.get("filtered_children", []) filtered_items = args.get("filtered_children", [])
child_filter = d.name in filtered_items if filtered_items else True child_filter = d.name in filtered_items if filtered_items else True
return d.ordered_qty < d.stock_qty and child_filter qty = d.received_qty or d.ordered_qty
return qty < d.stock_qty and child_filter
doclist = get_mapped_doc( doclist = get_mapped_doc(
"Material Request", "Material Request",