From aee2cc2e033b429a98bda6a54562a652a4d17f9f Mon Sep 17 00:00:00 2001 From: hiteshprajapati Date: Thu, 20 Jun 2024 14:11:18 +0530 Subject: [PATCH 1/2] fix: Don't allow negative amount on Payment Request #41905 (cherry picked from commit b823aa66bf95821a9b569c891a71085493c3ac49) # Conflicts: # erpnext/accounts/doctype/payment_request/payment_request.json --- .../accounts/doctype/payment_request/payment_request.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 66b5c4b983eb..3872b0777cf3 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -144,6 +144,7 @@ "fieldname": "grand_total", "fieldtype": "Currency", "label": "Amount", + "non_negative": 1, "options": "currency" }, { @@ -395,7 +396,11 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2023-09-27 09:51:42.277638", +======= + "modified": "2024-06-20 13:54:55.245774", +>>>>>>> b823aa66bf (fix: Don't allow negative amount on Payment Request #41905) "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request", @@ -433,4 +438,4 @@ "sort_field": "modified", "sort_order": "DESC", "states": [] -} \ No newline at end of file +} From a9146efc178ea235640cf961a3312a7fe6b2d7f5 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 19 Jul 2024 10:36:42 +0530 Subject: [PATCH 2/2] chore: resolve conflict --- erpnext/accounts/doctype/payment_request/payment_request.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json index 3872b0777cf3..0537ee6d3a38 100644 --- a/erpnext/accounts/doctype/payment_request/payment_request.json +++ b/erpnext/accounts/doctype/payment_request/payment_request.json @@ -396,11 +396,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2023-09-27 09:51:42.277638", -======= "modified": "2024-06-20 13:54:55.245774", ->>>>>>> b823aa66bf (fix: Don't allow negative amount on Payment Request #41905) "modified_by": "Administrator", "module": "Accounts", "name": "Payment Request",