Merge PR #207 into 12.0

Signed-off-by pedrobaeza

.gitignore

@@ -21,6 +21,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.eggs
 
 # Installer logs
 pip-log.txt

contract/__init__.py

@@ -1 +1,2 @@
 from . import models
+from . import wizards

contract/__manifest__.py

@@ -4,29 +4,35 @@
 # Copyright 2016-2018 Tecnativa - Carlos Dauden
 # Copyright 2017 Tecnativa - Vicent Cubells
 # Copyright 2016-2017 LasLabs Inc.
+# Copyright 2018 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Contracts Management - Recurring',
-    'version': '12.0.1.0.0',
+    'name': 'Recurring - Contracts Management',
+    'version': '12.0.4.0.0',
     'category': 'Contract Management',
     'license': 'AGPL-3',
     'author': "OpenERP SA, "
               "Tecnativa, "
               "LasLabs, "
               "Odoo Community Association (OCA)",
     'website': 'https://github.com/oca/contract',
-    'depends': ['base', 'account', 'analytic'],
+    'depends': ['base', 'account', 'product'],
+    "external_dependencies": {"python": ["dateutil"]},
     'data': [
         'security/ir.model.access.csv',
         'security/contract_security.xml',
         'report/report_contract.xml',
         'report/contract_views.xml',
         'data/contract_cron.xml',
+        'data/contract_renew_cron.xml',
         'data/mail_template.xml',
-        'views/account_analytic_account_view.xml',
-        'views/account_analytic_contract_view.xml',
-        'views/account_invoice_view.xml',
+        'wizards/contract_line_wizard.xml',
+        'views/abstract_contract_line.xml',
+        'views/contract.xml',
+        'views/contract_line.xml',
+        'views/contract_template.xml',
+        'views/contract_template_line.xml',
         'views/res_partner_view.xml',
     ],
     'installable': True,

contract/data/contract_cron.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding='UTF-8'?>
 <odoo noupdate="1">
 
-    <record model="ir.cron" id="account_analytic_cron_for_invoice">
+    <record model="ir.cron" id="contract_cron_for_invoice">
         <field name="name">Generate Recurring Invoices from Contracts</field>
-        <field name="model_id" ref="analytic.model_account_analytic_account"/>
+        <field name="model_id" ref="model_contract_contract"/>
         <field name="state">code</field>
         <field name="code">model.cron_recurring_create_invoice()</field>
         <field name="user_id" ref="base.user_root" />

contract/data/contract_renew_cron.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<odoo noupdate="1">
+
+    <record model="ir.cron" id="contract_line_cron_for_renew">
+        <field name="name">Renew Contract lines</field>
+        <field name="model_id" ref="model_contract_line"/>
+        <field name="state">code</field>
+        <field name="code">model.cron_renew_contract_line()</field>
+        <field name="user_id" ref="base.user_root" />
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field eval="False" name="doall" />
+    </record>
+
+</odoo>

contract/data/mail_template.xml

@@ -6,7 +6,7 @@
         <field name="email_from">${(object.user_id.email and '%s &lt;%s&gt;' % (object.user_id.name, object.user_id.email) or '')|safe}</field>
         <field name="subject">${object.company_id.name} Contract (Ref ${object.name or 'n/a'})</field>
         <field name="partner_to">${object.partner_id.id}</field>
-        <field name="model_id" ref="contract.model_account_analytic_account"/>
+        <field name="model_id" ref="model_contract_contract"/>
         <field name="auto_delete" eval="True"/>
         <field name="report_template" ref="contract.report_contract"/>
         <field name="report_name">Contract</field>

contract/migrations/12.0.2.0.0/pre-migration.py

