nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-04-23 13:17:23 +05:30
committed by GitHub
parent aee03fe2ef
commit b2a0e4b810
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

@@ -1803,9 +1803,6 @@ def get_datetime_limit_condition(detail):
def validate_negative_qty_in_future_sle(args, allow_negative_stock=False): 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): if allow_negative_stock or is_negative_stock_allowed(item_code=args.item_code):
return return
<<<<<<< HEAD
if not (args.actual_qty < 0 or args.voucher_type == "Stock Reconciliation"):
=======
if ( if (
args.voucher_type == "Stock Reconciliation" args.voucher_type == "Stock Reconciliation"
@@ -1816,7 +1813,6 @@ def validate_negative_qty_in_future_sle(args, allow_negative_stock=False):
return return
if args.actual_qty >= 0 and args.voucher_type != "Stock Reconciliation": if args.actual_qty >= 0 and args.voucher_type != "Stock Reconciliation":
>>>>>>> 289495c308 (fix: stock reco negative qty validation)
return return
neg_sle = get_future_sle_with_negative_qty(args) neg_sle = get_future_sle_with_negative_qty(args)