[IMP] various: reorganize the general setting
Purpose of the task is, 'general setting' is not easily understandable by the user. The user often gets lost. This is especially damaging through onboarding as some new users like to discover the software by scrolling through the general settings. So in this commit, the general setting is well organized and easily understandable by the user. Related PR: https://github.com/odoo/enterprise/pull/14707 closes odoo/odoo#61645 Taskid: 2374990 Related: odoo/enterprise#14707 Related: odoo/upgrade#1958 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
Urvi Soni
committed by
Yannick Tivisse
Yannick Tivisse
parent
8444643cc6
commit
e109e476e6
@@ -15,7 +15,7 @@ class ResConfigSettings(models.TransientModel):
|
||||
"Default Access Rights",
|
||||
config_parameter='base_setup.default_user_rights')
|
||||
external_email_server_default = fields.Boolean(
|
||||
"External Email Servers",
|
||||
"Custom Email Servers",
|
||||
config_parameter='base_setup.default_external_email_server')
|
||||
module_base_import = fields.Boolean("Allow users to import data from CSV/XLS/XLSX/ODS files")
|
||||
module_google_calendar = fields.Boolean(
|
||||
@@ -39,7 +39,6 @@ class ResConfigSettings(models.TransientModel):
|
||||
group_multi_currency = fields.Boolean(string='Multi-Currencies',
|
||||
implied_group='base.group_multi_currency',
|
||||
help="Allows to work in a multi currency environment")
|
||||
paperformat_id = fields.Many2one(related="company_id.paperformat_id", string='Paper format', readonly=False)
|
||||
external_report_layout_id = fields.Many2one(related="company_id.external_report_layout_id", readonly=False)
|
||||
show_effect = fields.Boolean(string="Show Effect", config_parameter='base_setup.show_effect')
|
||||
company_count = fields.Integer('Number of Companies', compute="_compute_company_count")
|
||||
|
||||
@@ -12,6 +12,11 @@
|
||||
<div id="invite_users">
|
||||
<h2>Users</h2>
|
||||
<div class="row mt16 o_settings_container" name="users_setting_container">
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="invite_users_setting">
|
||||
<div class="o_setting_right_pane">
|
||||
<widget name='res_config_invite_users'/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="active_user_setting">
|
||||
<div class="o_setting_right_pane">
|
||||
<span class="fa fa-lg fa-users" aria-label="Number of active users"/>
|
||||
@@ -25,42 +30,6 @@
|
||||
<a href="https://www.odoo.com/documentation/user/14.0/general/odoo_basics/add_user.html" title="Documentation" class="o_doc_link" target="_blank"></a>
|
||||
<br/>
|
||||
<button name="%(base.action_res_users)d" icon="fa-arrow-right" type="action" string="Manage Users" class="btn-link o_web_settings_access_rights"/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="invite_users_setting">
|
||||
<div class="o_setting_right_pane">
|
||||
<widget name='res_config_invite_users'/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="companies">
|
||||
<h2>Companies</h2>
|
||||
<div class="row mt16 o_settings_container" name="companies_setting_container">
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="company_details_settings">
|
||||
<div class="o_setting_right_pane">
|
||||
<field name="company_name" class="font-weight-bold"/>
|
||||
<br/>
|
||||
<field name="company_informations" class="text-muted" style="width: 90%;"/>
|
||||
<br/>
|
||||
<button name="open_company" icon="fa-arrow-right" type="object" string="Update Info" class="btn-link"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="companies_setting">
|
||||
<div class="o_setting_right_pane">
|
||||
<field name='company_count' class="w-auto pl-1 font-weight-bold"/>
|
||||
<span class='o_form_label' attrs="{'invisible':[('company_count', '>', '1')]}">
|
||||
Company
|
||||
</span>
|
||||
<span class='o_form_label' attrs="{'invisible':[('company_count', '<=', '1')]}">
|
||||
Companies
|
||||
</span>
|
||||
<br/>
|
||||
<div class="mt8">
|
||||
<button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Manage Companies" class="btn-link"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -92,25 +61,19 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="business_documents">
|
||||
<h2>Business Documents</h2>
|
||||
<div class="row mt16 o_settings_container" name="business_documents_setting_container">
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="paper_format_setting">
|
||||
<div id="companies">
|
||||
<h2>Companies</h2>
|
||||
<div class="row mt16 o_settings_container" name="companies_setting_container">
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="company_details_settings">
|
||||
<field name="company_id" invisible="1"/>
|
||||
<div class="o_setting_right_pane">
|
||||
<span class="o_form_label">Format</span>
|
||||
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
|
||||
<div class="text-muted">
|
||||
Set the paper format of printed documents
|
||||
</div>
|
||||
<div class="content-group">
|
||||
<div class="mt16 row">
|
||||
<label for="paperformat_id" string="Format" class="col-3 col-lg-3 o_light_label"/>
|
||||
<field name="paperformat_id" class="oe_inline" required="1"/>
|
||||
</div>
|
||||
</div>
|
||||
<field name="company_name" class="font-weight-bold"/>
|
||||
<br/>
|
||||
<field name="company_informations" class="text-muted" style="width: 90%;"/>
|
||||
<br/>
|
||||
<button name="open_company" icon="fa-arrow-right" type="object" string="Update Info" class="btn-link"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="document_layout_setting">
|
||||
<br/>
|
||||
<div class="o_setting_right_pane">
|
||||
<span class="o_form_label">Document Layout</span>
|
||||
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
|
||||
@@ -128,10 +91,43 @@
|
||||
<button name="%(web.action_report_externalpreview)d" string="Preview Document" type="action" class="oe_link" groups="base.group_no_one"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="companies_setting">
|
||||
<div class="o_setting_right_pane">
|
||||
<field name='company_count' class="w-auto pl-1 font-weight-bold"/>
|
||||
<span class='o_form_label' attrs="{'invisible':[('company_count', '>', '1')]}">
|
||||
Company
|
||||
</span>
|
||||
<span class='o_form_label' attrs="{'invisible':[('company_count', '<=', '1')]}">
|
||||
Companies
|
||||
</span>
|
||||
<br/>
|
||||
<div class="mt8">
|
||||
<button name="%(base.action_res_company_form)d" icon="fa-arrow-right" type="action" string="Manage Companies" class="btn-link"/>
|
||||
</div>
|
||||
</div>
|
||||
<br/>
|
||||
<div id="inter_company" groups="base.group_multi_company" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company.">
|
||||
<field name="company_id" invisible="1"/>
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_account_inter_company_rules" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label string="Inter-Company Transactions" for="module_account_inter_company_rules"/>
|
||||
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
|
||||
<div class="text-muted">
|
||||
Automatically generate counterpart documents for orders/invoices between companies
|
||||
</div>
|
||||
<div class="content-group" attrs="{'invisible': [('module_account_inter_company_rules','=',False)]}" id="inter_companies_rules">
|
||||
<div class="mt16 text-warning"><strong>Save</strong> this page and come back here to set up the feature.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="emails"/>
|
||||
|
||||
<div id="contacts_settings">
|
||||
<h2>Contacts</h2>
|
||||
@@ -161,7 +157,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="emails"/>
|
||||
|
||||
<h2>Permissions</h2>
|
||||
<div class="row mt16 o_settings_container" id="user_default_rights">
|
||||
<div class="col-12 col-lg-6 o_setting_box" title="By default, new users get highest access rights for all installed apps." id="access_rights">
|
||||
@@ -211,27 +207,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="multi_company" groups="base.group_multi_company">
|
||||
<field name="company_id" invisible="1"/>
|
||||
<h2>Multi-Company</h2>
|
||||
<div class="row mt16 o_settings_container" name="multicompany_setting_container">
|
||||
<div class="col-12 col-lg-6 o_setting_box" title="Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." id="inter_company">
|
||||
<div class="o_setting_left_pane">
|
||||
<field name="module_account_inter_company_rules" widget="upgrade_boolean"/>
|
||||
</div>
|
||||
<div class="o_setting_right_pane">
|
||||
<label string="Inter-Company Transactions" for="module_account_inter_company_rules"/>
|
||||
<span class="fa fa-lg fa-building-o" title="Values set here are company-specific." aria-label="Values set here are company-specific." groups="base.group_multi_company" role="img"/>
|
||||
<div class="text-muted">
|
||||
Automatically generate counterpart documents for orders/invoices between companies
|
||||
</div>
|
||||
<div class="content-group" attrs="{'invisible': [('module_account_inter_company_rules','=',False)]}" id="inter_companies_rules">
|
||||
<div class="mt16 text-warning"><strong>Save</strong> this page and come back here to set up the feature.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2>Integrations</h2>
|
||||
<div class="row mt16 o_settings_container" name="integration">
|
||||
<div class="col-12 col-lg-6 o_setting_box" id="external_pads_setting">
|
||||
|
||||
Reference in New Issue
Block a user