From e9da4ed34df140300b30e7bad992024e936472b9 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Fri, 3 Sep 2021 22:54:49 +0530 Subject: [PATCH] fix: manually added weight per unit reset to zero after save (#27330) (#27338) (cherry picked from commit 7b4a65484a50c65c5faf32e31de2ade33d756186) Co-authored-by: rohitwaghchaure --- erpnext/public/js/controllers/transaction.js | 4 ++++ erpnext/stock/get_item_details.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 0e99b43befa..6c1d5f9898e 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -487,6 +487,10 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ var me = this; var item = frappe.get_doc(cdt, cdn); var update_stock = 0, show_batch_dialog = 0; + + item.weight_per_unit = 0; + item.weight_uom = ''; + if(['Sales Invoice'].includes(this.frm.doc.doctype)) { update_stock = cint(me.frm.doc.update_stock); show_batch_dialog = update_stock; diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index d578e6a83a0..19597c3d993 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -321,8 +321,8 @@ def get_basic_details(args, item, overwrite_warehouse=True): "transaction_date": args.get("transaction_date"), "against_blanket_order": args.get("against_blanket_order"), "bom_no": item.get("default_bom"), - "weight_per_unit": item.get("weight_per_unit"), - "weight_uom": item.get("weight_uom") + "weight_per_unit": args.get("weight_per_unit") or item.get("weight_per_unit"), + "weight_uom": args.get("weight_uom") or item.get("weight_uom") }) if item.get("enable_deferred_revenue") or item.get("enable_deferred_expense"):