From 150cfa22290de19be62453e76f98db1529ed4cb2 Mon Sep 17 00:00:00 2001 From: Marcel Savegnago Date: Sat, 12 Sep 2020 14:26:58 -0300 Subject: [PATCH] [MIG] contract_commission: Migration to 12.0 --- contract_commission/README.rst | 89 ++-- contract_commission/__init__.py | 1 - .../{__openerp__.py => __manifest__.py} | 12 +- .../i18n/contract_commission.pot | 4 +- contract_commission/models/__init__.py | 3 +- contract_commission/models/analytic.py | 19 - contract_commission/models/contract_line.py | 19 + contract_commission/readme/CONFIGURE.rst | 2 + contract_commission/readme/CONTRIBUTORS.rst | 3 + contract_commission/readme/DESCRIPTION.rst | 2 + contract_commission/readme/USAGE.rst | 2 + .../static/description/banner.png | Bin 0 -> 6733 bytes .../static/description/index.html | 434 ++++++++++++++++++ contract_commission/tests/__init__.py | 1 - .../tests/test_contract_commission.py | 80 +++- oca_dependencies.txt | 1 + 16 files changed, 586 insertions(+), 86 deletions(-) rename contract_commission/{__openerp__.py => __manifest__.py} (62%) delete mode 100644 contract_commission/models/analytic.py create mode 100644 contract_commission/models/contract_line.py create mode 100644 contract_commission/readme/CONFIGURE.rst create mode 100644 contract_commission/readme/CONTRIBUTORS.rst create mode 100644 contract_commission/readme/DESCRIPTION.rst create mode 100644 contract_commission/readme/USAGE.rst create mode 100644 contract_commission/static/description/banner.png create mode 100644 contract_commission/static/description/index.html create mode 100644 oca_dependencies.txt diff --git a/contract_commission/README.rst b/contract_commission/README.rst index beaa5a99f..4b1642ac5 100644 --- a/contract_commission/README.rst +++ b/contract_commission/README.rst @@ -1,16 +1,40 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - -======================= -Commission in contracts -======================= +================================ +Commissions in contract invoices +================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fcommission-lightgray.png?logo=github + :target: https://github.com/OCA/commission/tree/12.0/contract_commission + :alt: OCA/commission +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/commission-12-0/commission-12-0-contract_commission + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/165/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows to get default commissions for partner in the recurring invoices generated from contracts. -Installation -============ +**Table of contents** + +.. contents:: + :local: + +Configuration +============= This module is auto-installed when you have *contract* and *sale_commission* modules installed. @@ -21,55 +45,44 @@ Usage When invoicing contracts, the agents assigned to the partner of the contract will now be assigned to the generated invoices. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/110/9.0 - -Known issues / Roadmap -====================== - -* Allow to set specific commissions for each contract instead of taking the - ones set at partner level. - 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 smash it by providing detailed and welcomed feedback. +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 ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Tecnativa Contributors ------------- +~~~~~~~~~~~~ + * Pedro M. Baeza * Vicent Cubells +* Marcel Savegnago -Icon ----- -* http://commons.wikimedia.org/wiki/File:Percent_18e.svg -* https://openclipart.org/detail/43969/pile-of-golden-coins-by-j_alves -* Subicon made by `Freepik from www.flaticon.com - `_ +Maintainers +~~~~~~~~~~~ -Maintainer ----------- +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -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 https://odoo-community.org. +This module is part of the `OCA/commission `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/contract_commission/__init__.py b/contract_commission/__init__.py index 6af6a0423..0aaf667fa 100644 --- a/contract_commission/__init__.py +++ b/contract_commission/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Tecnativa - Pedro M. Baeza # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html diff --git a/contract_commission/__openerp__.py b/contract_commission/__manifest__.py similarity index 62% rename from contract_commission/__openerp__.py rename to contract_commission/__manifest__.py index 520439d5f..c34510320 100644 --- a/contract_commission/__openerp__.py +++ b/contract_commission/__manifest__.py @@ -1,20 +1,20 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Tecnativa - Pedro M. Baeza # Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { 'name': 'Commissions in contract invoices', - 'version': '9.0.1.0.0', + 'version': '12.0.1.0.0', 'author': 'Tecnativa, ' 'Odoo Community Association (OCA)', - "website": "https://www.tecnativa.com/", - "category": "Generic Modules/Sales & Purchases", + 'website': 'https://www.tecnativa.com/', + 'category': 'Generic Modules/Sales & Purchases', + 'images': ['static/description/banner.png'], 'license': 'AGPL-3', 'depends': [ 'contract', 'sale_commission', ], - "installable": True, - "auto_install": True, + 'installable': True, + 'auto_install': True, } diff --git a/contract_commission/i18n/contract_commission.pot b/contract_commission/i18n/contract_commission.pot index 28a0519a8..76a73448e 100644 --- a/contract_commission/i18n/contract_commission.pot +++ b/contract_commission/i18n/contract_commission.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-09-12 17:23+0000\n" +"PO-Revision-Date: 2020-09-12 17:23+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/contract_commission/models/__init__.py b/contract_commission/models/__init__.py index 0cc7c9f27..6cc51c365 100644 --- a/contract_commission/models/__init__.py +++ b/contract_commission/models/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Tecnativa - Pedro M. Baeza # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from . import analytic +from . import contract_line diff --git a/contract_commission/models/analytic.py b/contract_commission/models/analytic.py deleted file mode 100644 index 1a6104f90..000000000 --- a/contract_commission/models/analytic.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2015 Tecnativa - Pedro M. Baeza -# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html - -from openerp import api, models - - -class AccountAnalyticAccount(models.Model): - _inherit = 'account.analytic.account' - - @api.model - def _prepare_invoice_line(self, line, fiscal_position): - res = super(AccountAnalyticAccount, self)._prepare_invoice_line( - line, fiscal_position) - invoice_line_model = self.env['account.invoice.line'].with_context( - partner_id=line.analytic_account_id.partner_id.id) - res = {} if res is None else res - res['agents'] = invoice_line_model._default_agents() - return res diff --git a/contract_commission/models/contract_line.py b/contract_commission/models/contract_line.py new file mode 100644 index 000000000..f140d5e01 --- /dev/null +++ b/contract_commission/models/contract_line.py @@ -0,0 +1,19 @@ +# Copyright 2015 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo import api, models + + +class ContractLine(models.Model): + _inherit = 'contract.line' + + @api.model + def _prepare_invoice_line(self, invoice_id=False, invoice_values=False): + vals = super(ContractLine, self)._prepare_invoice_line( + invoice_id=invoice_id, invoice_values=invoice_values) + invoice_line_model = self.env['account.invoice.line'].with_context({ + 'partner_id': self.contract_id.partner_id.id + }) + vals = {} if vals is None else vals + vals['agents'] = invoice_line_model._default_agents() + return vals diff --git a/contract_commission/readme/CONFIGURE.rst b/contract_commission/readme/CONFIGURE.rst new file mode 100644 index 000000000..5d29e16c8 --- /dev/null +++ b/contract_commission/readme/CONFIGURE.rst @@ -0,0 +1,2 @@ +This module is auto-installed when you have *contract* and *sale_commission* +modules installed. diff --git a/contract_commission/readme/CONTRIBUTORS.rst b/contract_commission/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..7fbe6f791 --- /dev/null +++ b/contract_commission/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Pedro M. Baeza +* Vicent Cubells +* Marcel Savegnago diff --git a/contract_commission/readme/DESCRIPTION.rst b/contract_commission/readme/DESCRIPTION.rst new file mode 100644 index 000000000..0b74191ca --- /dev/null +++ b/contract_commission/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows to get default commissions for partner in the recurring +invoices generated from contracts. diff --git a/contract_commission/readme/USAGE.rst b/contract_commission/readme/USAGE.rst new file mode 100644 index 000000000..c5341d4e3 --- /dev/null +++ b/contract_commission/readme/USAGE.rst @@ -0,0 +1,2 @@ +When invoicing contracts, the agents assigned to the partner of the contract +will now be assigned to the generated invoices. diff --git a/contract_commission/static/description/banner.png b/contract_commission/static/description/banner.png new file mode 100644 index 0000000000000000000000000000000000000000..da4f6de2a24707c5658d507c81cdd7625d9bf9e4 GIT binary patch literal 6733 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 literal 0 HcmV?d00001 diff --git a/contract_commission/static/description/index.html b/contract_commission/static/description/index.html new file mode 100644 index 000000000..4b63fc096 --- /dev/null +++ b/contract_commission/static/description/index.html @@ -0,0 +1,434 @@ + + + + + + +Commissions in contract invoices + + + +
+

