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

fix: change shipment parcel dimension fields from Int to Float (backport #53867) (#53872)

Browse Source 
* fix: change shipment parcel dimension fields from Int to Float (#53867)

(cherry picked from commit 6badf00313)

# Conflicts:
#	erpnext/stock/doctype/shipment_parcel/shipment_parcel.json
#	erpnext/stock/doctype/shipment_parcel_template/shipment_parcel_template.json

* chore: resolve conflicts

* chore: resole conflicts

---------

Co-authored-by: Kaushal Shriwas <64089478+kaulith@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
mergify[bot]
2026-03-29 07:06:55 +00:00
committed by GitHub
parent f7536f645b
commit a21b82b238
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/doctype/shipment_parcel/shipment_parcel.json
View File

@@ -14,19 +14,19 @@
"fields": [ "fields": [
{ {
"fieldname": "length", "fieldname": "length",
"fieldtype": "Int", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Length (cm)" "label": "Length (cm)"
}, },
{ {
"fieldname": "width", "fieldname": "width",
"fieldtype": "Int", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Width (cm)" "label": "Width (cm)"
}, },
{ {
"fieldname": "height", "fieldname": "height",
"fieldtype": "Int", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Height (cm)" "label": "Height (cm)"
}, },
@@ -49,7 +49,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-03-06 16:48:57.355757", "modified": "2026-03-29 00:00:00.000000",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Shipment Parcel", "name": "Shipment Parcel",
@@ -60,4 +60,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }

10
erpnext/stock/doctype/shipment_parcel_template/shipment_parcel_template.json
View File

@@ -15,21 +15,21 @@
"fields": [ "fields": [
{ {
"fieldname": "length", "fieldname": "length",
"fieldtype": "Int", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Length (cm)", "label": "Length (cm)",
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "width", "fieldname": "width",
"fieldtype": "Int", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Width (cm)", "label": "Width (cm)",
"reqd": 1 "reqd": 1
}, },
{ {
"fieldname": "height", "fieldname": "height",
"fieldtype": "Int", "fieldtype": "Float",
"in_list_view": 1, "in_list_view": 1,
"label": "Height (cm)", "label": "Height (cm)",
"reqd": 1 "reqd": 1
@@ -52,7 +52,7 @@
} }
], ],
"links": [], "links": [],
"modified": "2020-09-28 12:51:00.320421", "modified": "2026-03-29 00:00:00.000000",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Shipment Parcel Template", "name": "Shipment Parcel Template",
@@ -75,4 +75,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }