From c118fc9343b283a5f3d03ff0acd8bfdb57e0c3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chao-Yee=20Hsu=20=E8=A8=B1=E6=9C=9D=E7=9B=8A?= Date: Fri, 29 Jan 2016 10:38:33 +0800 Subject: [PATCH 1/2] Update material_request.py Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order. --- erpnext/stock/doctype/material_request/material_request.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 74a8fa146c..034745f8c1 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -258,7 +258,8 @@ def get_material_requests_based_on_supplier(supplier): and mr.material_request_type = 'Purchase' and mr.per_ordered < 99.99 and mr.docstatus = 1 - and mr.status != 'Stopped'""" % ', '.join(['%s']*len(supplier_items)), + and mr.status != 'Stopped'""" % ', '.join(['%s']*len(supplier_items) + order by mr_item.item_code ASC), tuple(supplier_items)) else: material_requests = [] From 71a9be8add0a3283ea1bf8789c69ff5fc50ed3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chao-Yee=20Hsu=20=E8=A8=B1=E6=9C=9D=E7=9B=8A?= Date: Fri, 29 Jan 2016 18:45:22 +0800 Subject: [PATCH 2/2] Update material_request.py Add "order by mr_item.item_code ASC" to 'get_material_requests_based_on_supplier(supplier)' in order to get material request item sorted by ascending order. --- erpnext/stock/doctype/material_request/material_request.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 034745f8c1..6f6f78e2a0 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -258,8 +258,8 @@ def get_material_requests_based_on_supplier(supplier): and mr.material_request_type = 'Purchase' and mr.per_ordered < 99.99 and mr.docstatus = 1 - and mr.status != 'Stopped'""" % ', '.join(['%s']*len(supplier_items) - order by mr_item.item_code ASC), + and mr.status != 'Stopped' + order by mr_item.item_code ASC""" % ', '.join(['%s']*len(supplier_items)), tuple(supplier_items)) else: material_requests = []