From a7fe6eeb856b48fda058f3c087a8dd6dcd3a5998 Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Tue, 12 Apr 2022 10:17:00 +0200 Subject: [PATCH] [mig] Migration 13.0 --- .pylintrc | 2 +- .pylintrc-mandatory | 2 +- __manifest__.py | 2 +- models/account_move.py | 4 ++-- report/account_invoice_all.py | 8 ++++---- views/res_config_settings.xml | 5 +---- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.pylintrc b/.pylintrc index dc6270e..542c686 100644 --- a/.pylintrc +++ b/.pylintrc @@ -8,7 +8,7 @@ manifest_required_authors=Le Filament manifest_required_keys=license manifest_deprecated_keys=description,active license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=14.0 +valid_odoo_versions=13.0 [MESSAGES CONTROL] disable=all diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index 43ea239..74be5ff 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -8,7 +8,7 @@ manifest_required_authors=Le Filament manifest_required_keys=license manifest_deprecated_keys=description,active license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 -valid_odoo_versions=14.0 +valid_odoo_versions=13.0 [MESSAGES CONTROL] disable=all diff --git a/__manifest__.py b/__manifest__.py index 21be18c..737f661 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -6,7 +6,7 @@ "summary": "Gestion de la Facturation Cg Scop", "author": "Le Filament", "website": "https://www.le-filament.com", - "version": "14.0.1.0.0", + "version": "13.0.1.0.0", "license": "AGPL-3", "depends": ["account", "cgscop_partner", "account_financial_report"], "data": [ diff --git a/models/account_move.py b/models/account_move.py index 0a90852..773c29b 100644 --- a/models/account_move.py +++ b/models/account_move.py @@ -10,7 +10,7 @@ class ScopAccountMove(models.Model): move_line_payment_ids = fields.One2many( comodel_name="account.move.line", string="Paiements", - compute="_compute_move_line_payment_ids" + compute="_compute_move_line_payment_ids", ) def _compute_move_line_payment_ids(self): @@ -18,7 +18,7 @@ class ScopAccountMove(models.Model): values = self._get_reconciled_info_JSON_values() aml = [] for value in values: - aml.append(value.get('payment_id')) + aml.append(value.get("payment_id")) self.move_line_payment_ids = self.line_ids.browse(aml) @api.onchange("partner_id") diff --git a/report/account_invoice_all.py b/report/account_invoice_all.py index 3480db7..9ade28d 100644 --- a/report/account_invoice_all.py +++ b/report/account_invoice_all.py @@ -73,7 +73,7 @@ class AccountInvoiceReport(models.Model): "amount_residual_signed", "payment_state", "state", - "move_type", + "type", "invoice_user_id", ], } @@ -120,13 +120,13 @@ class AccountInvoiceReport(models.Model): amount_untaxed_signed, amount_total_signed, amount_residual_signed, - move_type, + type as move_type, state, - payment_state + invoice_payment_state as payment_state FROM account_move WHERE - move_type in ('out_invoice', 'out_refund') + type in ('out_invoice', 'out_refund') AND state = 'posted' """ return select_str diff --git a/views/res_config_settings.xml b/views/res_config_settings.xml index 7e16ffc..279d2f5 100644 --- a/views/res_config_settings.xml +++ b/views/res_config_settings.xml @@ -8,10 +8,7 @@ <field name="priority" eval="25" /> <field name="inherit_id" ref="account.res_config_settings_view_form" /> <field name="arch" type="xml"> - <xpath - expr="//div[@name='fiscal_localization_setting_container']" - position="after" - > + <xpath expr="//div[@id='invoicing_settings']" position="after"> <h2>Configuration Union Régionales</h2> <div class="row mt16 o_settings_container" -- GitLab