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

fix: Make fieldname more concise

Browse Source
This commit is contained in:
GangaManoj
2021-08-24 22:09:12 +05:30
parent 80b3a032fb
commit 39a3ffcb56
1 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,7 @@
"maintain_same_rate_action", "maintain_same_rate_action",
"editable_price_list_rate", "editable_price_list_rate",
"validate_selling_price", "validate_selling_price",
"calculate_product_bundle_price_based_on_child_items_rates", "editable_bundle_item_rates",
"sales_transactions_settings_section",
"so_required", "so_required",
"dn_required", "dn_required",
"sales_update_frequency", "sales_update_frequency",
@@ -159,47 +158,16 @@
"fieldtype": "Link", "fieldtype": "Link",
"label": "Role Allowed to Override Stop Action", "label": "Role Allowed to Override Stop Action",
"options": "Role" "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", "fieldname": "column_break_15",
"fieldtype": "Column Break" "fieldtype": "Column Break"
}, },
{
"fieldname": "sales_transactions_settings_section",
"fieldtype": "Section Break",
"label": "Transaction Settings"
},
{ {
"default": "0", "default": "0",
"fieldname": "calculate_product_bundle_price_based_on_child_items_rates", "fieldname": "editable_bundle_item_rates",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Calculate Product Bundle Price based on Child Items' Rates" "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", "icon": "fa fa-cog",
@@ -207,11 +175,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2021-08-24 22:08:34.470897",
"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_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",