From 73b3a2f68548ed5f36eccb7bcd56682c6e020076 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 3 Sep 2021 21:57:38 +0530 Subject: [PATCH 1/2] chore: whitespace --- erpnext/patches/v13_0/create_gst_payment_entry_fields.py | 1 + erpnext/regional/report/gstr_1/gstr_1.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/patches/v13_0/create_gst_payment_entry_fields.py b/erpnext/patches/v13_0/create_gst_payment_entry_fields.py index 334c9d2b81..7e6d67ce93 100644 --- a/erpnext/patches/v13_0/create_gst_payment_entry_fields.py +++ b/erpnext/patches/v13_0/create_gst_payment_entry_fields.py @@ -4,6 +4,7 @@ import frappe from frappe.custom.doctype.custom_field.custom_field import create_custom_fields + def execute(): frappe.reload_doc('accounts', 'doctype', 'advance_taxes_and_charges') frappe.reload_doc('accounts', 'doctype', 'payment_entry') diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py index e3e09ef8e5..ca0defa648 100644 --- a/erpnext/regional/report/gstr_1/gstr_1.py +++ b/erpnext/regional/report/gstr_1/gstr_1.py @@ -54,7 +54,7 @@ class Gstr1Report(object): self.get_invoice_items() self.get_items_based_on_tax_rate() self.invoice_fields = [d["fieldname"] for d in self.invoice_columns] - + self.get_data() return self.columns, self.data @@ -713,7 +713,7 @@ class Gstr1Report(object): "width": 100 } ] - + self.columns = self.invoice_columns + self.tax_columns + self.other_columns @frappe.whitelist() From 7b4a65484a50c65c5faf32e31de2ade33d756186 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 3 Sep 2021 22:00:14 +0530 Subject: [PATCH 2/2] fix: manually added weight per unit reset to zero after save (#27330) --- 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 5f8966f88a..fd3d472137 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -487,6 +487,10 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe 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 d578e6a83a..19597c3d99 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"):