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

fix: Move related fields to the same section

Browse Source
This commit is contained in:
GangaManoj
2021-09-01 22:48:09 +05:30
parent c128618185
commit d623eac084
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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",
@@ -145,11 +145,7 @@
"depends_on": "maintain_same_sales_rate", "depends_on": "maintain_same_sales_rate",
"fieldname": "maintain_same_rate_action", "fieldname": "maintain_same_rate_action",
"fieldtype": "Select", "fieldtype": "Select",
<<<<<<< HEAD
"label": "Action If Same Rate is Not Maintained",
=======
"label": "Action if Same Rate is Not Maintained Throughout Sales Cycle", "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", "mandatory_depends_on": "maintain_same_sales_rate",
"options": "Stop\nWarn" "options": "Stop\nWarn"
}, },
@@ -199,8 +195,10 @@
"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",