mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-17 16:45:02 +00:00
fix: Make fieldname more concise
This commit is contained in:
@@ -19,8 +19,7 @@
|
||||
"maintain_same_rate_action",
|
||||
"editable_price_list_rate",
|
||||
"validate_selling_price",
|
||||
"calculate_product_bundle_price_based_on_child_items_rates",
|
||||
"sales_transactions_settings_section",
|
||||
"editable_bundle_item_rates",
|
||||
"so_required",
|
||||
"dn_required",
|
||||
"sales_update_frequency",
|
||||
@@ -159,47 +158,16 @@
|
||||
"fieldtype": "Link",
|
||||
"label": "Role Allowed to Override Stop Action",
|
||||
"options": "Role"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
},
|
||||
{
|
||||
"fieldname": "customer_defaults_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Customer Defaults"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_4",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "crm_settings_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "CRM Settings"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_9",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "item_price_settings_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Item Price Settings"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_15",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "sales_transactions_settings_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Transaction Settings"
|
||||
},
|
||||
{
|
||||
"default": "0",
|
||||
"fieldname": "calculate_product_bundle_price_based_on_child_items_rates",
|
||||
"fieldname": "editable_bundle_item_rates",
|
||||
"fieldtype": "Check",
|
||||
"label": "Calculate Product Bundle Price based on Child Items' Rates"
|
||||
>>>>>>> 2293ba302a (fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates)
|
||||
}
|
||||
],
|
||||
"icon": "fa fa-cog",
|
||||
@@ -207,11 +175,7 @@
|
||||
"index_web_pages_for_search": 1,
|
||||
"issingle": 1,
|
||||
"links": [],
|
||||
<<<<<<< HEAD
|
||||
"modified": "2021-04-04 20:18:12.814624",
|
||||
=======
|
||||
"modified": "2021-08-24 22:02:23.949616",
|
||||
>>>>>>> 2293ba302a (fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates)
|
||||
"modified": "2021-08-24 22:08:34.470897",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Selling",
|
||||
"name": "Selling Settings",
|
||||
|
||||
Reference in New Issue
Block a user