Resolve merge conflict

.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

base_global_discount/README.rst

@@ -0,0 +1,100 @@
+====================
+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*
+#. 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 <https://github.com/OCA/server-backend/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 <https://github.com/OCA/server-backend/issues/new?body=module:%20base_global_discount%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Tecnativa
+
+Contributors
+~~~~~~~~~~~~
+
+* `Tecnativa <https://www.tecnativa.com>`_
+
+  * 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 <https://github.com/OCA/server-backend/tree/11.0/base_global_discount>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

base_global_discount/__init__.py

@@ -0,0 +1 @@
+from . import models

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,
+}

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 ""
+

base_global_discount/i18n/es.po

@@ -0,0 +1,122 @@
+# 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"
+"Language: \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_form
+#: 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"

base_global_discount/models/__init__.py

@@ -0,0 +1,2 @@
+from . import global_discount
+from . import res_partner

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)),
+        }

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')],
+    )

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.

base_global_discount/readme/CONTRIBUTORS.rst

@@ -0,0 +1,6 @@
+* `Tecnativa <https://www.tecnativa.com>`_
+
+  * Pedro M. Baeza
+  * David Vidal
+  * Carlos Dauden
+  * Rafael Blasco

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.

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.

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

base_global_discount/security/security.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- Copyright 2019 Tecnativa - David Vidal
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record model="ir.rule" id="global_discount_comp_rule">
+        <field name="name">Global Discount multi-company</field>
+        <field name="model_id" ref="base_global_discount.model_global_discount"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+</odoo>

base_global_discount/static/description/index.html

@@ -0,0 +1,124 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Module name</h2>
+            <p>This module was written to extend the functionality of ... to support ... and allow you to ...</p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Installation</h2>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">To install this module, you need to:
+                <ul>
+                    <li>...</li>
+                </ul>
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="crm_sc_01.png">
+                </a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Configuration</h2>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">To configure this module, you need to:
+                <ul>
+                    <li>...</li>
+                </ul>
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="crm_sc_01.png">
+                </a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Usage</h2>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">To use this module, you need to:
+                <ul>
+                    <li>...</li>
+                </ul>
+            </p>
+            <p class="oe_mt32">For further information, please visit:
+                <ul>
+                    <li><a href="https://www.odoo.com/forum/help-1">https://www.odoo.com/forum/help-1</a></li>
+                </ul>
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="crm_sc_01.png">
+                </a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Known issues / Roadmap</h2>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                <ul>
+                    <li>...</li>
+                </ul>
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="crm_sc_01.png">
+                </a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Credits</h2>
+        </div>
+        <div class="oe_span12">
+            <h3>Contributors</h3>
+            <ul>
+                <li>Firstname Lastname &lt;<a href="mailto:email.address@example.com">email.address@example.com</a>&gt;</li>
+            </ul>
+        </div>
+        <div class="oe_span12">
+            <h3>Maintainer</h3>
+            <p>
+                This module is maintained by the OCA.<br/>
+                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.<br/>
+                To contribute to this module, please visit <a href="http://odoo-community.org">http://odoo-community.org</a>.<br/>
+                <a href="http://odoo-community.org"><img class="oe_picture oe_centered" src="http://odoo-community.org/logo.png"></a>
+            </p>
+        </div>
+    </div>
+</section>

base_global_discount/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_global_discount

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)

base_global_discount/views/global_discount_views.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Tecnativa - David Vidal
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="global_discount_view_tree" model="ir.ui.view">
+        <field name="model">global.discount</field>
+        <field name="arch" type="xml">
+            <tree string="Global Discounts" editable="bottom">
+                <field name="sequence" widget="handle"/>
+                <field name="name"/>
+                <field name="discount"/>
+                <field name="discount_scope"/>
+                <field name="company_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="global_discount_view_form" model="ir.ui.view">
+        <field name="model">global.discount</field>
+        <field name="arch" type="xml">
+            <form string="Global Discounts">
+                <sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="sequence"/>
+                        <field name="discount"/>
+                        <field name="discount_scope"/>
+                        <field name="company_id"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_global_discount_tree" model="ir.actions.act_window">
+        <field name="name">Global Discounts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">global.discount</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_global_discount"
+        action="action_global_discount_tree"
+        name="Global Discounts"
+        sequence="1" parent="base.menu_ir_property"/>
+
+</odoo>

base_global_discount/views/res_partner_views.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Tecnativa - David Vidal
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record model="ir.ui.view" id="res_partner_form_view">
+         <field name="model">res.partner</field>
+         <field name="inherit_id" ref="base.view_partner_form"/>
+         <field name="arch" type="xml">
+            <group name="sale" position="inside">
+                <field name="customer_global_discount_ids" widget="many2many_tags"
+                       attrs="{'invisible': [('customer', '=', False), ('is_company', '=', False), ('parent_id', '!=', False)]}"/>
+            </group>
+            <group name="purchase" position="inside">
+                <field name="supplier_global_discount_ids" widget="many2many_tags"
+                       attrs="{'invisible': [('supplier', '=', False), ('is_company', '=', False), ('parent_id', '!=', False)]}"/>
+            </group>
+         </field>
+     </record>
+
+</odoo>

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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"
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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"
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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"
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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 ""
 

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"