Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27306 from GangaManoj/fix-selling-settings

Browse Source 
fix: Move related fields together in Selling Settings
This commit is contained in:
Saqib 2021-09-03 12:30:02 +05:30 committed by GitHub
commit 98696c0ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,10 @@
"close_opportunity_after_days", "close_opportunity_after_days",
"item_price_settings_section", "item_price_settings_section",
"selling_price_list", "selling_price_list",
"maintain_same_rate_action",
"role_to_override_stop_action",
"column_break_15", "column_break_15",
"maintain_same_sales_rate", "maintain_same_sales_rate",
"maintain_same_rate_action",
"editable_price_list_rate", "editable_price_list_rate",
"validate_selling_price", "validate_selling_price",
"editable_bundle_item_rates", "editable_bundle_item_rates",
@ -29,7 +30,6 @@
"dn_required", "dn_required",
"sales_update_frequency", "sales_update_frequency",
"column_break_5", "column_break_5",
"role_to_override_stop_action",
"allow_multiple_items", "allow_multiple_items",
"allow_against_multiple_purchase_orders", "allow_against_multiple_purchase_orders",
"hide_tax_id" "hide_tax_id"
@ -147,15 +147,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",
@ -205,7 +204,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2021-08-24 22:08:34.470897", "modified": "2021-09-01 22:55:33.803624",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",
@ -224,4 +223,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }