nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-01-10 11:25:53 +05:30
committed by GitHub
parent 1ef9f7f8fd
commit 5ccf4a1783
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -496,14 +496,10 @@ class StockEntry(StockController):
if (fg_completed_qty - fg_item_qty) > 0: if (fg_completed_qty - fg_item_qty) > 0:
self.process_loss_qty = fg_completed_qty - fg_item_qty self.process_loss_qty = fg_completed_qty - fg_item_qty
<<<<<<< HEAD
if not self.process_loss_qty: if not self.process_loss_qty:
continue continue
if fg_completed_qty != (flt(fg_item_qty) + flt(self.process_loss_qty, precision)): if fg_completed_qty != (flt(fg_item_qty, precision) + flt(self.process_loss_qty, precision)):
=======
if self.fg_completed_qty != flt(total, precision):
>>>>>>> d84601b2a3 (fix: precision loss causing process loss variance)
frappe.throw( 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." "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."