summaryrefslogtreecommitdiff
path: root/addons/account
diff options
context:
space:
mode:
authorYannick Tivisse <yti@odoo.com>2017-08-31 12:18:09 +0200
committerYannick Tivisse <yti@odoo.com>2017-09-01 13:03:18 +0200
commit781a03b2bc33e2fba96ab85ac38696c0691e7629 (patch)
treef9d1f3f60c4c7bbe0da290e8699bb3dd1747dc12 /addons/account
parent898224f110932addb0e976a3ca60542cda80de25 (diff)
[IMP] res_config: Update file names, xmlids, class names according to guidelines
Now that we only have one model (res.config.settings). Uniformize everything according to the guidelines.
Diffstat (limited to 'addons/account')
-rw-r--r--addons/account/__manifest__.py2
-rw-r--r--addons/account/models/__init__.py2
-rw-r--r--addons/account/models/res_config_settings.py (renamed from addons/account/models/account_config_settings.py)8
-rw-r--r--addons/account/views/res_config_settings_views.xml (renamed from addons/account/views/account_config_settings_views.xml)6
4 files changed, 9 insertions, 9 deletions
diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index 5fdefa8ad1a..3d2228d3605 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -56,7 +56,7 @@ Core mechanisms for the accounting modules. To display the menuitems, install th
'views/report_agedpartnerbalance.xml',
'views/tax_adjustments.xml',
'wizard/wizard_tax_adjustments_view.xml',
- 'views/account_config_settings_views.xml',
+ 'views/res_config_settings_views.xml',
'views/web_planner_data.xml',
'views/account_journal_dashboard_view.xml',
'views/account_portal_templates.xml',
diff --git a/addons/account/models/__init__.py b/addons/account/models/__init__.py
index 440f89134bf..2e9cc211e15 100644
--- a/addons/account/models/__init__.py
+++ b/addons/account/models/__init__.py
@@ -11,5 +11,5 @@ from . import account_analytic_line
from . import account_journal_dashboard
from . import product
from . import company
-from . import account_config_settings
+from . import res_config_settings
from . import web_planner
diff --git a/addons/account/models/account_config_settings.py b/addons/account/models/res_config_settings.py
index a46c34bc079..b0b11f47d34 100644
--- a/addons/account/models/account_config_settings.py
+++ b/addons/account/models/res_config_settings.py
@@ -4,7 +4,7 @@
from odoo import api, fields, models, _
-class AccountConfigSettings(models.TransientModel):
+class ResConfigSettings(models.TransientModel):
_inherit = 'res.config.settings'
company_id = fields.Many2one('res.company', string='Company', required=True,
@@ -65,7 +65,7 @@ class AccountConfigSettings(models.TransientModel):
@api.model
def get_values(self):
- res = super(AccountConfigSettings, self).get_values()
+ res = super(ResConfigSettings, self).get_values()
params = self.env['ir.config_parameter'].sudo()
res.update(
default_purchase_tax_id=int(params.get_param('account.default_purchase_tax_id', default=False)) or False,
@@ -75,7 +75,7 @@ class AccountConfigSettings(models.TransientModel):
@api.multi
def set_values(self):
- super(AccountConfigSettings, self).set_values()
+ super(ResConfigSettings, self).set_values()
self.env['ir.config_parameter'].sudo().set_param("account.default_purchase_tax_id", self.default_purchase_tax_id.id)
self.env['ir.config_parameter'].sudo().set_param("account.default_sale_tax_id", self.default_sale_tax_id.id)
if self.group_multi_currency:
@@ -152,4 +152,4 @@ class AccountConfigSettings(models.TransientModel):
values.pop('currency_id')
if company.accounts_code_digits == values.get('code_digits'):
values.pop('code_digits')
- return super(AccountConfigSettings, self).create(values)
+ return super(ResConfigSettings, self).create(values)
diff --git a/addons/account/views/account_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index 7711246620a..e3cff4bf7d5 100644
--- a/addons/account/views/account_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -9,11 +9,11 @@
<field name="search_view_id" ref="base.view_module_filter"/>
</record>
- <record id="account_config_settings_view_form" model="ir.ui.view">
- <field name="name">account.config.settings.form</field>
+ <record id="res_config_settings_view_form" model="ir.ui.view">
+ <field name="name">res.config.settings.view.form.inherit.account</field>
<field name="model">res.config.settings</field>
<field name="priority" eval="8"/>
- <field name="inherit_id" ref="base.res_config_setting_form"/>
+ <field name="inherit_id" ref="base.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]" position="inside">
<div class="app_settings_block" data-string="Accounting" data-key="account_invoicing" groups="account.group_account_manager">