@@ -0,0 +1,94 @@
+# Copyright 2018 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import logging
+
+from openupgradelib import openupgrade
+
+_logger = logging.getLogger(__name__)
+
+
+def _set_finished_contract(cr):
+    _logger.info("set recurring_next_date to false for finished contract")
+    openupgrade.logged_query(
+        cr,
+        """
+        UPDATE account_analytic_account
+        SET    recurring_next_date=NULL
+        WHERE  recurring_next_date > date_end
+        """,
+    )
+
+
+def _move_contract_recurrence_info_to_contract_line(cr):
+    _logger.info("Move contract data to line level")
+    openupgrade.logged_query(
+        cr,
+        """
+    ALTER TABLE account_analytic_invoice_line
+        ADD COLUMN IF NOT EXISTS recurring_rule_type         VARCHAR(255),
+        ADD COLUMN IF NOT EXISTS recurring_invoicing_type    VARCHAR(255),
+        ADD COLUMN IF NOT EXISTS recurring_interval          INTEGER,
+        ADD COLUMN IF NOT EXISTS recurring_next_date         DATE,
+        ADD COLUMN IF NOT EXISTS date_start                  DATE,
+        ADD COLUMN IF NOT EXISTS date_end                    DATE
+    """,
+    )
+
+    openupgrade.logged_query(
+        cr,
+        """
+        UPDATE account_analytic_invoice_line AS contract_line
+        SET
+            recurring_rule_type=contract.recurring_rule_type,
+            recurring_invoicing_type=contract.recurring_invoicing_type,
+            recurring_interval=contract.recurring_interval,
+            recurring_next_date=contract.recurring_next_date,
+            date_start=contract.date_start,
+            date_end=contract.date_end
+        FROM
+            account_analytic_account AS contract
+        WHERE
+            contract.id=contract_line.analytic_account_id
+        """,
+    )
+
+
+def _move_contract_template_recurrence_info_to_contract_template_line(cr):
+    _logger.info("Move contract template data to line level")
+    openupgrade.logged_query(
+        cr,
+        """
+    ALTER TABLE account_analytic_contract_line
+        ADD COLUMN IF NOT EXISTS recurring_rule_type         VARCHAR(255),
+        ADD COLUMN IF NOT EXISTS recurring_invoicing_type    VARCHAR(255),
+        ADD COLUMN IF NOT EXISTS recurring_interval          INTEGER
+    """,
+    )
+
+    openupgrade.logged_query(
+        cr,
+        """
+    UPDATE account_analytic_contract_line AS contract_template_line
+    SET
+        recurring_rule_type=contract_template.recurring_rule_type,
+        recurring_invoicing_type=contract_template.recurring_invoicing_type,
+        recurring_interval=contract_template.recurring_interval
+    FROM
+        account_analytic_contract AS contract_template
+    WHERE
+        contract_template.id=contract_template_line.analytic_account_id
+    """,
+    )
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    """
+    set recurring_next_date to false for finished contract
+    """
+    _logger.info(">> Pre-Migration 12.0.2.0.0")
+    cr = env.cr
+    _set_finished_contract(cr)
+    _move_contract_recurrence_info_to_contract_line(cr)
+    _move_contract_template_recurrence_info_to_contract_template_line(cr)

contract/migrations/12.0.4.0.0/post-migration.py

@@ -0,0 +1,47 @@
+# Copyright 2019 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import logging
+
+from openupgradelib import openupgrade
+from odoo.tools import parse_version
+
+_logger = logging.getLogger(__name__)
+
+
+def _update_no_update_ir_cron(env):
+    # Update ir.cron
+    env.ref('contract.contract_cron_for_invoice').model_id = env.ref(
+        'contract.model_contract_contract'
+    )
+    env.ref('contract.contract_line_cron_for_renew').model_id = env.ref(
+        'contract.model_contract_line'
+    )
+    env.ref('contract.email_contract_template').model_id = env.ref(
+        'contract.model_contract_contract'
+    )
+
+
+def _init_last_date_invoiced_on_contract_lines(env):
+    _logger.info("init last_date_invoiced field for contract lines")
+    contract_lines = env["contract.line"].search(
+        [("recurring_next_date", "!=", False)]
+    )
+    contract_lines._init_last_date_invoiced()
+
+
+def _init_invoicing_partner_id_on_contracts(env):
+    _logger.info("Populate invoicing partner field on contracts")
+    contracts = env["contract.contract"].search([])
+    contracts._inverse_partner_id()
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    _update_no_update_ir_cron(env)
+    if parse_version(version) < parse_version('12.0.2.0.0'):
+        # We check the version here as this post-migration script was in
+        # 12.0.2.0.0 and already done for those who used the module when
+        # it was a PR
+        _init_last_date_invoiced_on_contract_lines(env)
+        _init_invoicing_partner_id_on_contracts(env)

