From 7f1d611b47f3899f693bb8dde2ee62612f107481 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Wed, 1 Sep 2021 22:49:05 +0530 Subject: [PATCH 1/5] fix: Remove redundant description --- erpnext/selling/doctype/selling_settings/selling_settings.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 28c7e5a4f53..0688a6f40f7 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -143,7 +143,6 @@ { "default": "Stop", "depends_on": "maintain_same_sales_rate", - "description": "Configure the action to stop the transaction or just warn if the same rate is not maintained.", "fieldname": "maintain_same_rate_action", "fieldtype": "Select", "label": "Action If Same Rate is Not Maintained", @@ -224,4 +223,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} \ No newline at end of file +} From d67460bf22b39d61be9583a98dc25505b910de73 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Wed, 1 Sep 2021 22:55:10 +0530 Subject: [PATCH 2/5] fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked --- erpnext/selling/doctype/selling_settings/selling_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 0688a6f40f7..c016f851751 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -150,7 +150,7 @@ "options": "Stop\nWarn" }, { - "depends_on": "eval: doc.maintain_same_rate_action == 'Stop'", + "depends_on": "eval: doc.maintain_same_sales_rate && doc.maintain_same_rate_action == 'Stop'", "fieldname": "role_to_override_stop_action", "fieldtype": "Link", "label": "Role Allowed to Override Stop Action", From c128618185eb59833292c2957e44f4e9d306db96 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Thu, 2 Sep 2021 19:32:39 +0530 Subject: [PATCH 3/5] fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle' --- .../selling/doctype/selling_settings/selling_settings.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index c016f851751..9c19f77a39e 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -145,7 +145,11 @@ "depends_on": "maintain_same_sales_rate", "fieldname": "maintain_same_rate_action", "fieldtype": "Select", +<<<<<<< HEAD "label": "Action If Same Rate is Not Maintained", +======= + "label": "Action if Same Rate is Not Maintained Throughout Sales Cycle", +>>>>>>> ebdc568e85 (fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle') "mandatory_depends_on": "maintain_same_sales_rate", "options": "Stop\nWarn" }, From d623eac084f0ebfc3fc501a9a35084678719bf38 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Wed, 1 Sep 2021 22:48:09 +0530 Subject: [PATCH 4/5] fix: Move related fields to the same section --- .../doctype/selling_settings/selling_settings.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 9c19f77a39e..3ada49e7d2f 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -25,7 +25,7 @@ "editable_price_list_rate", "validate_selling_price", "editable_bundle_item_rates", - "transaction_settings_section", + "sales_transactions_settings_section", "so_required", "dn_required", "sales_update_frequency", @@ -145,11 +145,7 @@ "depends_on": "maintain_same_sales_rate", "fieldname": "maintain_same_rate_action", "fieldtype": "Select", -<<<<<<< HEAD - "label": "Action If Same Rate is Not Maintained", -======= "label": "Action if Same Rate is Not Maintained Throughout Sales Cycle", ->>>>>>> ebdc568e85 (fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle') "mandatory_depends_on": "maintain_same_sales_rate", "options": "Stop\nWarn" }, @@ -199,8 +195,10 @@ "label": "Transaction Settings" }, { - "fieldname": "column_break_5", - "fieldtype": "Column Break" + "default": "0", + "fieldname": "editable_bundle_item_rates", + "fieldtype": "Check", + "label": "Calculate Product Bundle Price based on Child Items' Rates" } ], "icon": "fa fa-cog", From b26da043c45fb4f085960a81b1bf7132d6b21a35 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Tue, 14 Sep 2021 17:07:42 +0530 Subject: [PATCH 5/5] fix: Rename section break --- .../selling/doctype/selling_settings/selling_settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 3ada49e7d2f..15b10b81101 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -190,7 +190,7 @@ "label": "Item Price Settings" }, { - "fieldname": "transaction_settings_section", + "fieldname": "sales_transactions_settings_section", "fieldtype": "Section Break", "label": "Transaction Settings" }, @@ -206,7 +206,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2021-09-06 22:05:06.139820", + "modified": "2021-09-14 22:05:06.139820", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings",