From 97e4ec7841bdf8ddcba308248235008264f0508d Mon Sep 17 00:00:00 2001 From: David Date: Wed, 21 Aug 2019 12:36:02 +0200 Subject: [PATCH 01/11] [ADD] base_global_discount: New Module 11.0 --- base_global_discount/README.rst | 101 ++++++++++++++ base_global_discount/__init__.py | 1 + base_global_discount/__manifest__.py | 22 ++++ base_global_discount/i18n/es.po | 121 +++++++++++++++++ base_global_discount/models/__init__.py | 2 + .../models/global_discount.py | 58 ++++++++ base_global_discount/models/res_partner.py | 22 ++++ base_global_discount/readme/CONFIGURE.rst | 5 + base_global_discount/readme/CONTRIBUTORS.rst | 6 + base_global_discount/readme/DESCRIPTION.rst | 3 + base_global_discount/readme/USAGE.rst | 7 + .../security/ir.model.access.csv | 3 + base_global_discount/security/security.xml | 16 +++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 124 ++++++++++++++++++ base_global_discount/tests/__init__.py | 1 + .../tests/test_global_discount.py | 33 +++++ .../views/global_discount_views.xml | 49 +++++++ .../views/res_partner_views.xml | 21 +++ 19 files changed, 595 insertions(+) create mode 100644 base_global_discount/README.rst create mode 100644 base_global_discount/__init__.py create mode 100644 base_global_discount/__manifest__.py create mode 100644 base_global_discount/i18n/es.po create mode 100644 base_global_discount/models/__init__.py create mode 100644 base_global_discount/models/global_discount.py create mode 100644 base_global_discount/models/res_partner.py create mode 100644 base_global_discount/readme/CONFIGURE.rst create mode 100644 base_global_discount/readme/CONTRIBUTORS.rst create mode 100644 base_global_discount/readme/DESCRIPTION.rst create mode 100644 base_global_discount/readme/USAGE.rst create mode 100644 base_global_discount/security/ir.model.access.csv create mode 100644 base_global_discount/security/security.xml create mode 100644 base_global_discount/static/description/icon.png create mode 100644 base_global_discount/static/description/index.html create mode 100644 base_global_discount/tests/__init__.py create mode 100644 base_global_discount/tests/test_global_discount.py create mode 100644 base_global_discount/views/global_discount_views.xml create mode 100644 base_global_discount/views/res_partner_views.xml diff --git a/base_global_discount/README.rst b/base_global_discount/README.rst new file mode 100644 index 00000000..a4b9095d --- /dev/null +++ b/base_global_discount/README.rst @@ -0,0 +1,101 @@ +==================== +Base Global Discount +==================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fserver--backend-lightgray.png?logo=github + :target: https://github.com/OCA/server-backend/tree/11.0/base_global_discount + :alt: OCA/server-backend +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/server-backend-11-0/server-backend-11-0-base_global_discount + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/253/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Base module to have global discounts applied to either sales or purchases. It +doesn't do much for itself, so account_global_discount or +purchase_global_discount should be installed to benefit from it. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To use this module, you need to: + +#. Go to *Settings > Parameters > Global Discounts* +#. Add a new discount that can be either by percentage or fixed amount. +#. Choose the discount scope (sales or purchases). +#. You can also restrict it to a certain company if needed. + +Usage +===== + +You can assign global discounts to partners as well: + +#. Go to a partner that is a company. +#. Go to the *Sales & Purchases* tab. +#. In section sale (if the partner is a customer), you can set sale discounts. +#. In section purchase (if the partner is a supplier), you can set purchase + discounts. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_ + + * Pedro M. Baeza + * David Vidal + * Carlos Dauden + * Rafael Blasco + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/server-backend `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_global_discount/__init__.py b/base_global_discount/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/base_global_discount/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/base_global_discount/__manifest__.py b/base_global_discount/__manifest__.py new file mode 100644 index 00000000..a0b57380 --- /dev/null +++ b/base_global_discount/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright 2019 Tecnativa S.L. - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': 'Base Global Discount', + 'version': '11.0.1.0.0', + 'category': 'Base', + 'author': 'Tecnativa,' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/server-backend', + 'license': 'AGPL-3', + 'depends': [ + 'product', + ], + 'data': [ + 'security/ir.model.access.csv', + 'security/security.xml', + 'views/global_discount_views.xml', + 'views/res_partner_views.xml', + ], + 'application': False, + 'installable': True, +} diff --git a/base_global_discount/i18n/es.po b/base_global_discount/i18n/es.po new file mode 100644 index 00000000..e1bc6f28 --- /dev/null +++ b/base_global_discount/i18n/es.po @@ -0,0 +1,121 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_global_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-23 06:22+0000\n" +"PO-Revision-Date: 2019-08-23 06:22+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_company_id +msgid "Company" +msgstr "Compañía" + +#. module: base_global_discount +#: model:ir.model,name:base_global_discount.model_res_partner +msgid "Contact" +msgstr "Contacto" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_create_uid +msgid "Created by" +msgstr "Creado por" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_create_date +msgid "Created on" +msgstr "Creado el" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_discount +msgid "Discount" +msgstr "Descuento" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_name +msgid "Discount Name" +msgstr "Nombre del descuento" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_discount_scope +msgid "Discount Scope" +msgstr "Ámbito del descuento" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_display_name +msgid "Display Name" +msgstr "Nombre mostrado" + +#. module: base_global_discount +#: model:ir.model.fields,help:base_global_discount.field_global_discount_sequence +msgid "Gives the order to apply discounts" +msgstr "Orden en el que se aplicarán los descuentos" + +#. module: base_global_discount +#: model:ir.model,name:base_global_discount.model_global_discount +msgid "Global Discount" +msgstr "Descuento Global" + +#. module: base_global_discount +#: model:ir.actions.act_window,name:base_global_discount.action_global_discount_tree +#: model:ir.ui.menu,name:base_global_discount.menu_global_discount +#: model:ir.ui.view,arch_db:base_global_discount.global_discount_view_tree +msgid "Global Discounts" +msgstr "Descuentos Globales" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_id +msgid "ID" +msgstr "ID" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount___last_update +msgid "Last Modified on" +msgstr "Última Modificación en" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_write_uid +msgid "Last Updated by" +msgstr "Última Actualización por" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_write_date +msgid "Last Updated on" +msgstr "Última Actualización el" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner_supplier_global_discount_ids +#: model:ir.model.fields,field_description:base_global_discount.field_res_users_supplier_global_discount_ids +msgid "Purchase Global Discounts" +msgstr "Descuentos globales de compra" + +#. module: base_global_discount +#: selection:global.discount,discount_scope:0 +msgid "Purchases" +msgstr "Compras" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner_customer_global_discount_ids +#: model:ir.model.fields,field_description:base_global_discount.field_res_users_customer_global_discount_ids +msgid "Sale Global Discounts" +msgstr "Descuentos de venta globales" + +#. module: base_global_discount +#: selection:global.discount,discount_scope:0 +msgid "Sales" +msgstr "Ventas" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_sequence +msgid "Sequence" +msgstr "Secuencia" + diff --git a/base_global_discount/models/__init__.py b/base_global_discount/models/__init__.py new file mode 100644 index 00000000..8a1089ed --- /dev/null +++ b/base_global_discount/models/__init__.py @@ -0,0 +1,2 @@ +from . import global_discount +from . import res_partner diff --git a/base_global_discount/models/global_discount.py b/base_global_discount/models/global_discount.py new file mode 100644 index 00000000..10f5b294 --- /dev/null +++ b/base_global_discount/models/global_discount.py @@ -0,0 +1,58 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models +from odoo.addons import decimal_precision as dp + + +class GlobalDiscount(models.Model): + _name = 'global.discount' + _description = 'Global Discount' + _order = "sequence, id desc" + + sequence = fields.Integer( + help='Gives the order to apply discounts', + ) + name = fields.Char( + string='Discount Name', + required=True, + ) + discount = fields.Float( + digits=dp.get_precision('Discount'), + required=True, + default=0.0, + ) + discount_scope = fields.Selection( + selection=[ + ('sale', 'Sales'), + ('purchase', 'Purchases'), + ], + default='sale', + required='True', + string='Discount Scope', + ) + company_id = fields.Many2one( + comodel_name='res.company', + string='Company', + default=lambda self: self.env.user.company_id, + ) + + def name_get(self): + result = [] + for one in self: + result.append( + (one.id, '{} ({:.2f}%)'.format(one.name, one.discount))) + return result + + def _get_global_discount_vals(self, base, **kwargs): + """ Prepare the dict of values to create to obtain the discounted + amount + + :param float base: the amount to discount + :return: dict with the discounted amount + """ + self.ensure_one() + return { + 'global_discount': self, + 'base': base, + 'base_discounted': base * (1 - (self.discount / 100)), + } diff --git a/base_global_discount/models/res_partner.py b/base_global_discount/models/res_partner.py new file mode 100644 index 00000000..16a25aca --- /dev/null +++ b/base_global_discount/models/res_partner.py @@ -0,0 +1,22 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from odoo import fields, models + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + customer_global_discount_ids = fields.Many2many( + comodel_name='global.discount', + column1='partner_id', + column2='global_discount_id', + string='Sale Global Discounts', + domain=[('discount_scope', '=', 'sale')], + ) + supplier_global_discount_ids = fields.Many2many( + comodel_name='global.discount', + column1='partner_id', + column2='global_discount_id', + string='Purchase Global Discounts', + domain=[('discount_scope', '=', 'purchase')], + ) diff --git a/base_global_discount/readme/CONFIGURE.rst b/base_global_discount/readme/CONFIGURE.rst new file mode 100644 index 00000000..0e5cea40 --- /dev/null +++ b/base_global_discount/readme/CONFIGURE.rst @@ -0,0 +1,5 @@ +To use this module, you need to: + +#. Go to *Settings > Parameters > Global Discounts* +#. Choose the discount scope (sales or purchases). +#. You can also restrict it to a certain company if needed. diff --git a/base_global_discount/readme/CONTRIBUTORS.rst b/base_global_discount/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..7b1dda35 --- /dev/null +++ b/base_global_discount/readme/CONTRIBUTORS.rst @@ -0,0 +1,6 @@ +* `Tecnativa `_ + + * Pedro M. Baeza + * David Vidal + * Carlos Dauden + * Rafael Blasco diff --git a/base_global_discount/readme/DESCRIPTION.rst b/base_global_discount/readme/DESCRIPTION.rst new file mode 100644 index 00000000..7006b993 --- /dev/null +++ b/base_global_discount/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +Base module to have global discounts applied to either sales or purchases. It +doesn't do much for itself, so account_global_discount or +purchase_global_discount should be installed to benefit from it. diff --git a/base_global_discount/readme/USAGE.rst b/base_global_discount/readme/USAGE.rst new file mode 100644 index 00000000..8d9135e4 --- /dev/null +++ b/base_global_discount/readme/USAGE.rst @@ -0,0 +1,7 @@ +You can assign global discounts to partners as well: + +#. Go to a partner that is a company. +#. Go to the *Sales & Purchases* tab. +#. In section sale (if the partner is a customer), you can set sale discounts. +#. In section purchase (if the partner is a supplier), you can set purchase + discounts. diff --git a/base_global_discount/security/ir.model.access.csv b/base_global_discount/security/ir.model.access.csv new file mode 100644 index 00000000..33fcbd8f --- /dev/null +++ b/base_global_discount/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_global_discount_user,Global Discount Users,model_global_discount,base.group_user,1,0,0,0 +access_global_discount_partner_manager,Global Discount Partner Manager,model_global_discount,base.group_partner_manager,1,1,1,1 diff --git a/base_global_discount/security/security.xml b/base_global_discount/security/security.xml new file mode 100644 index 00000000..7adb4ae9 --- /dev/null +++ b/base_global_discount/security/security.xml @@ -0,0 +1,16 @@ + + + + + + Global Discount multi-company + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + + + + diff --git a/base_global_discount/static/description/icon.png b/base_global_discount/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/base_global_discount/static/description/index.html b/base_global_discount/static/description/index.html new file mode 100644 index 00000000..27f06742 --- /dev/null +++ b/base_global_discount/static/description/index.html @@ -0,0 +1,124 @@ +
+
+
+

Module name

+

This module was written to extend the functionality of ... to support ... and allow you to ...

+
+
+
+ +
+
+
+

Installation

+
+
+

To install this module, you need to: +

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Configuration

+
+
+

To configure this module, you need to: +

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Usage

+
+
+

To use this module, you need to: +

    +
  • ...
    • +
+

+

For further information, please visit: +

+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Known issues / Roadmap

+
+
+

+

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Credits

+
+
+

Contributors

+ +
+
+

Maintainer

+

+ This module is maintained by the OCA.
+ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.
+ To contribute to this module, please visit http://odoo-community.org.
+ +

+
+
+
diff --git a/base_global_discount/tests/__init__.py b/base_global_discount/tests/__init__.py new file mode 100644 index 00000000..e9199cd7 --- /dev/null +++ b/base_global_discount/tests/__init__.py @@ -0,0 +1 @@ +from . import test_global_discount diff --git a/base_global_discount/tests/test_global_discount.py b/base_global_discount/tests/test_global_discount.py new file mode 100644 index 00000000..ddc55381 --- /dev/null +++ b/base_global_discount/tests/test_global_discount.py @@ -0,0 +1,33 @@ +# Copyright 2019 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo.tests import common + + +class TestGlobalDiscount(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.global_discount_obj = cls.env['global.discount'] + cls.global_discount_1 = cls.global_discount_obj.create({ + 'name': 'Test Discount 1', + 'discount_scope': 'sale', + 'discount': 20, + }) + cls.global_discount_2 = cls.global_discount_obj.create({ + 'name': 'Test Discount 2', + 'discount_scope': 'sale', + 'discount': 30, + }) + + def test_01_global_discounts(self): + """Chain two discounts of different types""" + discount_vals = self.global_discount_1._get_global_discount_vals(100.0) + self.assertAlmostEqual(discount_vals['base_discounted'], 80.0) + discount_vals = self.global_discount_2._get_global_discount_vals( + discount_vals['base_discounted']) + self.assertAlmostEqual(discount_vals['base_discounted'], 56.0) + + def test_02_display_name(self): + """Test that the name is computed fine""" + self.assertTrue('%)' in self.global_discount_1.display_name) diff --git a/base_global_discount/views/global_discount_views.xml b/base_global_discount/views/global_discount_views.xml new file mode 100644 index 00000000..3023274e --- /dev/null +++ b/base_global_discount/views/global_discount_views.xml @@ -0,0 +1,49 @@ + + + + + + global.discount + + + + + + + + + + + + + global.discount + +
+ + + + + + + + + +
+ + + + + Global Discounts + ir.actions.act_window + global.discount + form + tree,form + + + + + diff --git a/base_global_discount/views/res_partner_views.xml b/base_global_discount/views/res_partner_views.xml new file mode 100644 index 00000000..be4aae3a --- /dev/null +++ b/base_global_discount/views/res_partner_views.xml @@ -0,0 +1,21 @@ + + + + + + res.partner + + + + + + + + + + + + From 2753660dc59dfd8dfe7e9f513db045d20fc1c3bb Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 27 Sep 2019 08:17:01 +0000 Subject: [PATCH 02/11] [UPD] Update base_global_discount.pot --- .../i18n/base_global_discount.pot | 120 ++++++++++++++++++ base_global_discount/i18n/es.po | 5 +- 2 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 base_global_discount/i18n/base_global_discount.pot diff --git a/base_global_discount/i18n/base_global_discount.pot b/base_global_discount/i18n/base_global_discount.pot new file mode 100644 index 00000000..fdfda3a7 --- /dev/null +++ b/base_global_discount/i18n/base_global_discount.pot @@ -0,0 +1,120 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * base_global_discount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_company_id +msgid "Company" +msgstr "" + +#. module: base_global_discount +#: model:ir.model,name:base_global_discount.model_res_partner +msgid "Contact" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_create_uid +msgid "Created by" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_create_date +msgid "Created on" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_discount +msgid "Discount" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_name +msgid "Discount Name" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_discount_scope +msgid "Discount Scope" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_display_name +msgid "Display Name" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,help:base_global_discount.field_global_discount_sequence +msgid "Gives the order to apply discounts" +msgstr "" + +#. module: base_global_discount +#: model:ir.model,name:base_global_discount.model_global_discount +msgid "Global Discount" +msgstr "" + +#. module: base_global_discount +#: model:ir.actions.act_window,name:base_global_discount.action_global_discount_tree +#: model:ir.ui.menu,name:base_global_discount.menu_global_discount +#: model:ir.ui.view,arch_db:base_global_discount.global_discount_view_form +#: model:ir.ui.view,arch_db:base_global_discount.global_discount_view_tree +msgid "Global Discounts" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_id +msgid "ID" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount___last_update +msgid "Last Modified on" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_write_uid +msgid "Last Updated by" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_write_date +msgid "Last Updated on" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner_supplier_global_discount_ids +#: model:ir.model.fields,field_description:base_global_discount.field_res_users_supplier_global_discount_ids +msgid "Purchase Global Discounts" +msgstr "" + +#. module: base_global_discount +#: selection:global.discount,discount_scope:0 +msgid "Purchases" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner_customer_global_discount_ids +#: model:ir.model.fields,field_description:base_global_discount.field_res_users_customer_global_discount_ids +msgid "Sale Global Discounts" +msgstr "" + +#. module: base_global_discount +#: selection:global.discount,discount_scope:0 +msgid "Sales" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_sequence +msgid "Sequence" +msgstr "" + diff --git a/base_global_discount/i18n/es.po b/base_global_discount/i18n/es.po index e1bc6f28..ffb48f02 100644 --- a/base_global_discount/i18n/es.po +++ b/base_global_discount/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_global_discount +# * base_global_discount # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2019-08-23 06:22+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -68,6 +69,7 @@ msgstr "Descuento Global" #. module: base_global_discount #: model:ir.actions.act_window,name:base_global_discount.action_global_discount_tree #: model:ir.ui.menu,name:base_global_discount.menu_global_discount +#: model:ir.ui.view,arch_db:base_global_discount.global_discount_view_form #: model:ir.ui.view,arch_db:base_global_discount.global_discount_view_tree msgid "Global Discounts" msgstr "Descuentos Globales" @@ -118,4 +120,3 @@ msgstr "Ventas" #: model:ir.model.fields,field_description:base_global_discount.field_global_discount_sequence msgid "Sequence" msgstr "Secuencia" - From 16e3163b39eb8a40f120235928555d0b46dda56e Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 27 Sep 2019 08:17:02 +0000 Subject: [PATCH 03/11] [UPD] Update base_suspend_security.pot --- .../i18n/base_suspend_security.pot | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/base_suspend_security/i18n/base_suspend_security.pot b/base_suspend_security/i18n/base_suspend_security.pot index cc2da331..9df5e7c4 100644 --- a/base_suspend_security/i18n/base_suspend_security.pot +++ b/base_suspend_security/i18n/base_suspend_security.pot @@ -13,6 +13,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" From 04ba1d156c030a7b78c61a13dd91e84105d46784 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Fri, 27 Sep 2019 08:17:03 +0000 Subject: [PATCH 04/11] [UPD] Update base_user_role.pot --- base_user_role/i18n/base_user_role.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base_user_role/i18n/base_user_role.pot b/base_user_role/i18n/base_user_role.pot index a47621b4..a53289bb 100644 --- a/base_user_role/i18n/base_user_role.pot +++ b/base_user_role/i18n/base_user_role.pot @@ -143,7 +143,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" From 455cb5d1ba7ff680ba9307628f595a5ee8b5cf97 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 27 Sep 2019 08:55:59 +0000 Subject: [PATCH 05/11] [UPD] README.rst --- base_global_discount/README.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/base_global_discount/README.rst b/base_global_discount/README.rst index a4b9095d..3a6ffd8b 100644 --- a/base_global_discount/README.rst +++ b/base_global_discount/README.rst @@ -40,7 +40,6 @@ Configuration To use this module, you need to: #. Go to *Settings > Parameters > Global Discounts* -#. Add a new discount that can be either by percentage or fixed amount. #. Choose the discount scope (sales or purchases). #. You can also restrict it to a certain company if needed. From 6228cea6f4d4d8a0bc9f3d32198b5b2dd40d874e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 27 Sep 2019 08:55:59 +0000 Subject: [PATCH 06/11] [ADD] setup.py --- setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + setup/base_global_discount/odoo/addons/base_global_discount | 1 + setup/base_global_discount/setup.cfg | 2 ++ setup/base_global_discount/setup.py | 6 ++++++ 5 files changed, 11 insertions(+), 1 deletion(-) create mode 120000 setup/base_global_discount/odoo/addons/base_global_discount create mode 100644 setup/base_global_discount/setup.cfg create mode 100644 setup/base_global_discount/setup.py diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index 314023b1..00edfaea 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -11.0.20190327.0 \ No newline at end of file +11.0.20190927.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 3e46c940..7f9a78a7 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -13,6 +13,7 @@ setuptools.setup( 'odoo11-addon-base_external_dbsource_mysql', 'odoo11-addon-base_external_dbsource_sqlite', 'odoo11-addon-base_external_system', + 'odoo11-addon-base_global_discount', 'odoo11-addon-base_suspend_security', 'odoo11-addon-base_user_role', ], diff --git a/setup/base_global_discount/odoo/addons/base_global_discount b/setup/base_global_discount/odoo/addons/base_global_discount new file mode 120000 index 00000000..4635850f --- /dev/null +++ b/setup/base_global_discount/odoo/addons/base_global_discount @@ -0,0 +1 @@ +../../../../base_global_discount \ No newline at end of file diff --git a/setup/base_global_discount/setup.cfg b/setup/base_global_discount/setup.cfg new file mode 100644 index 00000000..3c6e79cf --- /dev/null +++ b/setup/base_global_discount/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 diff --git a/setup/base_global_discount/setup.py b/setup/base_global_discount/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/base_global_discount/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 6c5b57dc23556c3933f3d97d9b9eabe5a68a9a8c Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Fri, 27 Sep 2019 08:56:07 +0000 Subject: [PATCH 07/11] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: server-backend-11.0/server-backend-11.0-base_suspend_security Translate-URL: https://translation.odoo-community.org/projects/server-backend-11-0/server-backend-11-0-base_suspend_security/ --- base_suspend_security/i18n/ar.po | 15 +++++++++++++++ base_suspend_security/i18n/ca.po | 15 +++++++++++++++ base_suspend_security/i18n/da.po | 15 +++++++++++++++ base_suspend_security/i18n/de.po | 15 +++++++++++++++ base_suspend_security/i18n/el_GR.po | 15 +++++++++++++++ base_suspend_security/i18n/en.po | 15 +++++++++++++++ base_suspend_security/i18n/es.po | 15 +++++++++++++++ base_suspend_security/i18n/es_ES.po | 15 +++++++++++++++ base_suspend_security/i18n/es_MX.po | 15 +++++++++++++++ base_suspend_security/i18n/fi.po | 15 +++++++++++++++ base_suspend_security/i18n/fr.po | 15 +++++++++++++++ base_suspend_security/i18n/fr_CA.po | 15 +++++++++++++++ base_suspend_security/i18n/fr_CH.po | 15 +++++++++++++++ base_suspend_security/i18n/fr_FR.po | 15 +++++++++++++++ base_suspend_security/i18n/hr.po | 15 +++++++++++++++ base_suspend_security/i18n/hr_HR.po | 15 +++++++++++++++ base_suspend_security/i18n/it.po | 15 +++++++++++++++ base_suspend_security/i18n/nl.po | 15 +++++++++++++++ base_suspend_security/i18n/nl_NL.po | 15 +++++++++++++++ base_suspend_security/i18n/pt.po | 15 +++++++++++++++ base_suspend_security/i18n/pt_BR.po | 15 +++++++++++++++ base_suspend_security/i18n/pt_PT.po | 15 +++++++++++++++ base_suspend_security/i18n/ro.po | 15 +++++++++++++++ base_suspend_security/i18n/sl.po | 15 +++++++++++++++ base_suspend_security/i18n/tr.po | 15 +++++++++++++++ base_suspend_security/i18n/tr_TR.po | 15 +++++++++++++++ base_suspend_security/i18n/zh_CN.po | 15 +++++++++++++++ 27 files changed, 405 insertions(+) diff --git a/base_suspend_security/i18n/ar.po b/base_suspend_security/i18n/ar.po index e83bf57f..82c350af 100644 --- a/base_suspend_security/i18n/ar.po +++ b/base_suspend_security/i18n/ar.po @@ -19,6 +19,21 @@ msgstr "" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/ca.po b/base_suspend_security/i18n/ca.po index adbb74b5..3f9d32c1 100644 --- a/base_suspend_security/i18n/ca.po +++ b/base_suspend_security/i18n/ca.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/da.po b/base_suspend_security/i18n/da.po index d32ac8fa..6137525f 100644 --- a/base_suspend_security/i18n/da.po +++ b/base_suspend_security/i18n/da.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/de.po b/base_suspend_security/i18n/de.po index a359d2c2..dd1c29bf 100644 --- a/base_suspend_security/i18n/de.po +++ b/base_suspend_security/i18n/de.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/el_GR.po b/base_suspend_security/i18n/el_GR.po index d0a865dc..f1cbc9f5 100644 --- a/base_suspend_security/i18n/el_GR.po +++ b/base_suspend_security/i18n/el_GR.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/en.po b/base_suspend_security/i18n/en.po index 31a5f93e..72292ae0 100644 --- a/base_suspend_security/i18n/en.po +++ b/base_suspend_security/i18n/en.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/es.po b/base_suspend_security/i18n/es.po index 3e1074a5..3deebb42 100644 --- a/base_suspend_security/i18n/es.po +++ b/base_suspend_security/i18n/es.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/es_ES.po b/base_suspend_security/i18n/es_ES.po index ec4f1e68..f1e0ea21 100644 --- a/base_suspend_security/i18n/es_ES.po +++ b/base_suspend_security/i18n/es_ES.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/es_MX.po b/base_suspend_security/i18n/es_MX.po index ff0208a4..b1f3d578 100644 --- a/base_suspend_security/i18n/es_MX.po +++ b/base_suspend_security/i18n/es_MX.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/fi.po b/base_suspend_security/i18n/fi.po index 06263178..e36a00d9 100644 --- a/base_suspend_security/i18n/fi.po +++ b/base_suspend_security/i18n/fi.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/fr.po b/base_suspend_security/i18n/fr.po index 117ce8e6..52c6fe8f 100644 --- a/base_suspend_security/i18n/fr.po +++ b/base_suspend_security/i18n/fr.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/fr_CA.po b/base_suspend_security/i18n/fr_CA.po index f566872a..f54517af 100644 --- a/base_suspend_security/i18n/fr_CA.po +++ b/base_suspend_security/i18n/fr_CA.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/fr_CH.po b/base_suspend_security/i18n/fr_CH.po index 262a0207..c643d237 100644 --- a/base_suspend_security/i18n/fr_CH.po +++ b/base_suspend_security/i18n/fr_CH.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/fr_FR.po b/base_suspend_security/i18n/fr_FR.po index 734a7ad5..ae5cf6a5 100644 --- a/base_suspend_security/i18n/fr_FR.po +++ b/base_suspend_security/i18n/fr_FR.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/hr.po b/base_suspend_security/i18n/hr.po index 03d11c10..d5bffd64 100644 --- a/base_suspend_security/i18n/hr.po +++ b/base_suspend_security/i18n/hr.po @@ -20,6 +20,21 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/hr_HR.po b/base_suspend_security/i18n/hr_HR.po index f9a45377..7dc8f10c 100644 --- a/base_suspend_security/i18n/hr_HR.po +++ b/base_suspend_security/i18n/hr_HR.po @@ -19,6 +19,21 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/it.po b/base_suspend_security/i18n/it.po index c96a3b0a..94e99971 100644 --- a/base_suspend_security/i18n/it.po +++ b/base_suspend_security/i18n/it.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/nl.po b/base_suspend_security/i18n/nl.po index 9bf9c438..847d2484 100644 --- a/base_suspend_security/i18n/nl.po +++ b/base_suspend_security/i18n/nl.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/nl_NL.po b/base_suspend_security/i18n/nl_NL.po index 81668748..63a849cc 100644 --- a/base_suspend_security/i18n/nl_NL.po +++ b/base_suspend_security/i18n/nl_NL.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/pt.po b/base_suspend_security/i18n/pt.po index f4431cd4..70731931 100644 --- a/base_suspend_security/i18n/pt.po +++ b/base_suspend_security/i18n/pt.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/pt_BR.po b/base_suspend_security/i18n/pt_BR.po index 99678df8..283d3d6b 100644 --- a/base_suspend_security/i18n/pt_BR.po +++ b/base_suspend_security/i18n/pt_BR.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/pt_PT.po b/base_suspend_security/i18n/pt_PT.po index 970a78e2..6f2d7067 100644 --- a/base_suspend_security/i18n/pt_PT.po +++ b/base_suspend_security/i18n/pt_PT.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/ro.po b/base_suspend_security/i18n/ro.po index 343b4258..e8fa8a4c 100644 --- a/base_suspend_security/i18n/ro.po +++ b/base_suspend_security/i18n/ro.po @@ -19,6 +19,21 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" "2:1));\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/sl.po b/base_suspend_security/i18n/sl.po index 1db4311f..5dea6eda 100644 --- a/base_suspend_security/i18n/sl.po +++ b/base_suspend_security/i18n/sl.po @@ -19,6 +19,21 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/tr.po b/base_suspend_security/i18n/tr.po index aefe6ed8..5614edd1 100644 --- a/base_suspend_security/i18n/tr.po +++ b/base_suspend_security/i18n/tr.po @@ -18,6 +18,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/tr_TR.po b/base_suspend_security/i18n/tr_TR.po index d4550fa1..61eaad3c 100644 --- a/base_suspend_security/i18n/tr_TR.po +++ b/base_suspend_security/i18n/tr_TR.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=1; plural=0;\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" diff --git a/base_suspend_security/i18n/zh_CN.po b/base_suspend_security/i18n/zh_CN.po index a2e62019..cb116bed 100644 --- a/base_suspend_security/i18n/zh_CN.po +++ b/base_suspend_security/i18n/zh_CN.po @@ -19,6 +19,21 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=1; plural=0;\n" +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_channel_ids +msgid "Add Channels" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_partner_ids +msgid "Add Followers" +msgstr "" + +#. module: base_suspend_security +#: model:ir.model.fields,field_description:base_suspend_security.field_ir_cron_template_id +msgid "Email Template" +msgstr "" + #. module: base_suspend_security #: model:ir.model,name:base_suspend_security.model_res_users msgid "Users" From e6325cc3da44ccea4e211f2671c5ca48e35ce3f0 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Fri, 27 Sep 2019 08:56:09 +0000 Subject: [PATCH 08/11] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: server-backend-11.0/server-backend-11.0-base_user_role Translate-URL: https://translation.odoo-community.org/projects/server-backend-11-0/server-backend-11-0-base_user_role/ --- base_user_role/i18n/am.po | 2 +- base_user_role/i18n/ar.po | 2 +- base_user_role/i18n/bg.po | 2 +- base_user_role/i18n/bs.po | 2 +- base_user_role/i18n/ca.po | 2 +- base_user_role/i18n/cs.po | 2 +- base_user_role/i18n/da.po | 2 +- base_user_role/i18n/de.po | 2 +- base_user_role/i18n/el_GR.po | 2 +- base_user_role/i18n/en_GB.po | 2 +- base_user_role/i18n/es.po | 2 +- base_user_role/i18n/es_AR.po | 2 +- base_user_role/i18n/es_CL.po | 2 +- base_user_role/i18n/es_CO.po | 2 +- base_user_role/i18n/es_CR.po | 2 +- base_user_role/i18n/es_DO.po | 2 +- base_user_role/i18n/es_EC.po | 2 +- base_user_role/i18n/es_ES.po | 2 +- base_user_role/i18n/es_MX.po | 2 +- base_user_role/i18n/es_PE.po | 2 +- base_user_role/i18n/es_PY.po | 2 +- base_user_role/i18n/es_VE.po | 2 +- base_user_role/i18n/et.po | 2 +- base_user_role/i18n/eu.po | 2 +- base_user_role/i18n/fa.po | 2 +- base_user_role/i18n/fi.po | 2 +- base_user_role/i18n/fr.po | 2 +- base_user_role/i18n/fr_CA.po | 2 +- base_user_role/i18n/fr_CH.po | 2 +- base_user_role/i18n/fr_FR.po | 2 +- base_user_role/i18n/gl.po | 2 +- base_user_role/i18n/gl_ES.po | 2 +- base_user_role/i18n/he.po | 2 +- base_user_role/i18n/hr.po | 2 +- base_user_role/i18n/hr_HR.po | 2 +- base_user_role/i18n/hu.po | 2 +- base_user_role/i18n/id.po | 2 +- base_user_role/i18n/it.po | 2 +- base_user_role/i18n/ja.po | 2 +- base_user_role/i18n/ko.po | 2 +- base_user_role/i18n/lt.po | 2 +- base_user_role/i18n/lt_LT.po | 2 +- base_user_role/i18n/lv.po | 2 +- base_user_role/i18n/mk.po | 2 +- base_user_role/i18n/mn.po | 2 +- base_user_role/i18n/nb.po | 2 +- base_user_role/i18n/nb_NO.po | 2 +- base_user_role/i18n/nl.po | 2 +- base_user_role/i18n/nl_BE.po | 2 +- base_user_role/i18n/nl_NL.po | 2 +- base_user_role/i18n/pl.po | 2 +- base_user_role/i18n/pt.po | 2 +- base_user_role/i18n/pt_BR.po | 2 +- base_user_role/i18n/pt_PT.po | 2 +- base_user_role/i18n/ro.po | 2 +- base_user_role/i18n/ru.po | 2 +- base_user_role/i18n/sk.po | 2 +- base_user_role/i18n/sl.po | 2 +- base_user_role/i18n/sr.po | 2 +- base_user_role/i18n/sr@latin.po | 2 +- base_user_role/i18n/sv.po | 2 +- base_user_role/i18n/th.po | 2 +- base_user_role/i18n/tr.po | 2 +- base_user_role/i18n/tr_TR.po | 2 +- base_user_role/i18n/uk.po | 2 +- base_user_role/i18n/vi.po | 2 +- base_user_role/i18n/vi_VN.po | 2 +- base_user_role/i18n/zh_CN.po | 2 +- base_user_role/i18n/zh_TW.po | 2 +- 69 files changed, 69 insertions(+), 69 deletions(-) diff --git a/base_user_role/i18n/am.po b/base_user_role/i18n/am.po index e75193bf..2c756620 100644 --- a/base_user_role/i18n/am.po +++ b/base_user_role/i18n/am.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/ar.po b/base_user_role/i18n/ar.po index e3e28814..dfb64265 100644 --- a/base_user_role/i18n/ar.po +++ b/base_user_role/i18n/ar.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/bg.po b/base_user_role/i18n/bg.po index f1d580ec..625d6534 100644 --- a/base_user_role/i18n/bg.po +++ b/base_user_role/i18n/bg.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/bs.po b/base_user_role/i18n/bs.po index 183866b9..889e8a5b 100644 --- a/base_user_role/i18n/bs.po +++ b/base_user_role/i18n/bs.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/ca.po b/base_user_role/i18n/ca.po index 9e5f4c6b..3b0ae3ed 100644 --- a/base_user_role/i18n/ca.po +++ b/base_user_role/i18n/ca.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/cs.po b/base_user_role/i18n/cs.po index 2d3fd81a..de334a95 100644 --- a/base_user_role/i18n/cs.po +++ b/base_user_role/i18n/cs.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/da.po b/base_user_role/i18n/da.po index 8115485a..d2aad63c 100644 --- a/base_user_role/i18n/da.po +++ b/base_user_role/i18n/da.po @@ -151,7 +151,7 @@ msgid "Role" msgstr "Rolle" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "Rollelinier" diff --git a/base_user_role/i18n/de.po b/base_user_role/i18n/de.po index f38940ed..277ae7a8 100644 --- a/base_user_role/i18n/de.po +++ b/base_user_role/i18n/de.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/el_GR.po b/base_user_role/i18n/el_GR.po index c392372e..8ab39f52 100644 --- a/base_user_role/i18n/el_GR.po +++ b/base_user_role/i18n/el_GR.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/en_GB.po b/base_user_role/i18n/en_GB.po index 8d3b87a1..d0462ef4 100644 --- a/base_user_role/i18n/en_GB.po +++ b/base_user_role/i18n/en_GB.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es.po b/base_user_role/i18n/es.po index 1d88eddf..59728358 100644 --- a/base_user_role/i18n/es.po +++ b/base_user_role/i18n/es.po @@ -151,7 +151,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_AR.po b/base_user_role/i18n/es_AR.po index 9dc62279..b73e6429 100644 --- a/base_user_role/i18n/es_AR.po +++ b/base_user_role/i18n/es_AR.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_CL.po b/base_user_role/i18n/es_CL.po index 101aa562..abc7e298 100644 --- a/base_user_role/i18n/es_CL.po +++ b/base_user_role/i18n/es_CL.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_CO.po b/base_user_role/i18n/es_CO.po index f5ff9f75..614df7dd 100644 --- a/base_user_role/i18n/es_CO.po +++ b/base_user_role/i18n/es_CO.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_CR.po b/base_user_role/i18n/es_CR.po index edd2df49..86eacb56 100644 --- a/base_user_role/i18n/es_CR.po +++ b/base_user_role/i18n/es_CR.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_DO.po b/base_user_role/i18n/es_DO.po index 35602438..0a92ba6c 100644 --- a/base_user_role/i18n/es_DO.po +++ b/base_user_role/i18n/es_DO.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_EC.po b/base_user_role/i18n/es_EC.po index d76fb0bc..f0e7b815 100644 --- a/base_user_role/i18n/es_EC.po +++ b/base_user_role/i18n/es_EC.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_ES.po b/base_user_role/i18n/es_ES.po index be19c641..0534588e 100644 --- a/base_user_role/i18n/es_ES.po +++ b/base_user_role/i18n/es_ES.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_MX.po b/base_user_role/i18n/es_MX.po index 42bfb861..8460483f 100644 --- a/base_user_role/i18n/es_MX.po +++ b/base_user_role/i18n/es_MX.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_PE.po b/base_user_role/i18n/es_PE.po index 0e7d8779..5540021f 100644 --- a/base_user_role/i18n/es_PE.po +++ b/base_user_role/i18n/es_PE.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_PY.po b/base_user_role/i18n/es_PY.po index 46a1d59a..8bb36dad 100644 --- a/base_user_role/i18n/es_PY.po +++ b/base_user_role/i18n/es_PY.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/es_VE.po b/base_user_role/i18n/es_VE.po index 08da8aff..8fc3242c 100644 --- a/base_user_role/i18n/es_VE.po +++ b/base_user_role/i18n/es_VE.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/et.po b/base_user_role/i18n/et.po index d6546690..a7f3e957 100644 --- a/base_user_role/i18n/et.po +++ b/base_user_role/i18n/et.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/eu.po b/base_user_role/i18n/eu.po index a5121a95..379b5144 100644 --- a/base_user_role/i18n/eu.po +++ b/base_user_role/i18n/eu.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/fa.po b/base_user_role/i18n/fa.po index c92a869f..b323822a 100644 --- a/base_user_role/i18n/fa.po +++ b/base_user_role/i18n/fa.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/fi.po b/base_user_role/i18n/fi.po index 539b52bf..8396b662 100644 --- a/base_user_role/i18n/fi.po +++ b/base_user_role/i18n/fi.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/fr.po b/base_user_role/i18n/fr.po index 76c16c2e..79627772 100644 --- a/base_user_role/i18n/fr.po +++ b/base_user_role/i18n/fr.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "Rôle" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "Role lines" diff --git a/base_user_role/i18n/fr_CA.po b/base_user_role/i18n/fr_CA.po index d5fedee8..0f2e5f83 100644 --- a/base_user_role/i18n/fr_CA.po +++ b/base_user_role/i18n/fr_CA.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/fr_CH.po b/base_user_role/i18n/fr_CH.po index 5ad7d4f6..6c8ee647 100644 --- a/base_user_role/i18n/fr_CH.po +++ b/base_user_role/i18n/fr_CH.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/fr_FR.po b/base_user_role/i18n/fr_FR.po index 72f49eed..33a8afb0 100644 --- a/base_user_role/i18n/fr_FR.po +++ b/base_user_role/i18n/fr_FR.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/gl.po b/base_user_role/i18n/gl.po index 1d1989c6..6211fd34 100644 --- a/base_user_role/i18n/gl.po +++ b/base_user_role/i18n/gl.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/gl_ES.po b/base_user_role/i18n/gl_ES.po index bac8e14d..bd573a49 100644 --- a/base_user_role/i18n/gl_ES.po +++ b/base_user_role/i18n/gl_ES.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/he.po b/base_user_role/i18n/he.po index caa88130..b2517006 100644 --- a/base_user_role/i18n/he.po +++ b/base_user_role/i18n/he.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/hr.po b/base_user_role/i18n/hr.po index 070ed4e2..7d0b2e66 100644 --- a/base_user_role/i18n/hr.po +++ b/base_user_role/i18n/hr.po @@ -152,7 +152,7 @@ msgid "Role" msgstr "Rola" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "Stavke role" diff --git a/base_user_role/i18n/hr_HR.po b/base_user_role/i18n/hr_HR.po index cceea7d0..f2ace0fb 100644 --- a/base_user_role/i18n/hr_HR.po +++ b/base_user_role/i18n/hr_HR.po @@ -151,7 +151,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/hu.po b/base_user_role/i18n/hu.po index f3c3f9d0..0eae13e8 100644 --- a/base_user_role/i18n/hu.po +++ b/base_user_role/i18n/hu.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/id.po b/base_user_role/i18n/id.po index 247f46ea..2b548f47 100644 --- a/base_user_role/i18n/id.po +++ b/base_user_role/i18n/id.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/it.po b/base_user_role/i18n/it.po index f3df4f3a..92780e64 100644 --- a/base_user_role/i18n/it.po +++ b/base_user_role/i18n/it.po @@ -151,7 +151,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/ja.po b/base_user_role/i18n/ja.po index fd4dda52..90f80dbe 100644 --- a/base_user_role/i18n/ja.po +++ b/base_user_role/i18n/ja.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/ko.po b/base_user_role/i18n/ko.po index cb83671b..58044e3f 100644 --- a/base_user_role/i18n/ko.po +++ b/base_user_role/i18n/ko.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/lt.po b/base_user_role/i18n/lt.po index 44de6e32..d086b28e 100644 --- a/base_user_role/i18n/lt.po +++ b/base_user_role/i18n/lt.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/lt_LT.po b/base_user_role/i18n/lt_LT.po index 84ba1d54..20e95e09 100644 --- a/base_user_role/i18n/lt_LT.po +++ b/base_user_role/i18n/lt_LT.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/lv.po b/base_user_role/i18n/lv.po index ae67a78c..14e0cb5b 100644 --- a/base_user_role/i18n/lv.po +++ b/base_user_role/i18n/lv.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/mk.po b/base_user_role/i18n/mk.po index c62875a6..f1412257 100644 --- a/base_user_role/i18n/mk.po +++ b/base_user_role/i18n/mk.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/mn.po b/base_user_role/i18n/mn.po index 5ad33ff2..e74709c3 100644 --- a/base_user_role/i18n/mn.po +++ b/base_user_role/i18n/mn.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/nb.po b/base_user_role/i18n/nb.po index 0588e09e..ed0b8c6c 100644 --- a/base_user_role/i18n/nb.po +++ b/base_user_role/i18n/nb.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/nb_NO.po b/base_user_role/i18n/nb_NO.po index 8d348c27..3b68c883 100644 --- a/base_user_role/i18n/nb_NO.po +++ b/base_user_role/i18n/nb_NO.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/nl.po b/base_user_role/i18n/nl.po index 35f761d8..c4ad1288 100644 --- a/base_user_role/i18n/nl.po +++ b/base_user_role/i18n/nl.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/nl_BE.po b/base_user_role/i18n/nl_BE.po index 413111a9..6d9b58f1 100644 --- a/base_user_role/i18n/nl_BE.po +++ b/base_user_role/i18n/nl_BE.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/nl_NL.po b/base_user_role/i18n/nl_NL.po index 6bbb11e7..f23ad6eb 100644 --- a/base_user_role/i18n/nl_NL.po +++ b/base_user_role/i18n/nl_NL.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "Rol" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "Rolregels" diff --git a/base_user_role/i18n/pl.po b/base_user_role/i18n/pl.po index bfe08576..d362f3a5 100644 --- a/base_user_role/i18n/pl.po +++ b/base_user_role/i18n/pl.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/pt.po b/base_user_role/i18n/pt.po index 67cd629c..7dfdf6be 100644 --- a/base_user_role/i18n/pt.po +++ b/base_user_role/i18n/pt.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/pt_BR.po b/base_user_role/i18n/pt_BR.po index 385c7a99..89976777 100644 --- a/base_user_role/i18n/pt_BR.po +++ b/base_user_role/i18n/pt_BR.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/pt_PT.po b/base_user_role/i18n/pt_PT.po index 5ec0c1b8..d81872f2 100644 --- a/base_user_role/i18n/pt_PT.po +++ b/base_user_role/i18n/pt_PT.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/ro.po b/base_user_role/i18n/ro.po index ccf0d2c9..c01f3c72 100644 --- a/base_user_role/i18n/ro.po +++ b/base_user_role/i18n/ro.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/ru.po b/base_user_role/i18n/ru.po index fd091246..8724b7bf 100644 --- a/base_user_role/i18n/ru.po +++ b/base_user_role/i18n/ru.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/sk.po b/base_user_role/i18n/sk.po index 3e663d8f..28bea8fd 100644 --- a/base_user_role/i18n/sk.po +++ b/base_user_role/i18n/sk.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/sl.po b/base_user_role/i18n/sl.po index 5df67240..24e22c05 100644 --- a/base_user_role/i18n/sl.po +++ b/base_user_role/i18n/sl.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "Vloga" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "Postavke vlog" diff --git a/base_user_role/i18n/sr.po b/base_user_role/i18n/sr.po index 7ff3558d..bed78f12 100644 --- a/base_user_role/i18n/sr.po +++ b/base_user_role/i18n/sr.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/sr@latin.po b/base_user_role/i18n/sr@latin.po index 2156dc1e..fdf083bf 100644 --- a/base_user_role/i18n/sr@latin.po +++ b/base_user_role/i18n/sr@latin.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/sv.po b/base_user_role/i18n/sv.po index 037e2355..ade44511 100644 --- a/base_user_role/i18n/sv.po +++ b/base_user_role/i18n/sv.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/th.po b/base_user_role/i18n/th.po index a3de2fa0..f5acb149 100644 --- a/base_user_role/i18n/th.po +++ b/base_user_role/i18n/th.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/tr.po b/base_user_role/i18n/tr.po index 43affff6..b1ecd79c 100644 --- a/base_user_role/i18n/tr.po +++ b/base_user_role/i18n/tr.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/tr_TR.po b/base_user_role/i18n/tr_TR.po index b1e59d60..03e9edaf 100644 --- a/base_user_role/i18n/tr_TR.po +++ b/base_user_role/i18n/tr_TR.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/uk.po b/base_user_role/i18n/uk.po index 33bb5b8a..c655df43 100644 --- a/base_user_role/i18n/uk.po +++ b/base_user_role/i18n/uk.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/vi.po b/base_user_role/i18n/vi.po index 68d8315a..366ad5d1 100644 --- a/base_user_role/i18n/vi.po +++ b/base_user_role/i18n/vi.po @@ -148,7 +148,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/vi_VN.po b/base_user_role/i18n/vi_VN.po index 0b4c07a4..4c701dae 100644 --- a/base_user_role/i18n/vi_VN.po +++ b/base_user_role/i18n/vi_VN.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/zh_CN.po b/base_user_role/i18n/zh_CN.po index 34c30f18..5e2324aa 100644 --- a/base_user_role/i18n/zh_CN.po +++ b/base_user_role/i18n/zh_CN.po @@ -150,7 +150,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" diff --git a/base_user_role/i18n/zh_TW.po b/base_user_role/i18n/zh_TW.po index f4e685cb..a563b113 100644 --- a/base_user_role/i18n/zh_TW.po +++ b/base_user_role/i18n/zh_TW.po @@ -149,7 +149,7 @@ msgid "Role" msgstr "" #. module: base_user_role -#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_1498 +#: model:ir.model.fields,field_description:base_user_role.field_res_users_role_line_ids_2453 msgid "Role lines" msgstr "" From aa527d3be742c86440db3a36686749f6a93d6a62 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Tue, 19 Nov 2019 22:10:07 +0100 Subject: [PATCH 09/11] [ADD] .editorconfig [ci skip] --- .editorconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..62276b0d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# Configuration for known file extensions +[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[.eslintrc,*.{json,yml,yaml,rst,md}] +indent_size = 2 + +# Do not configure editor for libs and autogenerated content +[*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst] +charset = unset +end_of_line = unset +indent_size = unset +indent_style = unset +insert_final_newline = false +trim_trailing_whitespace = false From 37a0e1c8abe86ca1a4f52da39d9581ab8ad3e2c7 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 21 Nov 2019 21:12:40 +0100 Subject: [PATCH 10/11] [FIX] requirements.txt: Pin version for pymysql If not, we get: DeprecationWarning: The pymssql project has been discontinued. To install the last working released version, use a version specifier like "pymssql<3.0". For details and alternatives see: https://github.com/pymssql/pymssql/issues/668 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2874daf0..f9f7b56a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ sqlalchemy mysqlclient -pymssql +pymssql<3.0 From 644a08b80f02e5208ade078f51575e80c8cd8488 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 13 Nov 2019 11:48:09 +0000 Subject: [PATCH 11/11] [FIX] base_user_role: Improve tests resiliency These 2 tests were checking the exact set of groups a user should have. If these tests are ran in a database where a module is previously installed which adds more groups to the base role, these exact group sets would be inexact, although the behavior that is being tested was actually properly working. With this patch, basically I'm testing if the user contains the groups from the roles, not the exact role set expected. It should work in integration scenarios. @Tecnativa TT20468 --- base_user_role/tests/test_user_role.py | 46 ++++++++++++++------------ 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/base_user_role/tests/test_user_role.py b/base_user_role/tests/test_user_role.py index 18535ea3..8f042a0b 100644 --- a/base_user_role/tests/test_user_role.py +++ b/base_user_role/tests/test_user_role.py @@ -95,52 +95,54 @@ class TestUserRole(TransactionCase): self.assertEqual(user_group_ids, role_group_ids) def test_role_unlink(self): - # Get role1 groups - role1_group_ids = self.role1_id.implied_ids.ids - role1_group_ids.append(self.role1_id.group_id.id) - role1_group_ids = sorted(set(role1_group_ids)) - + # Get role1 and role2 groups + role1_groups = self.role1_id.implied_ids | self.role1_id.group_id + role2_groups = self.role2_id.implied_ids | self.role2_id.group_id # Configure the user with role1 and role2 self.user_id.write( {'role_line_ids': [ (0, 0, {'role_id': self.role1_id.id}), (0, 0, {'role_id': self.role2_id.id}), ]}) + # Check user has groups from role1 and role2 + self.assertLessEqual(role1_groups, self.user_id.groups_id) + self.assertLessEqual(role2_groups, self.user_id.groups_id) # Remove role2 self.role2_id.unlink() - user_group_ids = sorted(set([ - group.id for group in self.user_id.groups_id])) - self.assertEqual(user_group_ids, role1_group_ids) + # Check user has groups from only role1 + self.assertLessEqual(role1_groups, self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) # Remove role1 self.role1_id.unlink() - user_group_ids = sorted(set([ - group.id for group in self.user_id.groups_id])) - self.assertEqual(user_group_ids, []) + # Check user has no groups from role1 and role2 + self.assertFalse(role1_groups <= self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) def test_role_line_unlink(self): - # Get role1 groups - role1_group_ids = self.role1_id.implied_ids.ids - role1_group_ids.append(self.role1_id.group_id.id) - role1_group_ids = sorted(set(role1_group_ids)) - + # Get role1 and role2 groups + role1_groups = self.role1_id.implied_ids | self.role1_id.group_id + role2_groups = self.role2_id.implied_ids | self.role2_id.group_id # Configure the user with role1 and role2 self.user_id.write( {'role_line_ids': [ (0, 0, {'role_id': self.role1_id.id}), (0, 0, {'role_id': self.role2_id.id}), ]}) + # Check user has groups from role1 and role2 + self.assertLessEqual(role1_groups, self.user_id.groups_id) + self.assertLessEqual(role2_groups, self.user_id.groups_id) # Remove role2 from the user self.user_id.role_line_ids.filtered( lambda l: l.role_id.id == self.role2_id.id).unlink() - user_group_ids = sorted(set([ - group.id for group in self.user_id.groups_id])) - self.assertEqual(user_group_ids, role1_group_ids) + # Check user has groups from only role1 + self.assertLessEqual(role1_groups, self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) # Remove role1 from the user self.user_id.role_line_ids.filtered( lambda l: l.role_id.id == self.role1_id.id).unlink() - user_group_ids = sorted(set([ - group.id for group in self.user_id.groups_id])) - self.assertEqual(user_group_ids, []) + # Check user has no groups from role1 and role2 + self.assertFalse(role1_groups <= self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) def test_default_user_roles(self): self.default_user.write({