From 84395171bdad605f9edb8e1577df84e401fa9135 Mon Sep 17 00:00:00 2001 From: KolushovAlexandr Date: Thu, 15 Nov 2018 15:05:59 +0500 Subject: [PATCH 1/3] :arrow_up::one::two: ir_config_parameter_multi_company --- ir_config_parameter_multi_company/__init__.py | 2 +- ir_config_parameter_multi_company/__manifest__.py | 2 +- ir_config_parameter_multi_company/doc/index.rst | 2 +- .../migrations/11.0.2.0.0/post-prepare-value-column.py | 4 ++-- .../models/ir_config_parameter.py | 2 +- ir_config_parameter_multi_company/models/ir_property.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ir_config_parameter_multi_company/__init__.py b/ir_config_parameter_multi_company/__init__.py index 1954ef0114..545186d648 100644 --- a/ir_config_parameter_multi_company/__init__.py +++ b/ir_config_parameter_multi_company/__init__.py @@ -6,7 +6,7 @@ def uninstall_hook(cr, registry): env = api.Environment(cr, SUPERUSER_ID, {}) # remove properties - field_id = env.ref('base.field_ir_config_parameter_value').id + field_id = env.ref('base.field_ir_config_parameter__value').id env['ir.property'].search([('fields_id', '=', field_id)]).unlink() # update base module diff --git a/ir_config_parameter_multi_company/__manifest__.py b/ir_config_parameter_multi_company/__manifest__.py index 571448f99e..4e3872b0cd 100644 --- a/ir_config_parameter_multi_company/__manifest__.py +++ b/ir_config_parameter_multi_company/__manifest__.py @@ -31,5 +31,5 @@ "uninstall_hook": 'uninstall_hook', "auto_install": False, - "installable": False, + "installable": True, } diff --git a/ir_config_parameter_multi_company/doc/index.rst b/ir_config_parameter_multi_company/doc/index.rst index 2bf4518974..ee74c82c3d 100644 --- a/ir_config_parameter_multi_company/doc/index.rst +++ b/ir_config_parameter_multi_company/doc/index.rst @@ -14,7 +14,7 @@ Configuration * Open menu ``[[ Settings ]] >> General Settings`` * Activate **[x] Multi Company - Manage multiple companies** * Click ``[Apply]`` -* Open menu ``[[ Settings ]] >> Users >> Users`` +* Open menu ``[[ Settings ]] >> Users & Companies >> Users`` * Select your user * Add some companies to **Allowed Companies** field diff --git a/ir_config_parameter_multi_company/migrations/11.0.2.0.0/post-prepare-value-column.py b/ir_config_parameter_multi_company/migrations/11.0.2.0.0/post-prepare-value-column.py index 154008ce60..8655428131 100644 --- a/ir_config_parameter_multi_company/migrations/11.0.2.0.0/post-prepare-value-column.py +++ b/ir_config_parameter_multi_company/migrations/11.0.2.0.0/post-prepare-value-column.py @@ -8,11 +8,11 @@ def migrate(cr, version): # _update_config_parameter_value method yet env = api.Environment(cr, SUPERUSER_ID, {}) - field_id = env.ref('base.field_ir_config_parameter_value').id + field_id = env.ref('base.field_ir_config_parameter__value').id default_values = env['ir.property'].search([ ('fields_id', '=', field_id), ('company_id', '=', False) ]) - field = env.ref('base.field_ir_config_parameter_value') + field = env.ref('base.field_ir_config_parameter__value') default_values._update_db_value_website_dependent(field) diff --git a/ir_config_parameter_multi_company/models/ir_config_parameter.py b/ir_config_parameter_multi_company/models/ir_config_parameter.py index 221ab7a3eb..29e65cad7a 100644 --- a/ir_config_parameter_multi_company/models/ir_config_parameter.py +++ b/ir_config_parameter_multi_company/models/ir_config_parameter.py @@ -1,7 +1,7 @@ import logging from odoo import models, fields, api, tools -from odoo.addons.base.ir.ir_config_parameter import IrConfigParameter as IrConfigParameterOriginal +from odoo.addons.base.models.ir_config_parameter import IrConfigParameter as IrConfigParameterOriginal _logger = logging.getLogger(__name__) diff --git a/ir_config_parameter_multi_company/models/ir_property.py b/ir_config_parameter_multi_company/models/ir_property.py index ef82ad24e5..86f4f32711 100644 --- a/ir_config_parameter_multi_company/models/ir_property.py +++ b/ir_config_parameter_multi_company/models/ir_property.py @@ -7,6 +7,6 @@ class IrProperty(models.Model): @api.multi def write(self, vals): res = super(IrProperty, self).write(vals) - field = self.env.ref('base.field_ir_config_parameter_value') + field = self.env.ref('base.field_ir_config_parameter__value') self._update_db_value_website_dependent(field) return res From 49a830ba65a6baf43f84a7bf45294bc0a4705ed7 Mon Sep 17 00:00:00 2001 From: KolushovAlexandr Date: Fri, 16 Nov 2018 14:52:05 +0500 Subject: [PATCH 2/3] :book: correct module version in docks --- ir_config_parameter_multi_company/README.rst | 6 +++--- ir_config_parameter_multi_company/__manifest__.py | 2 +- ir_config_parameter_multi_company/doc/index.rst | 2 +- .../static/description/index.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ir_config_parameter_multi_company/README.rst b/ir_config_parameter_multi_company/README.rst index 5a4d064096..3e9d402cd1 100644 --- a/ir_config_parameter_multi_company/README.rst +++ b/ir_config_parameter_multi_company/README.rst @@ -44,12 +44,12 @@ Maintainers Further information =================== -Demo: http://runbot.it-projects.info/demo/misc-addons/10.0 +Demo: http://runbot.it-projects.info/demo/misc-addons/12.0 -HTML Description: https://apps.odoo.com/apps/modules/10.0/ir_config_parameter_multi_company/ +HTML Description: https://apps.odoo.com/apps/modules/12.0/ir_config_parameter_multi_company/ Usage instructions: ``_ Changelog: ``_ -Tested on Odoo 11.0 8787f5acee9b5d2cad15b97804522dc04717a1c1 +Tested on Odoo 12.0 80cef9e8c52ff7dc0715a7478a2288d3de7065df diff --git a/ir_config_parameter_multi_company/__manifest__.py b/ir_config_parameter_multi_company/__manifest__.py index 4e3872b0cd..1f1e81bf17 100644 --- a/ir_config_parameter_multi_company/__manifest__.py +++ b/ir_config_parameter_multi_company/__manifest__.py @@ -4,7 +4,7 @@ "category": "Extra Tools", # "live_test_url": "", "images": [], - "version": "11.0.5.0.0", + "version": "12.0.5.0.0", "application": False, "author": "IT-Projects LLC, Ivan Yelizariev", diff --git a/ir_config_parameter_multi_company/doc/index.rst b/ir_config_parameter_multi_company/doc/index.rst index ee74c82c3d..0922ff36c4 100644 --- a/ir_config_parameter_multi_company/doc/index.rst +++ b/ir_config_parameter_multi_company/doc/index.rst @@ -72,7 +72,7 @@ All system parameters created before module installation (as well as just create * **param2** = *value22* (value for companyB) * **param3** = *value3* (via default value) -For understanding how multi-website values work see Documentation of `web_website `__ +For understanding how multi-website values work see Documentation of `web_website `__ Company Properties ------------------ diff --git a/ir_config_parameter_multi_company/static/description/index.html b/ir_config_parameter_multi_company/static/description/index.html index 1bcba99896..ecb8a85998 100644 --- a/ir_config_parameter_multi_company/static/description/index.html +++ b/ir_config_parameter_multi_company/static/description/index.html @@ -77,7 +77,7 @@

Need our service?

-o-transform: rotate(-1deg); -moz-transform: rotate(-1deg); -ms-transform: rotate(-1deg);"> - Tested on Odoo
10.0 community + Tested on Odoo
12.0 community