From e2fc10d558abdc9a1051474b487b1838533632dc Mon Sep 17 00:00:00 2001 From: marination <25857446+marination@users.noreply.github.com> Date: Tue, 6 May 2025 12:33:03 +0200 Subject: [PATCH 1/2] fix: Relabel unit price settings for more clarity --- .../doctype/buying_settings/buying_settings.json | 13 ++++++++----- .../doctype/selling_settings/selling_settings.json | 10 ++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json index 6d90268e574..2e2d01e7c3e 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.json +++ b/erpnext/buying/doctype/buying_settings/buying_settings.json @@ -213,21 +213,24 @@ }, { "default": "0", + "description": "Allows items in the Purchase Order to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", "fieldname": "allow_zero_qty_in_purchase_order", "fieldtype": "Check", - "label": "Allow 0 Qty in Purchase Order (Unit Price Items)" + "label": "Allow Zero Quantity Items in Purchase Order" }, { "default": "0", + "description": "Allows items in the Request for Quotation to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", "fieldname": "allow_zero_qty_in_request_for_quotation", "fieldtype": "Check", - "label": "Allow 0 Qty in Request for Quotation (Unit Price Items)" + "label": "Allow Zero Quantity Items in Request for Quotation" }, { "default": "0", + "description": "Allows items in the Supplier Quotation to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", "fieldname": "allow_zero_qty_in_supplier_quotation", "fieldtype": "Check", - "label": "Allow 0 Qty in Supplier Quotation (Unit Price Items)" + "label": "Allow Zero Quantity Items in Supplier Quotation" } ], "grid_page_length": 50, @@ -236,7 +239,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-03-03 17:32:25.939482", + "modified": "2025-05-06 12:32:00.195378", "modified_by": "Administrator", "module": "Buying", "name": "Buying Settings", @@ -287,4 +290,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 7406b473f98..1f978d68cd0 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -225,15 +225,17 @@ }, { "default": "0", + "description": "Allows items in the Sales Order to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", "fieldname": "allow_zero_qty_in_sales_order", "fieldtype": "Check", - "label": "Allow 0 Qty in Sales Order (Unit Price Items)" + "label": "Allow Zero Quantity Items in Sales Order" }, { "default": "0", + "description": "Allows items in the Quotation to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", "fieldname": "allow_zero_qty_in_quotation", "fieldtype": "Check", - "label": "Allow 0 Qty in Quotation (Unit Price Items)" + "label": "Allow Zero Quantity Items in Quotation" } ], "grid_page_length": 50, @@ -242,7 +244,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-03-03 16:39:16.360823", + "modified": "2025-05-06 12:30:13.342694", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings", @@ -272,4 +274,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} From fbef81bcf6969ce742778ad7d4e645f94cf9bbef Mon Sep 17 00:00:00 2001 From: marination <25857446+marination@users.noreply.github.com> Date: Tue, 6 May 2025 15:28:56 +0200 Subject: [PATCH 2/2] chore: Relabel according to review changes --- .../doctype/buying_settings/buying_settings.json | 14 +++++++------- .../doctype/selling_settings/selling_settings.json | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json index 2e2d01e7c3e..7aada160b80 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.json +++ b/erpnext/buying/doctype/buying_settings/buying_settings.json @@ -213,24 +213,24 @@ }, { "default": "0", - "description": "Allows items in the Purchase Order to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", + "description": "Allows users to submit Purchase Orders with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts.", "fieldname": "allow_zero_qty_in_purchase_order", "fieldtype": "Check", - "label": "Allow Zero Quantity Items in Purchase Order" + "label": "Allow Purchase Order with Zero Quantity" }, { "default": "0", - "description": "Allows items in the Request for Quotation to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", + "description": "Allows users to submit Request for Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts.", "fieldname": "allow_zero_qty_in_request_for_quotation", "fieldtype": "Check", - "label": "Allow Zero Quantity Items in Request for Quotation" + "label": "Allow Request for Quotation with Zero Quantity" }, { "default": "0", - "description": "Allows items in the Supplier Quotation to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", + "description": "Allows users to submit Supplier Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts.", "fieldname": "allow_zero_qty_in_supplier_quotation", "fieldtype": "Check", - "label": "Allow Zero Quantity Items in Supplier Quotation" + "label": "Allow Supplier Quotation with Zero Quantity" } ], "grid_page_length": 50, @@ -239,7 +239,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-05-06 12:32:00.195378", + "modified": "2025-05-06 15:21:49.639642", "modified_by": "Administrator", "module": "Buying", "name": "Buying Settings", diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 1f978d68cd0..889062c52df 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -225,17 +225,17 @@ }, { "default": "0", - "description": "Allows items in the Sales Order to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", + "description": "Allows users to submit Sales Orders with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts.", "fieldname": "allow_zero_qty_in_sales_order", "fieldtype": "Check", - "label": "Allow Zero Quantity Items in Sales Order" + "label": "Allow Sales Order with Zero Quantity" }, { "default": "0", - "description": "Allows items in the Quotation to have a quantity of 0. Useful when the rate/unit price is agreed upon, but the quantity is not yet determined.", + "description": "Allows users to submit Quotations with zero quantity. Useful when rates are fixed but the quantities are not. Eg. Rate Contracts.", "fieldname": "allow_zero_qty_in_quotation", "fieldtype": "Check", - "label": "Allow Zero Quantity Items in Quotation" + "label": "Allow Quotation with Zero Quantity" } ], "grid_page_length": 50, @@ -244,7 +244,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2025-05-06 12:30:13.342694", + "modified": "2025-05-06 15:23:14.332971", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings",