From e1d7ec906f3d0c6542cc26e32de9c3fc1927b84c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 08:53:25 +0000
Subject: [PATCH] feat: Add non-negative constraint to workstation cost fields
 (backport #48557) (#48826)

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

(cherry picked from commit a2bb55757040eebe963291e5f9fc106147e86dde)

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

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

(cherry picked from commit 92a12d7feac2c3fc537ff97e7cbc99027876c83a)

# 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>
---
 .../manufacturing/doctype/workstation/workstation.json    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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