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

Merge pull request #17950 from Anurag810/company_ui/ux_fix

Browse Source 
fix: Make some section collapsible in company form
This commit is contained in:
Mangesh-Khairnar 2019-06-17 17:00:00 +05:30 committed by GitHub
commit 7b2a2816cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches.txt
View File

@ -602,6 +602,6 @@ erpnext.patches.v11_1.set_salary_details_submittable
erpnext.patches.v11_1.rename_depends_on_lwp erpnext.patches.v11_1.rename_depends_on_lwp
execute:frappe.delete_doc("Report", "Inactive Items") execute:frappe.delete_doc("Report", "Inactive Items")
erpnext.patches.v11_1.delete_scheduling_tool erpnext.patches.v11_1.delete_scheduling_tool
erpnext.patches.v12_0.make_custom_fields_for_bank_remittance erpnext.patches.v12_0.make_custom_fields_for_bank_remittance #14-06-2019
execute:frappe.delete_doc_if_exists("Page", "support-analytics") execute:frappe.delete_doc_if_exists("Page", "support-analytics")
erpnext.patches.v12_0.make_item_manufacturer erpnext.patches.v12_0.make_item_manufacturer

2
erpnext/regional/india/setup.py
View File

@ -275,7 +275,7 @@ def make_custom_fields(update=True):
], ],
'Company': [ 'Company': [
dict(fieldname='hra_section', label='HRA Settings', dict(fieldname='hra_section', label='HRA Settings',
fieldtype='Section Break', insert_after='asset_received_but_not_billed'), fieldtype='Section Break', insert_after='asset_received_but_not_billed', collapsible=1),
dict(fieldname='basic_component', label='Basic Component', dict(fieldname='basic_component', label='Basic Component',
fieldtype='Link', options='Salary Component', insert_after='hra_section'), fieldtype='Link', options='Salary Component', insert_after='hra_section'),
dict(fieldname='hra_component', label='HRA Component', dict(fieldname='hra_component', label='HRA Component',

7
erpnext/setup/doctype/company/company.json
View File

@ -170,9 +170,10 @@
"label": "Company Description" "label": "Company Description"
}, },
{ {
"collapsible": 1,
"fieldname": "sales_settings", "fieldname": "sales_settings",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Sales" "label": "Sales Settings"
}, },
{ {
"fieldname": "sales_monthly_history", "fieldname": "sales_monthly_history",
@ -530,6 +531,7 @@
"options": "Account" "options": "Account"
}, },
{ {
"collapsible": 1,
"fieldname": "fixed_asset_depreciation_settings", "fieldname": "fixed_asset_depreciation_settings",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Fixed Asset Depreciation Settings" "label": "Fixed Asset Depreciation Settings"
@ -602,6 +604,7 @@
"options": "Role" "options": "Role"
}, },
{ {
"collapsible": 1,
"description": "For reference only.", "description": "For reference only.",
"fieldname": "company_info", "fieldname": "company_info",
"fieldtype": "Section Break", "fieldtype": "Section Break",
@ -708,7 +711,7 @@
"icon": "fa fa-building", "icon": "fa fa-building",
"idx": 1, "idx": 1,
"image_field": "company_logo", "image_field": "company_logo",
"modified": "2019-06-13 18:03:14.764423", "modified": "2019-06-14 14:36:11.363309",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Company", "name": "Company",