Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Move related fields together in Selling Settings #27383

Merged
merged 8 commits into from
Sep 20, 2021
Merged

fix: Move related fields together in Selling Settings #27383

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f1d611
fix: Remove redundant description
GangaManoj Sep 1, 2021
d67460b
fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain…
GangaManoj Sep 1, 2021
c128618
fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Sam…
GangaManoj Sep 2, 2021
d623eac
fix: Move related fields to the same section
GangaManoj Sep 1, 2021
7dce900
Merge branch 'version-13-hotfix' into backport-fix-selling-settings
GangaManoj Sep 7, 2021
b26da04
fix: Rename section break
GangaManoj Sep 14, 2021
24c08f5
Merge branch 'version-13-hotfix' into backport-fix-selling-settings
nextchamp-saqib Sep 16, 2021
5451aed
Merge branch 'version-13-hotfix' into backport-fix-selling-settings
nextchamp-saqib Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions erpnext/selling/doctype/selling_settings/selling_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -191,21 +190,23 @@
"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",
"idx": 1,
"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",
Expand Down