Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixed SABB error

Browse Source
This commit is contained in:
Ritvik Sardana 2023-08-03 16:10:28 +05:30
parent 17771a55fb
commit 5b1aa07ecb
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
View File

@ -171,21 +171,23 @@ class POSInvoiceMergeLog(Document):
for item in doc.get("items"): for item in doc.get("items"):
found = False found = False
for i in items: if not item.serial_and_batch_bundle:
if ( for i in items:
i.item_code == item.item_code
and not i.serial_no if (
and not i.batch_no i.item_code == item.item_code
and i.uom == item.uom and not i.serial_no
and i.net_rate == item.net_rate and not i.batch_no
and i.warehouse == item.warehouse and i.uom == item.uom
): and i.net_rate == item.net_rate
found = True and i.warehouse == item.warehouse
i.qty = i.qty + item.qty ):
i.amount = i.amount + item.net_amount found = True
i.net_amount = i.amount i.qty = i.qty + item.qty
i.base_amount = i.base_amount + item.base_net_amount i.amount = i.amount + item.net_amount
i.base_net_amount = i.base_amount i.net_amount = i.amount
i.base_amount = i.base_amount + item.base_net_amount
i.base_net_amount = i.base_amount
if not found: if not found:
item.rate = item.net_rate item.rate = item.net_rate