contract/migrations/12.0.4.0.0/pre-migration.py

@@ -0,0 +1,113 @@
+# Copyright 2019 ACSONE SA/NV
+# Copyright 2019 Tecnativa 2019 - Pedro M. Baeza
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import logging
+
+from openupgradelib import openupgrade
+from psycopg2 import sql
+
+_logger = logging.getLogger(__name__)
+
+models_to_rename = [
+    # Contract Line Wizard
+    ('account.analytic.invoice.line.wizard', 'contract.line.wizard'),
+    # Abstract Contract
+    ('account.abstract.analytic.contract', 'contract.abstract.contract'),
+    # Abstract Contract Line
+    (
+        'account.abstract.analytic.contract.line',
+        'contract.abstract.contract.line',
+    ),
+    # Contract Line
+    ('account.analytic.invoice.line', 'contract.line'),
+    # Contract Template
+    ('account.analytic.contract', 'contract.template'),
+    # Contract Template Line
+    ('account.analytic.contract.line', 'contract.template.line'),
+]
+tables_to_rename = [
+    # Contract Line
+    ('account_analytic_invoice_line', 'contract_line'),
+    # Contract Template
+    ('account_analytic_contract', 'contract_template'),
+    # Contract Template Line
+    ('account_analytic_contract_line', 'contract_template_line'),
+]
+columns_to_copy = {
+    'contract_line': [
+        ('analytic_account_id', 'contract_id', None),
+    ],
+}
+xmlids_to_rename = [
+    (
+        'contract.account_analytic_cron_for_invoice',
+        'contract.contract_cron_for_invoice',
+    ),
+    (
+        'contract.account_analytic_contract_manager',
+        'contract.contract_template_manager',
+    ),
+    (
+        'contract.account_analytic_contract_user',
+        'contract.contract_template_user',
+    ),
+    (
+        'contract.account_analytic_invoice_line_manager',
+        'contract.contract_line_manager',
+    ),
+    (
+        'contract.account_analytic_invoice_line_user',
+        'contract.contract_line_user',
+    ),
+    (
+        'contract.account_analytic_contract_line_manager',
+        'contract.contract_template_line_manager',
+    ),
+    (
+        'contract.account_analytic_contract_line_user',
+        'contract.contract_template_line_user',
+    ),
+]
+
+
+def _get_contract_field_name(cr):
+    """
+    Contract field changed the name from analytic_account_id to contract_id
+    in 12.0.2.0.0. This method used to get the contract field name in
+    account_analytic_invoice_line"""
+    return (
+        'contract_id'
+        if openupgrade.column_exists(
+            cr, 'account_analytic_invoice_line', 'contract_id'
+        )
+        else 'analytic_account_id'
+    )
+
+
+def create_contract_records(cr):
+    contract_field_name = _get_contract_field_name(cr)
+    openupgrade.logged_query(
+        cr, """
+        CREATE TABLE contract_contract
+        (LIKE account_analytic_account INCLUDING ALL)""",
+    )
+    openupgrade.logged_query(
+        cr, sql.SQL("""
+        INSERT INTO contract_contract
+        SELECT * FROM account_analytic_account
+        WHERE id IN (SELECT DISTINCT {} FROM contract_line)
+        """).format(
+            sql.Identifier(contract_field_name),
+        ),
+    )
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    cr = env.cr
+    openupgrade.rename_models(cr, models_to_rename)
+    openupgrade.rename_tables(cr, tables_to_rename)
+    openupgrade.rename_xmlids(cr, xmlids_to_rename)
+    openupgrade.copy_columns(cr, columns_to_copy)
+    create_contract_records(cr)

contract/models/__init__.py

@@ -1,8 +1,11 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import account_analytic_contract
-from . import account_analytic_account
-from . import account_analytic_contract_line
-from . import account_analytic_invoice_line
+from . import abstract_contract
+from . import abstract_contract_line
+from . import contract_template
+from . import contract
+from . import contract_template_line
+from . import contract_line
 from . import account_invoice
+from . import account_invoice_line
 from . import res_partner