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

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Vishnu VS 2023-04-25 09:29:47 +05:30 committed by GitHub
commit cdb05cd310
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -1317,7 +1317,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
if not field in searchfields if not field in searchfields
] ]
query_filters = {"disabled": 0, "end_of_life": (">", today())} query_filters = {"disabled": 0, "ifnull(end_of_life, '3099-12-31')": (">", today())}
or_cond_filters = {} or_cond_filters = {}
if txt: if txt:

2
erpnext/stock/stock_ledger.py
View File

@ -1445,6 +1445,7 @@ def get_next_stock_reco(kwargs):
( (
CombineDatetime(sle.posting_date, sle.posting_time) CombineDatetime(sle.posting_date, sle.posting_time)
> CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time")) > CombineDatetime(kwargs.get("posting_date"), kwargs.get("posting_time"))
)
| ( | (
( (
CombineDatetime(sle.posting_date, sle.posting_time) CombineDatetime(sle.posting_date, sle.posting_time)
@ -1454,7 +1455,6 @@ def get_next_stock_reco(kwargs):
) )
) )
) )
)
.orderby(CombineDatetime(sle.posting_date, sle.posting_time)) .orderby(CombineDatetime(sle.posting_date, sle.posting_time))
.orderby(sle.creation) .orderby(sle.creation)
.limit(1) .limit(1)