diff --git a/.pylintrc b/.pylintrc index dc6270e15be0c08da00e768a570f27c785d8630e..542c686d3824ecbc48c169d1bf3b146afb2acb70 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 43ea23947166ff8080219007cfae43ec54a28f8e..74be5fff287bdab1da64e3e5a2ad43a99999e1cc 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 21be18c43778248d56c4c4a1b3614fdbbaa2121f..737f661d2db347fe48815285259dd7ce0d43088d 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 0a9085259412d6ba75cea11858a0e158c5d7b2f2..773c29b6c04fe26da0ac9a60bef7c9f0a311b4a1 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 3480db7534c56bd174c1a4dd3b6fc8da3a425aa7..9ade28d969323d1495ac43018161c4a48d7c3aeb 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 7e16ffc2aac9c366e029f9ff048c184b85e083dc..279d2f5b34235f4c12b7b6fd7eb0a8d7ce221136 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"