CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 11:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: delivery note from sales order uom conversion mistake

Browse Source 
(cherry picked from commit 49a43d355d)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.py
This commit is contained in:
Mihir Kandoi
2025-03-04 11:48:28 +05:30
committed by Mergify
parent 88234bbf9a
commit d10add4b1e
1 changed files with 5 additions and 0 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,7 +1044,12 @@ def make_delivery_note(source_name, target_doc=None, kwargs=None):
ignore_permissions=True, 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.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): 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) dn_item.serial_and_batch_bundle = get_ssb_bundle_for_voucher(sre)