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

fix: Make material request against SO only for pending qty (#18216)

Browse Source
This commit is contained in:
Nabin Hait 2019-07-10 17:05:49 +05:30 committed by GitHub
parent 61d8088be4
commit 59c5c3c347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -492,13 +492,27 @@ def close_or_unclose_sales_orders(names, status):
frappe.local.message_log = [] frappe.local.message_log = []
def get_requested_item_qty(sales_order):
return frappe._dict(frappe.db.sql("""
select sales_order_item, sum(stock_qty)
from `tabMaterial Request Item`
where docstatus = 1
and sales_order = %s
group by sales_order_item
""", sales_order))
@frappe.whitelist() @frappe.whitelist()
def make_material_request(source_name, target_doc=None): def make_material_request(source_name, target_doc=None):
requested_item_qty = get_requested_item_qty(source_name)
def postprocess(source, doc): def postprocess(source, doc):
doc.material_request_type = "Purchase" doc.material_request_type = "Purchase"
def update_item(source, target, source_parent): def update_item(source, target, source_parent):
target.project = source_parent.project target.project = source_parent.project
target.qty = source.stock_qty - requested_item_qty.get(source.name, 0)
target.conversion_factor = 1
target.stock_qty = source.stock_qty - requested_item_qty.get(source.name, 0)
doc = get_mapped_doc("Sales Order", source_name, { doc = get_mapped_doc("Sales Order", source_name, {
"Sales Order": { "Sales Order": {
@ -523,7 +537,7 @@ def make_material_request(source_name, target_doc=None):
"stock_uom": "uom", "stock_uom": "uom",
"stock_qty": "qty" "stock_qty": "qty"
}, },
"condition": lambda doc: not frappe.db.exists('Product Bundle', doc.item_code), "condition": lambda doc: not frappe.db.exists('Product Bundle', doc.item_code) and doc.stock_qty > requested_item_qty.get(doc.name, 0),
"postprocess": update_item "postprocess": update_item
} }
}, target_doc, postprocess) }, target_doc, postprocess)