diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index e3728b2fdd1e..419c8e237d01 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", @@ -143,15 +143,14 @@ { "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", + "label": "Action if Same Rate is Not Maintained Throughout Sales Cycle", "mandatory_depends_on": "maintain_same_sales_rate", "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", @@ -191,13 +190,15 @@ "label": "Item Price Settings" }, { - "fieldname": "transaction_settings_section", + "fieldname": "sales_transactions_settings_section", "fieldtype": "Section Break", "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", @@ -205,7 +206,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2021-09-08 19:38:10.175989", + "modified": "2021-09-14 22:05:06.139820", "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings",