From d10add4b1ecddff754e822d3558b9917117baf17 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 4 Mar 2025 11:48:28 +0530 Subject: [PATCH] fix: delivery note from sales order uom conversion mistake (cherry picked from commit 49a43d355d346a492d88bb18b3a76e8d5a255abd) # Conflicts: # erpnext/selling/doctype/sales_order/sales_order.py --- erpnext/selling/doctype/sales_order/sales_order.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index effc3f3894d..4e19526c06a 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1044,7 +1044,12 @@ 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)