nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 07:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Move related fields together in Selling Settings (#27383)

Browse Source
This commit is contained in:
Saqib
2021-09-20 15:30:50 +05:30
committed by GitHub
parent d6ed6d53e9 5451aed115
commit 7aaecbcac9
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/selling/doctype/selling_settings/selling_settings.json
View File

@@ -25,7 +25,7 @@
"editable_price_list_rate", "editable_price_list_rate",
"validate_selling_price", "validate_selling_price",
"editable_bundle_item_rates", "editable_bundle_item_rates",
"transaction_settings_section", "sales_transactions_settings_section",
"so_required", "so_required",
"dn_required", "dn_required",
"sales_update_frequency", "sales_update_frequency",
@@ -143,15 +143,14 @@
{ {
"default": "Stop", "default": "Stop",
"depends_on": "maintain_same_sales_rate", "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", "fieldname": "maintain_same_rate_action",
"fieldtype": "Select", "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", "mandatory_depends_on": "maintain_same_sales_rate",
"options": "Stop\nWarn" "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", "fieldname": "role_to_override_stop_action",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Role Allowed to Override Stop Action", "label": "Role Allowed to Override Stop Action",
@@ -191,13 +190,15 @@
"label": "Item Price Settings" "label": "Item Price Settings"
}, },
{ {
"fieldname": "transaction_settings_section", "fieldname": "sales_transactions_settings_section",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Transaction Settings" "label": "Transaction Settings"
}, },
{ {
"fieldname": "column_break_5", "default": "0",
"fieldtype": "Column Break" "fieldname": "editable_bundle_item_rates",
"fieldtype": "Check",
"label": "Calculate Product Bundle Price based on Child Items' Rates"
} }
], ],
"icon": "fa fa-cog", "icon": "fa fa-cog",
@@ -205,7 +206,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2021-09-08 19:38:10.175989", "modified": "2021-09-14 22:05:06.139820",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",