[IMP] : black, isort, prettier

This commit is contained in:
Pedro M. Baeza
2020-07-13 18:28:03 +02:00
parent afd12bafd1
commit ac2e2b15bc
50 changed files with 2714 additions and 2811 deletions

View File

@@ -4,6 +4,7 @@
import logging
from openupgradelib import openupgrade
from odoo.tools import parse_version
_logger = logging.getLogger(__name__)
@@ -11,22 +12,20 @@ _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_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.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'
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 = env["contract.line"].search([("recurring_next_date", "!=", False)])
contract_lines._init_last_date_invoiced()
@@ -43,7 +42,8 @@ def assign_salesman(env):
will have admin as responsible.
"""
openupgrade.logged_query(
env.cr, """
env.cr,
"""
UPDATE contract_contract cc
SET user_id = rp.user_id
FROM res_partner rp
@@ -54,7 +54,7 @@ def assign_salesman(env):
@openupgrade.migrate()
def migrate(env, version):
_update_no_update_ir_cron(env)
if parse_version(version) < parse_version('12.0.2.0.0'):
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

View File

@@ -11,62 +11,51 @@ _logger = logging.getLogger(__name__)
models_to_rename = [
# Contract Line Wizard
('account.analytic.invoice.line.wizard', 'contract.line.wizard'),
("account.analytic.invoice.line.wizard", "contract.line.wizard"),
# Abstract Contract
('account.abstract.analytic.contract', 'contract.abstract.contract'),
("account.abstract.analytic.contract", "contract.abstract.contract"),
# Abstract Contract Line
(
'account.abstract.analytic.contract.line',
'contract.abstract.contract.line',
),
("account.abstract.analytic.contract.line", "contract.abstract.contract.line",),
# Contract Line
('account.analytic.invoice.line', 'contract.line'),
("account.analytic.invoice.line", "contract.line"),
# Contract Template
('account.analytic.contract', 'contract.template'),
("account.analytic.contract", "contract.template"),
# Contract Template Line
('account.analytic.contract.line', 'contract.template.line'),
("account.analytic.contract.line", "contract.template.line"),
]
tables_to_rename = [
# Contract Line
('account_analytic_invoice_line', 'contract_line'),
("account_analytic_invoice_line", "contract_line"),
# Contract Template
('account_analytic_contract', 'contract_template'),
("account_analytic_contract", "contract_template"),
# Contract Template Line
('account_analytic_contract_line', 'contract_template_line'),
("account_analytic_contract_line", "contract_template_line"),
]
columns_to_copy = {
'contract_line': [
('analytic_account_id', 'contract_id', None),
],
"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_cron_for_invoice",
"contract.contract_cron_for_invoice",
),
(
'contract.account_analytic_contract_manager',
'contract.contract_template_manager',
"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_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',
"contract.account_analytic_contract_line_user",
"contract.contract_template_line_user",
),
]
@@ -77,33 +66,34 @@ def _get_contract_field_name(cr):
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'
"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, """
cr,
"""
CREATE TABLE contract_contract
(LIKE account_analytic_account INCLUDING ALL)""",
)
openupgrade.logged_query(
cr, sql.SQL("""
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),
),
"""
).format(sql.Identifier(contract_field_name),),
)
# Deactivate disabled contracts
openupgrade.logged_query(
cr, """UPDATE contract_contract cc
cr,
"""UPDATE contract_contract cc
SET active = False
FROM account_analytic_account aaa
WHERE aaa.id = cc.id
@@ -111,24 +101,31 @@ def create_contract_records(cr):
)
# Handle id sequence
cr.execute("CREATE SEQUENCE IF NOT EXISTS contract_contract_id_seq")
cr.execute("SELECT setval('contract_contract_id_seq', "
"(SELECT MAX(id) FROM contract_contract))")
cr.execute("ALTER TABLE contract_contract ALTER id "
"SET DEFAULT NEXTVAL('contract_contract_id_seq')")
cr.execute(
"SELECT setval('contract_contract_id_seq', "
"(SELECT MAX(id) FROM contract_contract))"
)
cr.execute(
"ALTER TABLE contract_contract ALTER id "
"SET DEFAULT NEXTVAL('contract_contract_id_seq')"
)
# Move common stuff from one table to the other
mapping = [
('ir_attachment', 'res_model', 'res_id'),
('mail_message', 'model', 'res_id'),
('mail_activity', 'res_model', 'res_id'),
('mail_followers', 'res_model', 'res_id'),
("ir_attachment", "res_model", "res_id"),
("mail_message", "model", "res_id"),
("mail_activity", "res_model", "res_id"),
("mail_followers", "res_model", "res_id"),
]
for table, model_column, id_column in mapping:
openupgrade.logged_query(
cr, sql.SQL("""
cr,
sql.SQL(
"""
UPDATE {table} SET {model_column}='contract.contract'
WHERE {model_column}='account.analytic.account'
AND {id_column} IN (SELECT DISTINCT {col} FROM contract_line)
""").format(
"""
).format(
table=sql.Identifier(table),
model_column=sql.Identifier(model_column),
id_column=sql.Identifier(id_column),