Commissions in contract invoices

+ + +

Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runbot

+

This module allows to get default commissions for partner in the recurring +invoices generated from contracts.

+

Table of contents

+ +
+

Configuration

+

This module is auto-installed when you have contract and sale_commission +modules installed.

+
+
+

Usage

+

When invoicing contracts, the agents assigned to the partner of the contract +will now be assigned to the generated invoices.

+
+
+

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

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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/commission project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/contract_commission/tests/__init__.py b/contract_commission/tests/__init__.py index 538d9778c..3f0828dba 100644 --- a/contract_commission/tests/__init__.py +++ b/contract_commission/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Tecnativa - Pedro M. Baeza # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html diff --git a/contract_commission/tests/test_contract_commission.py b/contract_commission/tests/test_contract_commission.py index 2a6eae7c8..c64f44918 100644 --- a/contract_commission/tests/test_contract_commission.py +++ b/contract_commission/tests/test_contract_commission.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- # Copyright 2015 Tecnativa - Pedro M. Baeza # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -import openerp.tests.common as common +import odoo.tests.common as common class TestContractCommission(common.SavepointCase): @@ -22,26 +21,61 @@ def setUpClass(cls): 'name': 'Test partner', 'agents': [(6, 0, cls.agent.ids)], }) - cls.contract = cls.env['account.analytic.account'].create( - {'partner_id': cls.partner.id, - 'name': 'Test contract', - 'recurring_invoices': True, - 'state': 'draft', - 'type': 'normal', - 'recurring_invoice_line_ids': [ - (0, 0, { - 'product_id': cls.product.id, - 'name': cls.product.name, - 'quantity': 1.0, - 'uom_id': cls.product.uom_id.id, - 'price_unit': 1.0, - })]} + cls.contract = cls.env['contract.contract'].create( + { + 'name': 'Test contract', + 'partner_id': cls.partner.id, + 'contract_type': 'sale', + } ) + cls.contract_line = cls.env['contract.line'].create( + { + 'contract_id': cls.contract.id, + 'product_id': cls.product.id, + 'name': cls.product.name, + 'quantity': 1.0, + 'uom_id': cls.product.uom_id.id, + 'price_unit': 10.0, + 'recurring_rule_type': 'monthly', + 'recurring_interval': 1, + 'date_start': '2018-01-01', + 'recurring_next_date': '2018-01-15', + 'is_auto_renew': False, + } + ) + + cls.account_type = cls.env['account.account.type'].create({ + 'name': 'Test account type', + 'type': 'other', + }) + cls.account = cls.env['account.account'].create({ + 'name': 'Test account', + 'code': 'TEST', + 'user_type_id': cls.account_type.id + }) + cls.invoice = cls.env['account.invoice'].create({ + 'partner_id': cls.partner.id, + 'type': 'out_invoice', + }) + + cls.invoice_line = cls.env['account.invoice.line'].create({ + 'invoice_id': cls.invoice.id, + 'product_id': cls.product.id, + 'name': cls.product.name, + 'account_id': cls.account.id, + 'quantity': 1.0, + 'uom_id': cls.product.uom_id.id, + 'price_unit': 10.0, + }) + def test_invoice_commissions(self): + contracts = self.contract self.contract.recurring_create_invoice() invoice_lines = self.env['account.invoice.line'].search( - [('account_analytic_id', '=', self.contract.id)]) + [('contract_line_id', 'in', + contracts.mapped('contract_line_ids').ids)] + ) self.assertEqual(len(invoice_lines), 1) self.assertEqual(len(invoice_lines.agents), 1) self.assertEqual(invoice_lines.agents.agent, self.agent) @@ -50,10 +84,20 @@ def test_invoice_commissions(self): def test_invoice_wo_commissions(self): """Test correct creation when there's no agents""" + contracts = self.contract self.partner.agents = False self.contract.recurring_create_invoice() invoice_lines = self.env['account.invoice.line'].search( - [('account_analytic_id', '=', self.contract.id)] + [('contract_line_id', 'in', + contracts.mapped('contract_line_ids').ids)] ) self.assertEqual(len(invoice_lines), 1) self.assertFalse(invoice_lines.agents) + + def test_prepare_invoice_line(self): + invoice_id = self.invoice + invoice_values = self.invoice + result = self.contract_line._prepare_invoice_line( + invoice_id=invoice_id, + invoice_values=invoice_values) + self.assertEqual(result['agents'][0][2]['agent'], self.agent.id) diff --git a/oca_dependencies.txt b/oca_dependencies.txt new file mode 100644 index 000000000..8bba64a4a --- /dev/null +++ b/oca_dependencies.txt @@ -0,0 +1 @@ +contract \ No newline at end of file