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

refactor(postgres): consistent zero-date pattern (address review)

Browse Source 
Use the same explicit db-aware conditional-add as work_order/mapper.py for the
end_of_life check (shared _item_is_alive helper in reorder_item.py; inline in
stock_projected_qty.py) instead of the inline ternary that became == None on
postgres. Identical SQL, no behaviour change.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mihir Kandoi
2026-06-17 12:35:29 +05:30
parent 7532ec9f9a
commit 1a016cbcd6
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/stock/reorder_item.py
View File

@@ -105,6 +105,16 @@ def _reorder_item():
return create_material_request(material_requests)
def _item_is_alive(item_table):
# An item counts as alive when end_of_life is unset, in the future, or the MariaDB zero-date
# '0000-00-00'. On postgres '0000-00-00' is an invalid date literal and a "not set" end_of_life
# is NULL (already covered by IS NULL), so add the zero-date term on MariaDB only.
alive = item_table.end_of_life.isnull() | (item_table.end_of_life > nowdate())
if frappe.db.db_type != "postgres":
alive |= item_table.end_of_life == "0000-00-00"
return alive
def get_items_for_reorder() -> dict[str, list]:
reorder_table = frappe.qb.DocType("Item Reorder")
item_table = frappe.qb.DocType("Item")
@@ -130,15 +140,7 @@ def get_items_for_reorder() -> dict[str, list]:
item_table.has_variants,
item_table.lead_time_days,
)
.where(
(item_table.disabled == 0)
& (item_table.is_stock_item == 1)
& (
(item_table.end_of_life.isnull())
| (item_table.end_of_life > nowdate())
| (item_table.end_of_life == ("0000-00-00" if frappe.db.db_type != "postgres" else None))
)
)
.where((item_table.disabled == 0) & (item_table.is_stock_item == 1) & _item_is_alive(item_table))
)
data = query.run(as_dict=True)
@@ -163,11 +165,7 @@ def get_reorder_levels_for_variants(itemwise_reorder):
.where(
(item_table.disabled == 0)
& (item_table.is_stock_item == 1)
& (
(item_table.end_of_life.isnull())
| (item_table.end_of_life > nowdate())
| (item_table.end_of_life == ("0000-00-00" if frappe.db.db_type != "postgres" else None))
)
& _item_is_alive(item_table)
& (item_table.variant_of.notnull())
)
)

12
erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
View File

@@ -284,17 +284,19 @@ def get_item_map(item_code, include_uom):
bin = frappe.qb.DocType("Bin")
item = frappe.qb.DocType("Item")
# alive = end_of_life unset / future / MariaDB zero-date '0000-00-00' (an invalid date literal on
# postgres, where "not set" is NULL — already covered by IS NULL); zero-date term on MariaDB only.
alive = (item.end_of_life > today()) | item.end_of_life.isnull()
if frappe.db.db_type != "postgres":
alive |= item.end_of_life == "0000-00-00"
query = (
frappe.qb.from_(item)
.select(item.name, item.item_name, item.description, item.item_group, item.brand, item.stock_uom)
.where(
(item.is_stock_item == 1)
& (item.disabled == 0)
& (
(item.end_of_life > today())
| (item.end_of_life.isnull())
| (item.end_of_life == ("0000-00-00" if frappe.db.db_type != "postgres" else None))
)
& alive
& (ExistsCriterion(frappe.qb.from_(bin).select(bin.name).where(bin.item_code == item.name)))
)
)