Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: change label name

Browse Source 
(cherry picked from commit 635174f1cee1e421bfb7c724acc2219f928af2ef)
This commit is contained in:
Rohit Waghchaure 2024-02-23 19:33:52 +05:30 committed by Mergify
parent e4baacd79e
commit 824df72eeb
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/public/js/controllers/transaction.js
View File

@ -106,7 +106,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
frappe.ui.form.on(this.frm.doctype + " Item", { frappe.ui.form.on(this.frm.doctype + " Item", {
items_add: function(frm, cdt, cdn) { items_add: function(frm, cdt, cdn) {
debugger
var item = frappe.get_doc(cdt, cdn); var item = frappe.get_doc(cdt, cdn);
if (!item.warehouse && frm.doc.set_warehouse) { if (!item.warehouse && frm.doc.set_warehouse) {
item.warehouse = frm.doc.set_warehouse; item.warehouse = frm.doc.set_warehouse;

6
erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
View File

@ -68,7 +68,7 @@
{ {
"fieldname": "incoming_rate", "fieldname": "incoming_rate",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Incoming Rate", "label": "Valuation Rate",
"no_copy": 1, "no_copy": 1,
"read_only": 1, "read_only": 1,
"read_only_depends_on": "eval:parent.type_of_transaction == \"Outward\"" "read_only_depends_on": "eval:parent.type_of_transaction == \"Outward\""
@ -76,6 +76,7 @@
{ {
"fieldname": "outgoing_rate", "fieldname": "outgoing_rate",
"fieldtype": "Float", "fieldtype": "Float",
"hidden": 1,
"label": "Outgoing Rate", "label": "Outgoing Rate",
"no_copy": 1, "no_copy": 1,
"read_only": 1 "read_only": 1
@ -95,6 +96,7 @@
"default": "0", "default": "0",
"fieldname": "is_outward", "fieldname": "is_outward",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 1,
"label": "Is Outward", "label": "Is Outward",
"read_only": 1 "read_only": 1
}, },
@ -120,7 +122,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2023-12-10 19:47:48.227772", "modified": "2024-02-23 12:44:18.054270",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial and Batch Entry", "name": "Serial and Batch Entry",

3
erpnext/stock/doctype/stock_settings/stock_settings.json
View File

@ -424,6 +424,7 @@
}, },
{ {
"default": "1", "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", "fieldname": "use_serial_batch_fields",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Use Serial / Batch Fields" "label": "Use Serial / Batch Fields"
@ -434,7 +435,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2024-02-04 12:01:31.931864", "modified": "2024-02-24 12:50:51.740097",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",

2
erpnext/stock/serial_batch_bundle.py
View File

@ -144,7 +144,7 @@ class SerialBatchBundle:
if frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"): if frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields"):
if sn_doc.has_serial_no: 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: elif sn_doc.has_batch_no and len(sn_doc.entries) == 1:
values_to_update["batch_no"] = sn_doc.entries[0].batch_no values_to_update["batch_no"] = sn_doc.entries[0].batch_no