From db964544d7dfbbe2f5e6ab6759d9d3ee10b8ed21 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 21 Aug 2019 12:36:02 +0200 Subject: [PATCH 01/10] [ADD] base_global_discount: New Module 11.0 --- base_global_discount/README.rst | 100 ++++++++++++++ base_global_discount/__init__.py | 1 + base_global_discount/__manifest__.py | 22 ++++ .../i18n/base_global_discount.pot | 120 +++++++++++++++++ base_global_discount/i18n/es.po | 122 +++++++++++++++++ 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 +++ 20 files changed, 715 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/base_global_discount.pot 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 000000000..3a6ffd8b4 --- /dev/null +++ b/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 `_. +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 000000000..0650744f6 --- /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 000000000..a0b573805 --- /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/base_global_discount.pot b/base_global_discount/i18n/base_global_discount.pot new file mode 100644 index 000000000..fdfda3a70 --- /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 new file mode 100644 index 000000000..ffb48f029 --- /dev/null +++ b/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" diff --git a/base_global_discount/models/__init__.py b/base_global_discount/models/__init__.py new file mode 100644 index 000000000..8a1089eda --- /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 000000000..10f5b294b --- /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 000000000..16a25acaf --- /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 000000000..0e5cea40e --- /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 000000000..7b1dda355 --- /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 000000000..7006b9932 --- /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 000000000..8d9135e44 --- /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 000000000..33fcbd8f6 --- /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 000000000..7adb4ae9e --- /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 000000000..27f067420 --- /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 000000000..e9199cd7e --- /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 000000000..ddc553816 --- /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 000000000..3023274ee --- /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 000000000..be4aae3a8 --- /dev/null +++ b/base_global_discount/views/res_partner_views.xml @@ -0,0 +1,21 @@ + + + + + + res.partner + + + + + + + + + + + + From 26b634819acb0cae9dc05bd10cd7c4219db3a9b2 Mon Sep 17 00:00:00 2001 From: Manuel Calero Date: Wed, 27 May 2020 20:01:25 +0200 Subject: [PATCH 02/10] [MIG] base_global_discount: Migration to 12.0 --- base_global_discount/README.rst | 10 ++--- base_global_discount/__manifest__.py | 3 +- .../i18n/base_global_discount.pot | 40 +++++++++---------- base_global_discount/i18n/es.po | 38 +++++++++--------- 4 files changed, 46 insertions(+), 45 deletions(-) diff --git a/base_global_discount/README.rst b/base_global_discount/README.rst index 3a6ffd8b4..57b66f6f8 100644 --- a/base_global_discount/README.rst +++ b/base_global_discount/README.rst @@ -14,13 +14,13 @@ Base Global Discount :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 + :target: https://github.com/OCA/server-backend/tree/12.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 + :target: https://translation.odoo-community.org/projects/server-backend-12-0/server-backend-12-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 + :target: https://runbot.odoo-community.org/runbot/253/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -60,7 +60,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -95,6 +95,6 @@ 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. +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/__manifest__.py b/base_global_discount/__manifest__.py index a0b573805..28ae4418e 100644 --- a/base_global_discount/__manifest__.py +++ b/base_global_discount/__manifest__.py @@ -1,8 +1,9 @@ # Copyright 2019 Tecnativa S.L. - David Vidal +# Copyright 2020 Xtendoo - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Base Global Discount', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Base', 'author': 'Tecnativa,' 'Odoo Community Association (OCA)', diff --git a/base_global_discount/i18n/base_global_discount.pot b/base_global_discount/i18n/base_global_discount.pot index fdfda3a70..6bf63b0c0 100644 --- a/base_global_discount/i18n/base_global_discount.pot +++ b/base_global_discount/i18n/base_global_discount.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,7 +14,7 @@ msgstr "" "Plural-Forms: \n" #. module: base_global_discount -#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_company_id +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__company_id msgid "Company" msgstr "" @@ -24,37 +24,37 @@ msgid "Contact" msgstr "" #. module: base_global_discount -#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_create_uid +#: 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 +#: 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 +#: 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 +#: 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 +#: 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 +#: 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 +#: model:ir.model.fields,help:base_global_discount.field_global_discount__sequence msgid "Gives the order to apply discounts" msgstr "" @@ -66,34 +66,34 @@ 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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_form +#: model_terms: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 +#: 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 +#: 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 +#: 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 +#: 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 +#: 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 "" @@ -103,8 +103,8 @@ 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 +#: 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 "" @@ -114,7 +114,7 @@ msgid "Sales" msgstr "" #. module: base_global_discount -#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_sequence +#: 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 ffb48f029..a66c0a72f 100644 --- a/base_global_discount/i18n/es.po +++ b/base_global_discount/i18n/es.po @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: \n" #. module: base_global_discount -#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_company_id +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__company_id msgid "Company" msgstr "Compañía" @@ -27,37 +27,37 @@ msgid "Contact" msgstr "Contacto" #. module: base_global_discount -#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_create_uid +#: 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 +#: 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 +#: 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 +#: 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 +#: 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 +#: 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 +#: 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" @@ -69,34 +69,34 @@ 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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_form +#: model_terms: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 +#: 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 +#: 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 +#: 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 +#: 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 +#: 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" @@ -106,8 +106,8 @@ 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 +#: 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" @@ -117,6 +117,6 @@ msgid "Sales" msgstr "Ventas" #. module: base_global_discount -#: model:ir.model.fields,field_description:base_global_discount.field_global_discount_sequence +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__sequence msgid "Sequence" msgstr "Secuencia" From 5326fd2a29db7775cd12ab4ee80a634beb57bf6f Mon Sep 17 00:00:00 2001 From: Pedro Castro Silva Date: Thu, 17 Sep 2020 10:43:15 +0000 Subject: [PATCH 03/10] Added translation using Weblate (Portuguese) --- base_global_discount/i18n/pt.po | 122 ++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 base_global_discount/i18n/pt.po diff --git a/base_global_discount/i18n/pt.po b/base_global_discount/i18n/pt.po new file mode 100644 index 000000000..6d100e8b0 --- /dev/null +++ b/base_global_discount/i18n/pt.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 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2020-09-17 13:00+0000\n" +"Last-Translator: Pedro Castro Silva \n" +"Language-Team: none\n" +"Language: pt\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.10\n" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__company_id +msgid "Company" +msgstr "Empresa" + +#. 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 "Criado por" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__create_date +msgid "Created on" +msgstr "Criado em" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__discount +msgid "Discount" +msgstr "Desconto" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__name +msgid "Discount Name" +msgstr "Nome do Desconto" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__discount_scope +msgid "Discount Scope" +msgstr "Âmbito do Desconto" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__display_name +msgid "Display Name" +msgstr "Nome a Apresentar" + +#. module: base_global_discount +#: model:ir.model.fields,help:base_global_discount.field_global_discount__sequence +msgid "Gives the order to apply discounts" +msgstr "Dá a ordem de aplicação de descontos" + +#. module: base_global_discount +#: model:ir.model,name:base_global_discount.model_global_discount +msgid "Global Discount" +msgstr "Desconto 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_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_form +#: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_tree +msgid "Global Discounts" +msgstr "Descontos Globais" + +#. 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 Modificação Em" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__write_uid +msgid "Last Updated by" +msgstr "Atualizado pela última vez por" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__write_date +msgid "Last Updated on" +msgstr "Atualizado pela última vez em" + +#. 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 "Descontos Globais de Compras" + +#. 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 "Descontos Globais de Vendas" + +#. module: base_global_discount +#: selection:global.discount,discount_scope:0 +msgid "Sales" +msgstr "Vendas" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__sequence +msgid "Sequence" +msgstr "Sequência" From bfda1e6a6afc5621dd022a5f9100fb3baeea6a47 Mon Sep 17 00:00:00 2001 From: Ernesto Tejeda Date: Tue, 3 Nov 2020 11:05:41 -0500 Subject: [PATCH 04/10] [IMP] base_global_discount: black, isort, prettier --- base_global_discount/__manifest__.py | 31 +++++++------- .../models/global_discount.py | 42 +++++++------------ base_global_discount/models/res_partner.py | 22 +++++----- base_global_discount/security/security.xml | 18 ++++---- .../tests/test_global_discount.py | 28 ++++++------- .../views/global_discount_views.xml | 34 +++++++-------- .../views/res_partner_views.xml | 28 +++++++------ 7 files changed, 94 insertions(+), 109 deletions(-) diff --git a/base_global_discount/__manifest__.py b/base_global_discount/__manifest__.py index 28ae4418e..643cf338a 100644 --- a/base_global_discount/__manifest__.py +++ b/base_global_discount/__manifest__.py @@ -2,22 +2,19 @@ # Copyright 2020 Xtendoo - Manuel Calero # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - 'name': 'Base Global Discount', - 'version': '12.0.1.0.0', - 'category': 'Base', - 'author': 'Tecnativa,' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/server-backend', - 'license': 'AGPL-3', - 'depends': [ - 'product', + "name": "Base Global Discount", + "version": "12.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", ], - 'data': [ - 'security/ir.model.access.csv', - 'security/security.xml', - 'views/global_discount_views.xml', - 'views/res_partner_views.xml', - ], - 'application': False, - 'installable': True, + "application": False, + "installable": True, } diff --git a/base_global_discount/models/global_discount.py b/base_global_discount/models/global_discount.py index 10f5b294b..556c22149 100644 --- a/base_global_discount/models/global_discount.py +++ b/base_global_discount/models/global_discount.py @@ -1,46 +1,36 @@ # 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' + _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, - ) + 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, + 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', + selection=[("sale", "Sales"), ("purchase", "Purchases"),], + default="sale", + required="True", + string="Discount Scope", ) company_id = fields.Many2one( - comodel_name='res.company', - string='Company', + 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))) + result.append((one.id, "{} ({:.2f}%)".format(one.name, one.discount))) return result def _get_global_discount_vals(self, base, **kwargs): @@ -52,7 +42,7 @@ class GlobalDiscount(models.Model): """ self.ensure_one() return { - 'global_discount': self, - 'base': base, - 'base_discounted': base * (1 - (self.discount / 100)), + "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 index 16a25acaf..98455c5c1 100644 --- a/base_global_discount/models/res_partner.py +++ b/base_global_discount/models/res_partner.py @@ -4,19 +4,19 @@ from odoo import fields, models class ResPartner(models.Model): - _inherit = 'res.partner' + _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')], + 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')], + 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/security/security.xml b/base_global_discount/security/security.xml index 7adb4ae9e..2e6c18cef 100644 --- a/base_global_discount/security/security.xml +++ b/base_global_discount/security/security.xml @@ -1,16 +1,16 @@ - + - Global Discount multi-company - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - - - + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + - diff --git a/base_global_discount/tests/test_global_discount.py b/base_global_discount/tests/test_global_discount.py index ddc553816..ff618aeaa 100644 --- a/base_global_discount/tests/test_global_discount.py +++ b/base_global_discount/tests/test_global_discount.py @@ -4,30 +4,26 @@ 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, - }) + 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) + 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) + 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) + 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 index 3023274ee..6964a73fa 100644 --- a/base_global_discount/views/global_discount_views.xml +++ b/base_global_discount/views/global_discount_views.xml @@ -1,38 +1,35 @@ - + - global.discount - - - - - + + + + + - global.discount
- - - - - + + + + +
- Global Discounts ir.actions.act_window @@ -40,10 +37,11 @@ form tree,form - - - + sequence="1" + parent="base.menu_ir_property" + /> diff --git a/base_global_discount/views/res_partner_views.xml b/base_global_discount/views/res_partner_views.xml index be4aae3a8..c9ef86523 100644 --- a/base_global_discount/views/res_partner_views.xml +++ b/base_global_discount/views/res_partner_views.xml @@ -1,21 +1,25 @@ - + - - res.partner - - + res.partner + + - + - + - - - + + From b215abe4f7758626ad6e4e45719b8c89c9554591 Mon Sep 17 00:00:00 2001 From: Ernesto Tejeda Date: Tue, 3 Nov 2020 19:07:07 -0500 Subject: [PATCH 05/10] [MIG] base_global_discount: Migration to 13.0 [UPD] Update base_global_discount.pot Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: server-backend-13.0/server-backend-13.0-base_global_discount Translate-URL: https://translation.odoo-community.org/projects/server-backend-13-0/server-backend-13-0-base_global_discount/ --- base_global_discount/README.rst | 16 ++++----- base_global_discount/__manifest__.py | 6 ++-- .../i18n/base_global_discount.pot | 11 +++--- base_global_discount/i18n/es.po | 4 +-- base_global_discount/i18n/pt.po | 6 ++-- .../migrations/13.0.1.0.0/post-migration.py | 36 +++++++++++++++++++ .../migrations/13.0.1.0.0/pre-migration.py | 13 +++++++ .../models/global_discount.py | 14 +++----- base_global_discount/models/res_partner.py | 2 ++ base_global_discount/readme/CONTRIBUTORS.rst | 1 + base_global_discount/readme/USAGE.rst | 5 ++- base_global_discount/security/security.xml | 2 +- .../tests/test_global_discount.py | 4 +-- .../views/global_discount_views.xml | 1 - .../views/res_partner_views.xml | 4 +-- 15 files changed, 85 insertions(+), 40 deletions(-) create mode 100644 base_global_discount/migrations/13.0.1.0.0/post-migration.py create mode 100644 base_global_discount/migrations/13.0.1.0.0/pre-migration.py diff --git a/base_global_discount/README.rst b/base_global_discount/README.rst index 57b66f6f8..3996ceef4 100644 --- a/base_global_discount/README.rst +++ b/base_global_discount/README.rst @@ -14,13 +14,13 @@ Base Global Discount :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/12.0/base_global_discount + :target: https://github.com/OCA/server-backend/tree/13.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-12-0/server-backend-12-0-base_global_discount + :target: https://translation.odoo-community.org/projects/server-backend-13-0/server-backend-13-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/12.0 + :target: https://runbot.odoo-community.org/runbot/253/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -50,9 +50,8 @@ 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. +#. In section sale, you can set sale discounts. +#. In section purchase, you can set purchase discounts. Bug Tracker =========== @@ -60,7 +59,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -81,6 +80,7 @@ Contributors * David Vidal * Carlos Dauden * Rafael Blasco + * Ernesto Tejeda Maintainers ~~~~~~~~~~~ @@ -95,6 +95,6 @@ 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. +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/__manifest__.py b/base_global_discount/__manifest__.py index 643cf338a..c16fc614d 100644 --- a/base_global_discount/__manifest__.py +++ b/base_global_discount/__manifest__.py @@ -3,12 +3,12 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Base Global Discount", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Base", - "author": "Tecnativa," "Odoo Community Association (OCA)", + "author": "Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/server-backend", "license": "AGPL-3", - "depends": ["product",], + "depends": ["product"], "data": [ "security/ir.model.access.csv", "security/security.xml", diff --git a/base_global_discount/i18n/base_global_discount.pot b/base_global_discount/i18n/base_global_discount.pot index 6bf63b0c0..58ce06fc7 100644 --- a/base_global_discount/i18n/base_global_discount.pot +++ b/base_global_discount/i18n/base_global_discount.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_global_discount +# * base_global_discount # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,7 +98,7 @@ msgid "Purchase Global Discounts" msgstr "" #. module: base_global_discount -#: selection:global.discount,discount_scope:0 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" msgstr "" @@ -109,7 +109,7 @@ msgid "Sale Global Discounts" msgstr "" #. module: base_global_discount -#: selection:global.discount,discount_scope:0 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" msgstr "" @@ -117,4 +117,3 @@ msgstr "" #: 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 a66c0a72f..e0e2e62fb 100644 --- a/base_global_discount/i18n/es.po +++ b/base_global_discount/i18n/es.po @@ -101,7 +101,7 @@ msgid "Purchase Global Discounts" msgstr "Descuentos globales de compra" #. module: base_global_discount -#: selection:global.discount,discount_scope:0 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" msgstr "Compras" @@ -112,7 +112,7 @@ msgid "Sale Global Discounts" msgstr "Descuentos de venta globales" #. module: base_global_discount -#: selection:global.discount,discount_scope:0 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" msgstr "Ventas" diff --git a/base_global_discount/i18n/pt.po b/base_global_discount/i18n/pt.po index 6d100e8b0..9d572acdc 100644 --- a/base_global_discount/i18n/pt.po +++ b/base_global_discount/i18n/pt.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 "" @@ -101,7 +101,7 @@ msgid "Purchase Global Discounts" msgstr "Descontos Globais de Compras" #. module: base_global_discount -#: selection:global.discount,discount_scope:0 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" msgstr "Compras" @@ -112,7 +112,7 @@ msgid "Sale Global Discounts" msgstr "Descontos Globais de Vendas" #. module: base_global_discount -#: selection:global.discount,discount_scope:0 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" msgstr "Vendas" diff --git a/base_global_discount/migrations/13.0.1.0.0/post-migration.py b/base_global_discount/migrations/13.0.1.0.0/post-migration.py new file mode 100644 index 000000000..0d3657bd6 --- /dev/null +++ b/base_global_discount/migrations/13.0.1.0.0/post-migration.py @@ -0,0 +1,36 @@ +# Copyright 2020 Tecnativa - Ernesto Tejeda +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openupgradelib import openupgrade + + +@openupgrade.migrate() +def migrate(env, version): + openupgrade.logged_query( + env.cr, + """ + INSERT INTO customer_global_discount_rel + (partner_id, global_discount_id) + SELECT + partner_id, + global_discount_id + FROM + global_discount_res_partner_rel + WHERE + discount_scope = 'sale'; + """, + ) + openupgrade.logged_query( + env.cr, + """ + INSERT INTO supplier_global_discount_rel + (partner_id, global_discount_id) + SELECT + partner_id, + field_id + FROM + global_discount_res_partner_rel + WHERE + discount_scope = 'purchase'; + """, + ) diff --git a/base_global_discount/migrations/13.0.1.0.0/pre-migration.py b/base_global_discount/migrations/13.0.1.0.0/pre-migration.py new file mode 100644 index 000000000..88a9f7f9d --- /dev/null +++ b/base_global_discount/migrations/13.0.1.0.0/pre-migration.py @@ -0,0 +1,13 @@ +# Copyright 2020 Tecnativa - Ernesto Tejeda +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +def migrate(cr, version): + if not version: + return + cr.execute( + """ + DELETE FROM ir_model_relation + WHERE name = 'global_discount_res_partner_rel'; + """ + ) diff --git a/base_global_discount/models/global_discount.py b/base_global_discount/models/global_discount.py index 556c22149..60e6b69ea 100644 --- a/base_global_discount/models/global_discount.py +++ b/base_global_discount/models/global_discount.py @@ -2,21 +2,17 @@ # 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, - ) + sequence = fields.Integer(help="Gives the order to apply discounts") + name = fields.Char(string="Discount Name", required=True) + discount = fields.Float(digits="Discount", required=True, default=0.0) discount_scope = fields.Selection( - selection=[("sale", "Sales"), ("purchase", "Purchases"),], + selection=[("sale", "Sales"), ("purchase", "Purchases")], default="sale", required="True", string="Discount Scope", @@ -24,7 +20,7 @@ class GlobalDiscount(models.Model): company_id = fields.Many2one( comodel_name="res.company", string="Company", - default=lambda self: self.env.user.company_id, + default=lambda self: self.env.company, ) def name_get(self): diff --git a/base_global_discount/models/res_partner.py b/base_global_discount/models/res_partner.py index 98455c5c1..1a01b9929 100644 --- a/base_global_discount/models/res_partner.py +++ b/base_global_discount/models/res_partner.py @@ -8,6 +8,7 @@ class ResPartner(models.Model): customer_global_discount_ids = fields.Many2many( comodel_name="global.discount", + relation="customer_global_discount_rel", column1="partner_id", column2="global_discount_id", string="Sale Global Discounts", @@ -15,6 +16,7 @@ class ResPartner(models.Model): ) supplier_global_discount_ids = fields.Many2many( comodel_name="global.discount", + relation="supplier_global_discount_rel", column1="partner_id", column2="global_discount_id", string="Purchase Global Discounts", diff --git a/base_global_discount/readme/CONTRIBUTORS.rst b/base_global_discount/readme/CONTRIBUTORS.rst index 7b1dda355..872df73d3 100644 --- a/base_global_discount/readme/CONTRIBUTORS.rst +++ b/base_global_discount/readme/CONTRIBUTORS.rst @@ -4,3 +4,4 @@ * David Vidal * Carlos Dauden * Rafael Blasco + * Ernesto Tejeda diff --git a/base_global_discount/readme/USAGE.rst b/base_global_discount/readme/USAGE.rst index 8d9135e44..5615b886b 100644 --- a/base_global_discount/readme/USAGE.rst +++ b/base_global_discount/readme/USAGE.rst @@ -2,6 +2,5 @@ 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. +#. In section sale, you can set sale discounts. +#. In section purchase, you can set purchase discounts. diff --git a/base_global_discount/security/security.xml b/base_global_discount/security/security.xml index 2e6c18cef..eeb722c61 100644 --- a/base_global_discount/security/security.xml +++ b/base_global_discount/security/security.xml @@ -7,7 +7,7 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + >['|',('company_id','=',False),('company_id', 'in', company_ids)] diff --git a/base_global_discount/tests/test_global_discount.py b/base_global_discount/tests/test_global_discount.py index ff618aeaa..47ddd8348 100644 --- a/base_global_discount/tests/test_global_discount.py +++ b/base_global_discount/tests/test_global_discount.py @@ -9,10 +9,10 @@ class TestGlobalDiscount(common.SavepointCase): 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,} + {"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,} + {"name": "Test Discount 2", "discount_scope": "sale", "discount": 30} ) def test_01_global_discounts(self): diff --git a/base_global_discount/views/global_discount_views.xml b/base_global_discount/views/global_discount_views.xml index 6964a73fa..5cf4e77a6 100644 --- a/base_global_discount/views/global_discount_views.xml +++ b/base_global_discount/views/global_discount_views.xml @@ -34,7 +34,6 @@ Global Discounts ir.actions.act_window global.discount - form tree,form From e6a0115a782ae07bfc07a7a6b4d34fc0fc90d0eb Mon Sep 17 00:00:00 2001 From: Cas Vissers Date: Fri, 29 Jan 2021 08:57:40 +0000 Subject: [PATCH 06/10] Added translation using Weblate (Dutch) --- base_global_discount/i18n/nl_NL.po | 120 +++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 base_global_discount/i18n/nl_NL.po diff --git a/base_global_discount/i18n/nl_NL.po b/base_global_discount/i18n/nl_NL.po new file mode 100644 index 000000000..975c0f779 --- /dev/null +++ b/base_global_discount/i18n/nl_NL.po @@ -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 13.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: nl_NL\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\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_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_form +#: model_terms: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 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase +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 +#: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale +msgid "Sales" +msgstr "" + +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_global_discount__sequence +msgid "Sequence" +msgstr "" From 37e7b512260a1a0ae397b42861ceadfb716d7d8f Mon Sep 17 00:00:00 2001 From: Cas Vissers Date: Fri, 29 Jan 2021 08:58:10 +0000 Subject: [PATCH 07/10] Translated using Weblate (Dutch) Currently translated at 100.0% (20 of 20 strings) Translation: server-backend-13.0/server-backend-13.0-base_global_discount Translate-URL: https://translation.odoo-community.org/projects/server-backend-13-0/server-backend-13-0-base_global_discount/nl_NL/ --- base_global_discount/i18n/nl_NL.po | 44 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/base_global_discount/i18n/nl_NL.po b/base_global_discount/i18n/nl_NL.po index 975c0f779..ad3b82d41 100644 --- a/base_global_discount/i18n/nl_NL.po +++ b/base_global_discount/i18n/nl_NL.po @@ -6,63 +6,65 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2021-01-29 11:44+0000\n" +"Last-Translator: Cas Vissers \n" "Language-Team: none\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__company_id msgid "Company" -msgstr "" +msgstr "Bedrijf" #. module: base_global_discount #: model:ir.model,name:base_global_discount.model_res_partner msgid "Contact" -msgstr "" +msgstr "Contact" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__create_uid msgid "Created by" -msgstr "" +msgstr "Aangemaakt door" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__create_date msgid "Created on" -msgstr "" +msgstr "Aangemaakt op" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__discount msgid "Discount" -msgstr "" +msgstr "Korting" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__name msgid "Discount Name" -msgstr "" +msgstr "Kortingsnaam" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__discount_scope msgid "Discount Scope" -msgstr "" +msgstr "Kortingsbereik" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__display_name msgid "Display Name" -msgstr "" +msgstr "Schermnaam" #. module: base_global_discount #: model:ir.model.fields,help:base_global_discount.field_global_discount__sequence msgid "Gives the order to apply discounts" -msgstr "" +msgstr "Geeft de opdracht om kortingen toe te passen" #. module: base_global_discount #: model:ir.model,name:base_global_discount.model_global_discount msgid "Global Discount" -msgstr "" +msgstr "Algemene korting" #. module: base_global_discount #: model:ir.actions.act_window,name:base_global_discount.action_global_discount_tree @@ -70,51 +72,51 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_form #: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_tree msgid "Global Discounts" -msgstr "" +msgstr "Algemene korting" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__id msgid "ID" -msgstr "" +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 "" +msgstr "Laatst gewijzigd op" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Laatst bijgewerkt door" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__write_date msgid "Last Updated on" -msgstr "" +msgstr "Laatst bijgewerkt op" #. 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 "" +msgstr "Algemene inkoopkorting" #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" -msgstr "" +msgstr "Inkopen" #. 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 "" +msgstr "Algemene verkoopkorting" #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" -msgstr "" +msgstr "Verkoop" #. module: base_global_discount #: model:ir.model.fields,field_description:base_global_discount.field_global_discount__sequence msgid "Sequence" -msgstr "" +msgstr "Volgorde" From f4400be75d9d97d607d2733e8589b1c7f3577bf3 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 11 Dec 2020 16:38:12 +0100 Subject: [PATCH 08/10] [IMP] base_global_discount: add specific security group This way, it will be easier to decide who can set discount or not. The current group scope is too broad. [UPD] Update base_global_discount.pot --- base_global_discount/README.rst | 4 +++- base_global_discount/__manifest__.py | 2 +- .../i18n/base_global_discount.pot | 19 +++++++++++++++++++ base_global_discount/models/res_partner.py | 14 ++++++++++++++ base_global_discount/readme/CONFIGURE.rst | 1 + base_global_discount/readme/USAGE.rst | 3 ++- .../security/ir.model.access.csv | 2 +- base_global_discount/security/security.xml | 4 ++++ .../views/global_discount_views.xml | 1 + .../views/res_partner_views.xml | 17 +++++++++++++++++ 10 files changed, 63 insertions(+), 4 deletions(-) diff --git a/base_global_discount/README.rst b/base_global_discount/README.rst index 3996ceef4..17cbdba7d 100644 --- a/base_global_discount/README.rst +++ b/base_global_discount/README.rst @@ -39,6 +39,7 @@ Configuration To use this module, you need to: +#. Go to *Settings > Users*, choose yours and set *Manage Global Discounts*. #. Go to *Settings > Parameters > Global Discounts* #. Choose the discount scope (sales or purchases). #. You can also restrict it to a certain company if needed. @@ -46,7 +47,8 @@ To use this module, you need to: Usage ===== -You can assign global discounts to partners as well: +You can assign global discounts to partners as well. You'll need the proper +permission (*Manage Global Discounts*): #. Go to a partner that is a company. #. Go to the *Sales & Purchases* tab. diff --git a/base_global_discount/__manifest__.py b/base_global_discount/__manifest__.py index c16fc614d..67dc352d3 100644 --- a/base_global_discount/__manifest__.py +++ b/base_global_discount/__manifest__.py @@ -10,8 +10,8 @@ "license": "AGPL-3", "depends": ["product"], "data": [ - "security/ir.model.access.csv", "security/security.xml", + "security/ir.model.access.csv", "views/global_discount_views.xml", "views/res_partner_views.xml", ], diff --git a/base_global_discount/i18n/base_global_discount.pot b/base_global_discount/i18n/base_global_discount.pot index 58ce06fc7..52e6ea435 100644 --- a/base_global_discount/i18n/base_global_discount.pot +++ b/base_global_discount/i18n/base_global_discount.pot @@ -91,12 +91,24 @@ msgstr "" msgid "Last Updated on" msgstr "" +#. module: base_global_discount +#: model:res.groups,name:base_global_discount.group_global_discount +msgid "Manage Global Discounts" +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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Purchase Global Discounts" msgstr "" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__supplier_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__supplier_global_discount_ids_readonly +msgid "Purchase Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" @@ -105,9 +117,16 @@ 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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Sale Global Discounts" msgstr "" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__customer_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__customer_global_discount_ids_readonly +msgid "Sale Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" diff --git a/base_global_discount/models/res_partner.py b/base_global_discount/models/res_partner.py index 1a01b9929..5f504bf2e 100644 --- a/base_global_discount/models/res_partner.py +++ b/base_global_discount/models/res_partner.py @@ -22,3 +22,17 @@ class ResPartner(models.Model): string="Purchase Global Discounts", domain=[("discount_scope", "=", "purchase")], ) + # HACK: Looks like UI doesn't behave well with Many2many fields and + # negative groups when the same field is shown. In this case, we want to + # show the readonly version to any not in the global discount group. + # TODO: Check in v14 if it's fixed + customer_global_discount_ids_readonly = fields.Many2many( + string="Sale Global Discounts (readonly)", + related="customer_global_discount_ids", + readonly=True, + ) + supplier_global_discount_ids_readonly = fields.Many2many( + string="Purchase Global Discounts (readonly)", + related="supplier_global_discount_ids", + readonly=True, + ) diff --git a/base_global_discount/readme/CONFIGURE.rst b/base_global_discount/readme/CONFIGURE.rst index 0e5cea40e..bb80f62da 100644 --- a/base_global_discount/readme/CONFIGURE.rst +++ b/base_global_discount/readme/CONFIGURE.rst @@ -1,5 +1,6 @@ To use this module, you need to: +#. Go to *Settings > Users*, choose yours and set *Manage Global Discounts*. #. 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/USAGE.rst b/base_global_discount/readme/USAGE.rst index 5615b886b..079332b79 100644 --- a/base_global_discount/readme/USAGE.rst +++ b/base_global_discount/readme/USAGE.rst @@ -1,4 +1,5 @@ -You can assign global discounts to partners as well: +You can assign global discounts to partners as well. You'll need the proper +permission (*Manage Global Discounts*): #. Go to a partner that is a company. #. Go to the *Sales & Purchases* tab. diff --git a/base_global_discount/security/ir.model.access.csv b/base_global_discount/security/ir.model.access.csv index 33fcbd8f6..e6e0d9faa 100644 --- a/base_global_discount/security/ir.model.access.csv +++ b/base_global_discount/security/ir.model.access.csv @@ -1,3 +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 +access_global_discount_manager,Global Discount Manager,model_global_discount,base_global_discount.group_global_discount,1,1,1,1 diff --git a/base_global_discount/security/security.xml b/base_global_discount/security/security.xml index eeb722c61..234c7c0ed 100644 --- a/base_global_discount/security/security.xml +++ b/base_global_discount/security/security.xml @@ -13,4 +13,8 @@ + + Manage Global Discounts + + diff --git a/base_global_discount/views/global_discount_views.xml b/base_global_discount/views/global_discount_views.xml index 5cf4e77a6..fd22e9257 100644 --- a/base_global_discount/views/global_discount_views.xml +++ b/base_global_discount/views/global_discount_views.xml @@ -42,5 +42,6 @@ name="Global Discounts" sequence="1" parent="base.menu_ir_property" + groups="base_global_discount.group_global_discount" /> diff --git a/base_global_discount/views/res_partner_views.xml b/base_global_discount/views/res_partner_views.xml index 78ec97de4..4b64c4928 100644 --- a/base_global_discount/views/res_partner_views.xml +++ b/base_global_discount/views/res_partner_views.xml @@ -10,6 +10,14 @@ + @@ -17,6 +25,15 @@ + From 8c06a3e6c2821f9c678eeaa07f97a1e99bc502ab Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 21 Apr 2021 17:02:55 +0000 Subject: [PATCH 09/10] base_global_discount 13.0.2.0.0 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: server-backend-13.0/server-backend-13.0-base_global_discount Translate-URL: https://translation.odoo-community.org/projects/server-backend-13-0/server-backend-13-0-base_global_discount/ --- base_global_discount/__manifest__.py | 2 +- base_global_discount/i18n/es.po | 19 +++++++++++++++++++ base_global_discount/i18n/nl_NL.po | 19 +++++++++++++++++++ base_global_discount/i18n/pt.po | 19 +++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/base_global_discount/__manifest__.py b/base_global_discount/__manifest__.py index 67dc352d3..c33b70024 100644 --- a/base_global_discount/__manifest__.py +++ b/base_global_discount/__manifest__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Base Global Discount", - "version": "13.0.1.0.0", + "version": "13.0.2.0.0", "category": "Base", "author": "Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/server-backend", diff --git a/base_global_discount/i18n/es.po b/base_global_discount/i18n/es.po index e0e2e62fb..4d3bb2bf5 100644 --- a/base_global_discount/i18n/es.po +++ b/base_global_discount/i18n/es.po @@ -94,12 +94,24 @@ msgstr "Última Actualización por" msgid "Last Updated on" msgstr "Última Actualización el" +#. module: base_global_discount +#: model:res.groups,name:base_global_discount.group_global_discount +msgid "Manage Global Discounts" +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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Purchase Global Discounts" msgstr "Descuentos globales de compra" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__supplier_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__supplier_global_discount_ids_readonly +msgid "Purchase Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" @@ -108,9 +120,16 @@ 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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Sale Global Discounts" msgstr "Descuentos de venta globales" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__customer_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__customer_global_discount_ids_readonly +msgid "Sale Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" diff --git a/base_global_discount/i18n/nl_NL.po b/base_global_discount/i18n/nl_NL.po index ad3b82d41..212098ffe 100644 --- a/base_global_discount/i18n/nl_NL.po +++ b/base_global_discount/i18n/nl_NL.po @@ -94,12 +94,24 @@ msgstr "Laatst bijgewerkt door" msgid "Last Updated on" msgstr "Laatst bijgewerkt op" +#. module: base_global_discount +#: model:res.groups,name:base_global_discount.group_global_discount +msgid "Manage Global Discounts" +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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Purchase Global Discounts" msgstr "Algemene inkoopkorting" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__supplier_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__supplier_global_discount_ids_readonly +msgid "Purchase Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" @@ -108,9 +120,16 @@ msgstr "Inkopen" #. 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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Sale Global Discounts" msgstr "Algemene verkoopkorting" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__customer_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__customer_global_discount_ids_readonly +msgid "Sale Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" diff --git a/base_global_discount/i18n/pt.po b/base_global_discount/i18n/pt.po index 9d572acdc..73ed8a20b 100644 --- a/base_global_discount/i18n/pt.po +++ b/base_global_discount/i18n/pt.po @@ -94,12 +94,24 @@ msgstr "Atualizado pela última vez por" msgid "Last Updated on" msgstr "Atualizado pela última vez em" +#. module: base_global_discount +#: model:res.groups,name:base_global_discount.group_global_discount +msgid "Manage Global Discounts" +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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Purchase Global Discounts" msgstr "Descontos Globais de Compras" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__supplier_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__supplier_global_discount_ids_readonly +msgid "Purchase Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__purchase msgid "Purchases" @@ -108,9 +120,16 @@ 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 +#: model_terms:ir.ui.view,arch_db:base_global_discount.res_partner_form_view msgid "Sale Global Discounts" msgstr "Descontos Globais de Vendas" +#. module: base_global_discount +#: model:ir.model.fields,field_description:base_global_discount.field_res_partner__customer_global_discount_ids_readonly +#: model:ir.model.fields,field_description:base_global_discount.field_res_users__customer_global_discount_ids_readonly +msgid "Sale Global Discounts (readonly)" +msgstr "" + #. module: base_global_discount #: model:ir.model.fields.selection,name:base_global_discount.selection__global_discount__discount_scope__sale msgid "Sales" From dfd3842f114612c41ec725d49fa198b26d7e481b Mon Sep 17 00:00:00 2001 From: "Omar (Comunitea)" Date: Mon, 23 Aug 2021 12:15:58 +0200 Subject: [PATCH 10/10] [MIG] base_global_discount: Migration to 14.0 --- base_global_discount/__manifest__.py | 2 +- .../migrations/13.0.1.0.0/post-migration.py | 36 ------------------- .../migrations/13.0.1.0.0/pre-migration.py | 13 ------- .../models/global_discount.py | 8 ++--- base_global_discount/models/res_partner.py | 2 +- base_global_discount/readme/CONTRIBUTORS.rst | 1 + .../views/res_partner_views.xml | 1 + .../odoo/addons/base_global_discount | 1 + setup/base_global_discount/setup.py | 6 ++++ 9 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 base_global_discount/migrations/13.0.1.0.0/post-migration.py delete mode 100644 base_global_discount/migrations/13.0.1.0.0/pre-migration.py create mode 120000 setup/base_global_discount/odoo/addons/base_global_discount create mode 100644 setup/base_global_discount/setup.py diff --git a/base_global_discount/__manifest__.py b/base_global_discount/__manifest__.py index c33b70024..e277717e4 100644 --- a/base_global_discount/__manifest__.py +++ b/base_global_discount/__manifest__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "Base Global Discount", - "version": "13.0.2.0.0", + "version": "14.0.1.0.0", "category": "Base", "author": "Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/server-backend", diff --git a/base_global_discount/migrations/13.0.1.0.0/post-migration.py b/base_global_discount/migrations/13.0.1.0.0/post-migration.py deleted file mode 100644 index 0d3657bd6..000000000 --- a/base_global_discount/migrations/13.0.1.0.0/post-migration.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2020 Tecnativa - Ernesto Tejeda -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openupgradelib import openupgrade - - -@openupgrade.migrate() -def migrate(env, version): - openupgrade.logged_query( - env.cr, - """ - INSERT INTO customer_global_discount_rel - (partner_id, global_discount_id) - SELECT - partner_id, - global_discount_id - FROM - global_discount_res_partner_rel - WHERE - discount_scope = 'sale'; - """, - ) - openupgrade.logged_query( - env.cr, - """ - INSERT INTO supplier_global_discount_rel - (partner_id, global_discount_id) - SELECT - partner_id, - field_id - FROM - global_discount_res_partner_rel - WHERE - discount_scope = 'purchase'; - """, - ) diff --git a/base_global_discount/migrations/13.0.1.0.0/pre-migration.py b/base_global_discount/migrations/13.0.1.0.0/pre-migration.py deleted file mode 100644 index 88a9f7f9d..000000000 --- a/base_global_discount/migrations/13.0.1.0.0/pre-migration.py +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2020 Tecnativa - Ernesto Tejeda -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - - -def migrate(cr, version): - if not version: - return - cr.execute( - """ - DELETE FROM ir_model_relation - WHERE name = 'global_discount_res_partner_rel'; - """ - ) diff --git a/base_global_discount/models/global_discount.py b/base_global_discount/models/global_discount.py index 60e6b69ea..3ef61c2a5 100644 --- a/base_global_discount/models/global_discount.py +++ b/base_global_discount/models/global_discount.py @@ -30,11 +30,11 @@ class GlobalDiscount(models.Model): return result def _get_global_discount_vals(self, base, **kwargs): - """ Prepare the dict of values to create to obtain the discounted - amount + """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 + :param float base: the amount to discount + :return: dict with the discounted amount """ self.ensure_one() return { diff --git a/base_global_discount/models/res_partner.py b/base_global_discount/models/res_partner.py index 5f504bf2e..e95e29ad4 100644 --- a/base_global_discount/models/res_partner.py +++ b/base_global_discount/models/res_partner.py @@ -25,7 +25,7 @@ class ResPartner(models.Model): # HACK: Looks like UI doesn't behave well with Many2many fields and # negative groups when the same field is shown. In this case, we want to # show the readonly version to any not in the global discount group. - # TODO: Check in v14 if it's fixed + # TODO: Check in future versions if it's fixed customer_global_discount_ids_readonly = fields.Many2many( string="Sale Global Discounts (readonly)", related="customer_global_discount_ids", diff --git a/base_global_discount/readme/CONTRIBUTORS.rst b/base_global_discount/readme/CONTRIBUTORS.rst index 872df73d3..c4649cea3 100644 --- a/base_global_discount/readme/CONTRIBUTORS.rst +++ b/base_global_discount/readme/CONTRIBUTORS.rst @@ -5,3 +5,4 @@ * Carlos Dauden * Rafael Blasco * Ernesto Tejeda +* Omar Castiñeira diff --git a/base_global_discount/views/res_partner_views.xml b/base_global_discount/views/res_partner_views.xml index 4b64c4928..95d49ee22 100644 --- a/base_global_discount/views/res_partner_views.xml +++ b/base_global_discount/views/res_partner_views.xml @@ -19,6 +19,7 @@ widget="many2many_tags" groups="!base_global_discount.group_global_discount" attrs="{'invisible': [('is_company', '=', False), ('parent_id', '!=', False)]}" + readonly="1" /> 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 000000000..4635850f7 --- /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.py b/setup/base_global_discount/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/base_global_discount/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)