From 84e91e0c7cc0e1c3c6cbe5f191464c3e63694a22 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 11:06:43 +0000 Subject: [PATCH] feat: Add non-negative constraint to completed qty fields in job card and time log (backport #48946) (#48989) * feat: Add non-negative constraint to completed qty fields in job card and time log (cherry picked from commit c30665fda7efec8cc29056ce0c81e9a5e5471507) # Conflicts: # erpnext/manufacturing/doctype/job_card/job_card.json # erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json * chore: resolve conflicts * chore: resolve conflicts --------- Co-authored-by: KerollesFathy Co-authored-by: Mihir Kandoi --- erpnext/manufacturing/doctype/job_card/job_card.json | 5 +++-- .../doctype/job_card_time_log/job_card_time_log.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json index 39e7aac38ae..7f4fbdaef06 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.json +++ b/erpnext/manufacturing/doctype/job_card/job_card.json @@ -160,6 +160,7 @@ "fieldname": "total_completed_qty", "fieldtype": "Float", "label": "Total Completed Qty", + "non_negative": 1, "read_only": 1 }, { @@ -510,7 +511,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2025-03-17 15:55:11.143456", + "modified": "2025-08-04 15:47:54.514290", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card", @@ -568,4 +569,4 @@ "states": [], "title_field": "operation", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json index 6a86214986a..0565d677e9b 100644 --- a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json +++ b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json @@ -42,7 +42,8 @@ "fieldname": "completed_qty", "fieldtype": "Float", "in_list_view": 1, - "label": "Completed Qty" + "label": "Completed Qty", + "non_negative": 1 }, { "fieldname": "employee", @@ -63,7 +64,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-05-21 12:40:55.765860", + "modified": "2025-08-04 15:47:11.748937", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card Time Log",