From 824df72eebaa95bb0a4e2f97f5dc3ac1d4955356 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 23 Feb 2024 19:33:52 +0530 Subject: [PATCH] fix: change label name (cherry picked from commit 635174f1cee1e421bfb7c724acc2219f928af2ef) --- erpnext/public/js/controllers/transaction.js | 1 - .../serial_and_batch_entry/serial_and_batch_entry.json | 6 ++++-- erpnext/stock/doctype/stock_settings/stock_settings.json | 3 ++- erpnext/stock/serial_batch_bundle.py | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 1533c7055c..0a6cf82532 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -106,7 +106,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe frappe.ui.form.on(this.frm.doctype + " Item", { items_add: function(frm, cdt, cdn) { - debugger var item = frappe.get_doc(cdt, cdn); if (!item.warehouse && frm.doc.set_warehouse) { item.warehouse = frm.doc.set_warehouse; diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json index 5de2c2ee65..844270bc1d 100644 --- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json +++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json @@ -68,7 +68,7 @@ { "fieldname": "incoming_rate", "fieldtype": "Float", - "label": "Incoming Rate", + "label": "Valuation Rate", "no_copy": 1, "read_only": 1, "read_only_depends_on": "eval:parent.type_of_transaction == \"Outward\"" @@ -76,6 +76,7 @@ { "fieldname": "outgoing_rate", "fieldtype": "Float", + "hidden": 1, "label": "Outgoing Rate", "no_copy": 1, "read_only": 1 @@ -95,6 +96,7 @@ "default": "0", "fieldname": "is_outward", "fieldtype": "Check", + "hidden": 1, "label": "Is Outward", "read_only": 1 }, @@ -120,7 +122,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2023-12-10 19:47:48.227772", + "modified": "2024-02-23 12:44:18.054270", "modified_by": "Administrator", "module": "Stock", "name": "Serial and Batch Entry", diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json index 3f2c114255..1e8d0ddbb3 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.json +++ b/erpnext/stock/doctype/stock_settings/stock_settings.json @@ -424,6 +424,7 @@ }, { "default": "1", + "description": "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields.", "fieldname": "use_serial_batch_fields", "fieldtype": "Check", "label": "Use Serial / Batch Fields" @@ -434,7 +435,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-02-04 12:01:31.931864", + "modified": "2024-02-24 12:50:51.740097", "modified_by": "Administrator", "module": "Stock", "name": "Stock Settings", diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py index fc1cca46f6..52c5b000a7 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -144,7 +144,7 @@ class SerialBatchBundle: if frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"): if sn_doc.has_serial_no: - values_to_update["serial_no"] = "\n".join(cstr(d.serial_no) for d in sn_doc.entries) + values_to_update["serial_no"] = ",".join(cstr(d.serial_no) for d in sn_doc.entries) elif sn_doc.has_batch_no and len(sn_doc.entries) == 1: values_to_update["batch_no"] = sn_doc.entries[0].batch_no