From a9f5be3f981ef600aec8091e56a1535f75e2d05d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 7 Feb 2023 13:46:40 +0530 Subject: [PATCH] fix: conflicts --- erpnext/stock/stock_ledger.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index ab06176dbfa..361e00a8449 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -1043,9 +1043,6 @@ def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_vouc and warehouse = %(warehouse)s and is_cancelled = 0 {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 ( 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) ) ) ->>>>>>> 6d513e2519 (fix: negative stock error) order by timestamp(posting_date, posting_time) desc, creation desc limit 1 for update""".format(