nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-12 14:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: detect contained/enclosing date ranges in Stock Closing Entry duplicate check

Browse Source
This commit is contained in:
Nabin Hait
2026-07-04 17:47:22 +05:30
parent ae0cfbd3e1
commit 10c6cda6db
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/stock_closing_entry/stock_closing_entry.py
View File

@@ -59,11 +59,10 @@ class StockClosingEntry(Document):
.where(
(table.docstatus == 1)
& (table.company == self.company)
& (
(table.from_date.between(self.from_date, self.to_date))
| (table.to_date.between(self.from_date, self.to_date))
| ((self.from_date >= table.from_date) & (table.from_date >= self.to_date))
)
# two date ranges overlap when each starts on or before the other ends;
# this also catches one range being fully contained within the other
& (table.from_date <= self.to_date)
& (table.to_date >= self.from_date)
)
)

12
erpnext/stock/doctype/stock_closing_entry/test_stock_closing_entry.py
View File

@@ -84,6 +84,18 @@ class TestStockClosingEntryDuplicate(ERPNextTestSuite):
overlap = self.make_closing("2026-02-01", "2026-04-30")
self.assertRaises(frappe.ValidationError, overlap.insert)
def test_fully_contained_range_is_rejected(self):
# a range entirely inside an existing entry's range is still a duplicate
self.submit_closing(self.make_closing("2026-01-01", "2026-12-31"))
contained = self.make_closing("2026-03-01", "2026-03-31")
self.assertRaises(frappe.ValidationError, contained.insert)
def test_enclosing_range_is_rejected(self):
# and so is a range that fully encloses an existing entry's range
self.submit_closing(self.make_closing("2026-03-01", "2026-03-31"))
enclosing = self.make_closing("2026-01-01", "2026-12-31")
self.assertRaises(frappe.ValidationError, enclosing.insert)
def test_non_overlapping_range_is_allowed(self):
self.submit_closing(self.make_closing("2026-01-01", "2026-03-31"))
later = self.make_closing("2026-04-01", "2026-06-30")