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

Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix

Browse Source
This commit is contained in:
Himanshu Warekar
2019-06-17 23:53:01 +05:30
parent 0ad3887d51 3d47a6dbb5
commit 7c18f69727
19 changed files with 514 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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