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

feat: Add non-negative constraint to workstation cost fields (backport #48557) (#48826)

Browse Source 
* feat: Add non-negative constraint to workstation cost fields

(cherry picked from commit a2bb557570)

# Conflicts:
#	erpnext/manufacturing/doctype/workstation/workstation.json

* fix: Add non-negative constraint to job capacity field in workstation

(cherry picked from commit 92a12d7fea)

# Conflicts:
#	erpnext/manufacturing/doctype/workstation/workstation.json

* chore: resolve conflicts

---------

Co-authored-by: KerollesFathy <kerolles.f@outlook.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
mergify[bot]
2025-07-29 08:53:25 +00:00
committed by GitHub
parent fe1292e3fa
commit e1d7ec906f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/workstation/workstation.json
View File

@@ -72,6 +72,7 @@
"fieldname": "hour_rate_electricity", "fieldname": "hour_rate_electricity",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Electricity Cost", "label": "Electricity Cost",
"non_negative": 1,
"oldfieldname": "hour_rate_electricity", "oldfieldname": "hour_rate_electricity",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"
}, },
@@ -81,6 +82,7 @@
"fieldname": "hour_rate_consumable", "fieldname": "hour_rate_consumable",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Consumable Cost", "label": "Consumable Cost",
"non_negative": 1,
"oldfieldname": "hour_rate_consumable", "oldfieldname": "hour_rate_consumable",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"
}, },
@@ -94,6 +96,7 @@
"fieldname": "hour_rate_rent", "fieldname": "hour_rate_rent",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Rent Cost", "label": "Rent Cost",
"non_negative": 1,
"oldfieldname": "hour_rate_rent", "oldfieldname": "hour_rate_rent",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"
}, },
@@ -103,6 +106,7 @@
"fieldname": "hour_rate_labour", "fieldname": "hour_rate_labour",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Wages", "label": "Wages",
"non_negative": 1,
"oldfieldname": "hour_rate_labour", "oldfieldname": "hour_rate_labour",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"
}, },
@@ -138,6 +142,7 @@
"fieldname": "production_capacity", "fieldname": "production_capacity",
"fieldtype": "Int", "fieldtype": "Int",
"label": "Job Capacity", "label": "Job Capacity",
"non_negative": 1,
"reqd": 1 "reqd": 1
}, },
{ {
@@ -240,7 +245,7 @@
"idx": 1, "idx": 1,
"image_field": "on_status_image", "image_field": "on_status_image",
"links": [], "links": [],
"modified": "2024-06-20 14:17:13.806609", "modified": "2025-07-13 16:02:13.615001",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Workstation", "name": "Workstation",
@@ -260,6 +265,7 @@
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"row_format": "Dynamic",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "ASC", "sort_order": "ASC",