schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2023-02-07 13:46:40 +05:30
committed by GitHub
parent bd1191783b
commit a9f5be3f98
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/stock_ledger.py
View File

@@ -1043,9 +1043,6 @@ def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_vouc
and warehouse = %(warehouse)s and warehouse = %(warehouse)s
and is_cancelled = 0 and is_cancelled = 0
{voucher_condition} {voucher_condition}
<<<<<<< HEAD
and timestamp(posting_date, time_format(posting_time, %(time_format)s)) < timestamp(%(posting_date)s, time_format(%(posting_time)s, %(time_format)s))
=======
and ( and (
posting_date < %(posting_date)s or posting_date < %(posting_date)s or
( (
@@ -1053,7 +1050,6 @@ def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_vouc
time_format(posting_time, %(time_format)s) {operator} time_format(%(posting_time)s, %(time_format)s) time_format(posting_time, %(time_format)s) {operator} time_format(%(posting_time)s, %(time_format)s)
) )
) )
>>>>>>> 6d513e2519 (fix: negative stock error)
order by timestamp(posting_date, posting_time) desc, creation desc order by timestamp(posting_date, posting_time) desc, creation desc
limit 1 limit 1
for update""".format( for update""".format(