schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-03-05 12:46:52 +05:30
committed by GitHub
parent d10add4b1e
commit 6b56724436
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -1044,12 +1044,7 @@ def make_delivery_note(source_name, target_doc=None, kwargs=None):
ignore_permissions=True,
)
<<<<<<< HEAD
dn_item.qty = flt(sre.reserved_qty) * flt(dn_item.get("conversion_factor", 1))
=======
dn_item.qty = flt(sre.reserved_qty) / flt(dn_item.get("conversion_factor", 1))
dn_item.warehouse = sre.warehouse
>>>>>>> 49a43d355d (fix: delivery note from sales order uom conversion mistake)
if sre.reservation_based_on == "Serial and Batch" and (sre.has_serial_no or sre.has_batch_no):
dn_item.serial_and_batch_bundle = get_ssb_bundle_for_voucher(sre)