nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 23:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54252 from frappe/mergify/bp/version-16-hotfix/pr-54249

Browse Source
This commit is contained in:
Nishka Gosalia
2026-04-13 16:10:39 +05:30
committed by GitHub
parent de08a972b6 847919bf4e
commit 708b59b519
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/report/stock_ledger/stock_ledger.js
View File

@@ -119,7 +119,7 @@ frappe.query_reports["Stock Ledger"] = {
}, },
{ {
fieldname: "segregate_serial_batch_bundle", fieldname: "segregate_serial_batch_bundle",
label: __("Segregate Serial / Batch Bundle"), label: __("Enable Serial / Batch Bundle"),
fieldtype: "Check", fieldtype: "Check",
default: 0, default: 0,
}, },

17
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@@ -390,12 +390,21 @@ def get_columns(filters):
"options": "voucher_type", "options": "voucher_type",
"width": 100, "width": 100,
}, },
{
"label": _("Serial and Batch Bundle"),
"fieldname": "serial_and_batch_bundle",
"fieldtype": "Link",
"options": "Serial and Batch Bundle",
"width": 150,
"hidden": not filters.get("segregate_serial_batch_bundle"),
},
{ {
"label": _("Batch"), "label": _("Batch"),
"fieldname": "batch_no", "fieldname": "batch_no",
"fieldtype": "Link", "fieldtype": "Link",
"options": "Batch", "options": "Batch",
"width": 100, "width": 100,
"hidden": not filters.get("segregate_serial_batch_bundle"),
}, },
{ {
"label": _("Serial No"), "label": _("Serial No"),
@@ -403,13 +412,7 @@ def get_columns(filters):
"fieldtype": "Link", "fieldtype": "Link",
"options": "Serial No", "options": "Serial No",
"width": 100, "width": 100,
}, "hidden": not filters.get("segregate_serial_batch_bundle"),
{
"label": _("Serial and Batch Bundle"),
"fieldname": "serial_and_batch_bundle",
"fieldtype": "Link",
"options": "Serial and Batch Bundle",
"width": 100,
}, },
{ {
"label": _("Project"), "label": _("Project"),