From b2a0e4b8102a188641eab4188e6f54e6810f6ee2 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 23 Apr 2024 13:17:23 +0530 Subject: [PATCH] chore: 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 e42204978c3..2bd00fe55d5 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -1803,9 +1803,6 @@ def get_datetime_limit_condition(detail): def validate_negative_qty_in_future_sle(args, allow_negative_stock=False): if allow_negative_stock or is_negative_stock_allowed(item_code=args.item_code): return -<<<<<<< HEAD - if not (args.actual_qty < 0 or args.voucher_type == "Stock Reconciliation"): -======= if ( args.voucher_type == "Stock Reconciliation" @@ -1816,7 +1813,6 @@ def validate_negative_qty_in_future_sle(args, allow_negative_stock=False): return if args.actual_qty >= 0 and args.voucher_type != "Stock Reconciliation": ->>>>>>> 289495c308 (fix: stock reco negative qty validation) return neg_sle = get_future_sle_with_negative_qty(args)