nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-20 01:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56897 from mihir-kandoi/pg-requested-items-required-date

Browse Source 
fix(buying): show earliest schedule date as required date
This commit is contained in:
Mihir Kandoi
2026-07-05 15:45:52 +05:30
committed by GitHub
parent e3a38e3733 a5d0b25ac4
commit 00e6b44701
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py
View File

@@ -6,7 +6,7 @@ import copy
import frappe
from frappe import _
from frappe.query_builder.functions import Coalesce, Max, Sum
from frappe.query_builder.functions import Coalesce, Max, Min, Sum
from frappe.utils import cint, date_diff, flt, getdate
@@ -47,7 +47,7 @@ def get_data(filters):
# non-grouped columns are constant per grouped mr.name / item_code -> Max() keeps the
# GROUP BY valid on postgres while returning the same value MySQL picked.
Max(mr.transaction_date).as_("date"),
Max(mr_item.schedule_date).as_("required_date"),
Min(mr_item.schedule_date).as_("required_date"),
mr_item.item_code.as_("item_code"),
Sum(Coalesce(mr_item.qty, 0)).as_("qty"),
Sum(Coalesce(mr_item.stock_qty, 0)).as_("stock_qty"),

32
erpnext/buying/report/requested_items_to_order_and_receive/test_requested_items_to_order_and_receive.py
View File

@@ -2,7 +2,7 @@
# See license.txt
import frappe
from frappe.utils import add_days, today
from frappe.utils import add_days, getdate, today
from erpnext.buying.doctype.purchase_order.mapper import make_purchase_receipt
from erpnext.buying.report.requested_items_to_order_and_receive.requested_items_to_order_and_receive import (
@@ -44,6 +44,36 @@ class TestRequestedItemsToOrderAndReceive(ERPNextTestSuite):
self.assertEqual(data[0].ordered_qty, 0.0)
self.assertEqual(data[1].ordered_qty, 57.0)
def test_required_date_is_earliest_schedule_date(self):
create_item("Test MR Report Dup Item")
mr = frappe.copy_doc(self.globalTestRecords["Material Request"][0])
mr.transaction_date = today()
mr.schedule_date = add_days(today(), 5)
mr.set("items", mr.items[:1])
row = mr.items[0]
row.item_code = "Test MR Report Dup Item"
row.item_name = "Test MR Report Dup Item"
row.description = "Test MR Report Dup Item"
row.uom = "Nos"
row.schedule_date = add_days(today(), 5)
mr.append(
"items",
{
"item_code": "Test MR Report Dup Item",
"item_name": "Test MR Report Dup Item",
"description": "Test MR Report Dup Item",
"uom": "Nos",
"qty": row.qty,
"warehouse": row.warehouse,
"schedule_date": add_days(today(), 1),
},
)
mr.submit()
data = get_data(self.filters.update({"item_code": "Test MR Report Dup Item"}))
self.assertEqual(len(data), 1)
self.assertEqual(getdate(data[0].required_date), getdate(add_days(today(), 1)))
def setup_material_request(self, order=False, receive=False, days=0):
po = None
mr = frappe.copy_doc(self.globalTestRecords["Material Request"][0])