From 5cd1ffb027c1f7add9e560ab86179d879e6460ce Mon Sep 17 00:00:00 2001 From: benjamin <benjamin@le-filament.com> Date: Mon, 11 Mar 2024 10:35:06 +0100 Subject: [PATCH] [CLEAN] pre-commit --- models/scop_liste_ministere.py | 16 +++++++++++----- security/ir.model.access.csv | 2 +- wizard/lm_change_year_wizard.py | 10 ++++++---- wizard/lm_change_year_wizard.xml | 10 +++++----- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/models/scop_liste_ministere.py b/models/scop_liste_ministere.py index e0821ec..370b481 100644 --- a/models/scop_liste_ministere.py +++ b/models/scop_liste_ministere.py @@ -1446,7 +1446,7 @@ class ScopListeMinistere(models.Model): raise UserError(_("Email manquant. Ce dossier ne peut être publié.")) template_id = self.env.ref( "cgscop_liste_ministere.email_template_liste_ministere_publish", - raise_if_not_found=True + raise_if_not_found=True, ) if not self.status == "1_ouvert": raise UserError(_("Ce dossier est déjà publié ou validé.")) @@ -1455,7 +1455,9 @@ class ScopListeMinistere(models.Model): self.update({"status": "2_publie"}) if composer: - return self.with_context(lm_publish_action=True).action_open_mail(template_id) + return self.with_context(lm_publish_action=True).action_open_mail( + template_id + ) else: template_id.send_mail(self.id) @@ -1477,7 +1479,8 @@ class ScopListeMinistere(models.Model): if lm_ids: for lm in lm_ids: lm.with_delay( - description=("Publication LM : %s" % lm.name))._publish_extranet() + description=("Publication LM : %s" % lm.name) + )._publish_extranet() else: return { "type": "ir.actions.act_window.message", @@ -1757,7 +1760,8 @@ class ScopListeMinistere(models.Model): lm.effective_date = lm.partner_id.date_1st_sign else: lm.effective_date = fields.Date.end_of( - date(int(lm.year) - 1, int(lm.partner_id.closeout_month), 1) + date(int(lm.year) - 1, int(lm.partner_id.closeout_month), 1), + "month", ) staff_values = { "partner_id": lm.partner_id.id, @@ -1801,7 +1805,9 @@ class ScopListeMinistere(models.Model): previous_lm = self.get_previous_lm(lm_id) if len(previous_lm) == 1: for director_previous_lm in previous_lm.director_ids: - if director_previous_lm.partner_id not in self.director_ids.mapped("partner_id"): + if director_previous_lm.partner_id not in self.director_ids.mapped( + "partner_id" + ): director_previous_lm.copy(default={"liste_ministere_id": lm_id}) elif self.partner_id.director_ids: for director in self.partner_id.director_ids: diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 4fe5cfd..27b9411 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -37,4 +37,4 @@ cg_access_res_partner_ministere,access_res_partner_ministere,model_res_partner_m admin_access_res_partner_ministere,admin_res_partner_ministere,model_res_partner_ministere,cgscop_partner.group_cg_administrator,1,1,1,1 cg_access_res_partner_ministere_contact,access_res_partner_ministere_contact,model_res_partner_ministere_contact,cgscop_partner.group_cg_administrative,1,1,1,1 admin_access_res_partner_ministere_contact,admin_res_partner_ministere_contact,model_res_partner_ministere_contact,cgscop_partner.group_cg_administrator,1,1,1,1 -cg_access_liste_ministere_year_wizard,access_liste_ministere_year_wizard,model_scop_liste_ministere_change_year_wizard,cgscop_partner.group_cg_administrative,1,1,1,1 \ No newline at end of file +cg_access_liste_ministere_year_wizard,access_liste_ministere_year_wizard,model_scop_liste_ministere_change_year_wizard,cgscop_partner.group_cg_administrative,1,1,1,1 diff --git a/wizard/lm_change_year_wizard.py b/wizard/lm_change_year_wizard.py index 56ba9f7..605205b 100644 --- a/wizard/lm_change_year_wizard.py +++ b/wizard/lm_change_year_wizard.py @@ -1,9 +1,8 @@ # © 2022 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from datetime import datetime -from odoo import _, api, fields, models +from odoo import api, fields, models class ChangeYear(models.TransientModel): @@ -19,8 +18,11 @@ class ChangeYear(models.TransientModel): @api.model def _default_year(self): - return self.env["scop.liste.ministere"].browse( - self.env.context.get("active_id")).year + return ( + self.env["scop.liste.ministere"] + .browse(self.env.context.get("active_id")) + .year + ) def _get_selection_year(self): years = [ diff --git a/wizard/lm_change_year_wizard.xml b/wizard/lm_change_year_wizard.xml index 818fb8c..b03a142 100644 --- a/wizard/lm_change_year_wizard.xml +++ b/wizard/lm_change_year_wizard.xml @@ -4,7 +4,10 @@ <odoo> <data> - <record model="ir.ui.view" id="scop_liste_ministere_change_year_wizard_form_view"> + <record + model="ir.ui.view" + id="scop_liste_ministere_change_year_wizard_form_view" + > <field name="name">scop.liste.ministere.change.year.wizard.form</field> <field name="model">scop.liste.ministere.change.year.wizard</field> <field name="arch" type="xml"> @@ -32,10 +35,7 @@ </field> </record> - <record - model="ir.actions.act_window" - id="action_change_year_wizard" - > + <record model="ir.actions.act_window" id="action_change_year_wizard"> <field name="name">Modification de l'année</field> <field name="res_model">scop.liste.ministere.change.year.wizard</field> <field name="view_mode">form</field> -- GitLab