From 5b62aa6943ff2d955f612ce68e5f5868f71bbe34 Mon Sep 17 00:00:00 2001 From: cubells Date: Tue, 17 Oct 2017 12:51:35 +0200 Subject: [PATCH] [MIG] contract_recurring_analytic_distribution: Migration to 10.0 --- .../README.rst | 9 +- .../__init__.py | 1 - .../{__openerp__.py => __manifest__.py} | 4 +- .../models/__init__.py | 2 +- ...ce_line.py => account_analytic_account.py} | 5 +- .../static/description/icon.svg | 463 ------------------ .../test_contract_recurring_distribution.py | 36 +- oca_dependencies.txt | 1 + 8 files changed, 30 insertions(+), 491 deletions(-) rename contract_recurring_analytic_distribution/{__openerp__.py => __manifest__.py} (87%) rename contract_recurring_analytic_distribution/models/{account_analytic_invoice_line.py => account_analytic_account.py} (88%) delete mode 100644 contract_recurring_analytic_distribution/static/description/icon.svg diff --git a/contract_recurring_analytic_distribution/README.rst b/contract_recurring_analytic_distribution/README.rst index 5ea404e3..7f0dd020 100644 --- a/contract_recurring_analytic_distribution/README.rst +++ b/contract_recurring_analytic_distribution/README.rst @@ -18,7 +18,7 @@ invoice recurring lines that you want. .. 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 + :target: https://runbot.odoo-community.org/runbot/110/10.0 Bug Tracker =========== @@ -34,14 +34,15 @@ Credits Contributors ------------ -* Pedro M. Baeza -* Vicent Cubells +* Tecnativa (https://www.tecnativa.com) + * Pedro M. Baeza + * Vicent Cubells Icon ---- * https://openclipart.org/detail/125071/pie-graph -* Subicon made by `Freepik _ from +* Subicon made by `Freepik `_ from www.flaticon.com Maintainer diff --git a/contract_recurring_analytic_distribution/__init__.py b/contract_recurring_analytic_distribution/__init__.py index 6af6a042..4d8ae82d 100644 --- a/contract_recurring_analytic_distribution/__init__.py +++ b/contract_recurring_analytic_distribution/__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 models diff --git a/contract_recurring_analytic_distribution/__openerp__.py b/contract_recurring_analytic_distribution/__manifest__.py similarity index 87% rename from contract_recurring_analytic_distribution/__openerp__.py rename to contract_recurring_analytic_distribution/__manifest__.py index df9e40f7..f800aec3 100644 --- a/contract_recurring_analytic_distribution/__openerp__.py +++ b/contract_recurring_analytic_distribution/__manifest__.py @@ -5,11 +5,11 @@ { 'name': 'Analytic plans on contracts recurring invoices', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'category': 'Contract Management', 'author': 'Tecnativa, ' 'Odoo Community Association (OCA)', - 'website': 'http://www.tecnativa.com', + 'website': 'https://github.com/OCA/contract/', 'license': 'AGPL-3', 'depends': [ 'account_analytic_distribution', diff --git a/contract_recurring_analytic_distribution/models/__init__.py b/contract_recurring_analytic_distribution/models/__init__.py index 4c204bd9..4feee90a 100644 --- a/contract_recurring_analytic_distribution/models/__init__.py +++ b/contract_recurring_analytic_distribution/models/__init__.py @@ -2,4 +2,4 @@ # Copyright 2015 Tecnativa - Pedro M. Baeza # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from . import account_analytic_invoice_line +from . import account_analytic_account diff --git a/contract_recurring_analytic_distribution/models/account_analytic_invoice_line.py b/contract_recurring_analytic_distribution/models/account_analytic_account.py similarity index 88% rename from contract_recurring_analytic_distribution/models/account_analytic_invoice_line.py rename to contract_recurring_analytic_distribution/models/account_analytic_account.py index 13ebe390..8eea4925 100644 --- a/contract_recurring_analytic_distribution/models/account_analytic_invoice_line.py +++ b/contract_recurring_analytic_distribution/models/account_analytic_account.py @@ -3,7 +3,7 @@ # Copyright 2017 Tecnativa - Vicent Cubells # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from openerp import models, fields, api +from odoo import api, fields, models class AccountAnalyticAccount(models.Model): @@ -26,5 +26,6 @@ class AccountAnalyticInvoiceLine(models.Model): analytic_distribution_id = fields.Many2one( comodel_name='account.analytic.distribution', - string='Analytic Distribution', oldname='analytics_id', + string='Analytic Distribution', + oldname='analytics_id', ) diff --git a/contract_recurring_analytic_distribution/static/description/icon.svg b/contract_recurring_analytic_distribution/static/description/icon.svg deleted file mode 100644 index b52aec86..00000000 --- a/contract_recurring_analytic_distribution/static/description/icon.svg +++ /dev/null @@ -1,463 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - Pile of Golden Coins - 2010-04-09T03:27:45 - A pile of hypothetical golden coins, drawn in Inkscape. - https://openclipart.org/detail/43969/pile-of-golden-coins-by-j_alves - - - J_Alves - - - - - coin - currency - gold - money - thaler - - - - - - - - - - - diff --git a/contract_recurring_analytic_distribution/tests/test_contract_recurring_distribution.py b/contract_recurring_analytic_distribution/tests/test_contract_recurring_distribution.py index d76196fc..609c4215 100644 --- a/contract_recurring_analytic_distribution/tests/test_contract_recurring_distribution.py +++ b/contract_recurring_analytic_distribution/tests/test_contract_recurring_distribution.py @@ -3,49 +3,49 @@ # Copyright 2017 Tecnativa - Vicent Cubells # 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 TestContractRecurringDistribution(common.SavepointCase): - @classmethod - def setUpClass(cls): - super(TestContractRecurringDistribution, cls).setUpClass() - cls.partner = cls.env['res.partner'].create({'name': 'Test'}) - cls.product = cls.env['product.product'].create({ +@common.at_install(False) +@common.post_install(True) +class TestContractRecurringDistribution(common.HttpCase): + def setUp(self): + super(TestContractRecurringDistribution, self).setUp() + self.partner = self.env['res.partner'].create({'name': 'Test'}) + self.product = self.env['product.product'].create({ 'name': 'Test product', }) - cls.account1 = cls.env['account.analytic.account'].create({ + self.account1 = self.env['account.analytic.account'].create({ 'name': 'Test account #1', }) - cls.account2 = cls.env['account.analytic.account'].create({ + self.account2 = self.env['account.analytic.account'].create({ 'name': 'Test account #2', }) - cls.uom = cls.env.ref('product.product_uom_hour') - cls.contract = cls.env['account.analytic.account'].create({ + self.uom = self.env.ref('product.product_uom_hour') + self.contract = self.env['account.analytic.account'].create({ 'name': 'Test contract', - 'partner_id': cls.partner.id, - 'type': 'contract', + 'partner_id': self.partner.id, 'recurring_invoices': 1, 'recurring_interval': 1, 'recurring_invoice_line_ids': [ (0, 0, {'quantity': 2.0, 'price_unit': 100.0, 'name': 'Test', - 'product_id': cls.product.id, - 'uom_id': cls.uom.id})], + 'product_id': self.product.id, + 'uom_id': self.uom.id})], }) - cls.distribution = cls.env['account.analytic.distribution'].create({ + self.distribution = self.env['account.analytic.distribution'].create({ 'name': 'Test distribution', 'rule_ids': [ (0, 0, { 'sequence': 10, 'percent': 75.00, - 'analytic_account_id': cls.account1.id, + 'analytic_account_id': self.account1.id, }), (0, 0, { 'sequence': 20, 'percent': 25.00, - 'analytic_account_id': cls.account2.id, + 'analytic_account_id': self.account2.id, }), ] }) diff --git a/oca_dependencies.txt b/oca_dependencies.txt index 58a52b60..66922e56 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1,3 +1,4 @@ +account-analytic bank-payment sale-workflow web