From 5ccf4a1783b887777b430e4cf2b04c1e2635e60e Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 10 Jan 2025 11:25:53 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_entry/stock_entry.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index a773d9cfa45..5e4343add10 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -496,14 +496,10 @@ class StockEntry(StockController): if (fg_completed_qty - fg_item_qty) > 0: self.process_loss_qty = fg_completed_qty - fg_item_qty -<<<<<<< HEAD if not self.process_loss_qty: continue - if fg_completed_qty != (flt(fg_item_qty) + flt(self.process_loss_qty, precision)): -======= - if self.fg_completed_qty != flt(total, precision): ->>>>>>> d84601b2a3 (fix: precision loss causing process loss variance) + if fg_completed_qty != (flt(fg_item_qty, precision) + flt(self.process_loss_qty, precision)): frappe.throw( _( "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table."