From 674232d931b0624961ca6a5d4d0ecd002d6771ba Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@le-filament.com>
Date: Thu, 25 Jun 2020 13:01:42 +0200
Subject: [PATCH] [clean] v2 clean code
---
models/cgscop_incub_motif_abandon.py | 2 +-
models/cgscop_incub_parcours_preincub.py | 25 ++++------
models/cgscop_incub_prescription.py | 25 ++++------
models/cgscop_incub_statut_prefig.py | 25 ++++------
models/cgscop_incub_thematique.py | 25 ++++------
models/cgscop_incub_typologie_porteur.py | 25 ++++------
models/res_partner.py | 61 ++++++++----------------
7 files changed, 72 insertions(+), 116 deletions(-)
diff --git a/models/cgscop_incub_motif_abandon.py b/models/cgscop_incub_motif_abandon.py
index 9cfbf40..b5e241d 100644
--- a/models/cgscop_incub_motif_abandon.py
+++ b/models/cgscop_incub_motif_abandon.py
@@ -4,7 +4,7 @@
from odoo import models, fields
-class cgscop_incub_motif_abandon(models.Model):
+class CgscopIncubMotifAbandon(models.Model):
_name = 'cgscop_incub.motif_abandon'
_description = "Motifs abandon projet"
_order = 'sequence,id'
diff --git a/models/cgscop_incub_parcours_preincub.py b/models/cgscop_incub_parcours_preincub.py
index 34f3d3b..0d5e603 100644
--- a/models/cgscop_incub_parcours_preincub.py
+++ b/models/cgscop_incub_parcours_preincub.py
@@ -1,13 +1,16 @@
-from odoo import models, fields, api
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-class cgscop_incub_parcours_preincub(models.Model):
+from odoo import models, fields
+
+
+class CgscopIncubParcoursPreincub(models.Model):
_name = 'cgscop_incub.parcours_preincub'
_description = "Type de parcours pré-incubation"
_order = 'ur_id,sequence,id'
- _rec_name = 'name'
def _default_ur(self):
- return self.env['res.company']._ur_default_get()
+ return self.env['res.company']._ur_default_get()
ur_id = fields.Many2one(
'union.regionale',
@@ -15,14 +18,6 @@ class cgscop_incub_parcours_preincub(models.Model):
index=True,
on_delete='restrict',
default=_default_ur)
- sequence = fields.Integer(
- string='Sequence')
- name = fields.Char(
- string='Nom',
- required=True,
- index=True)
- active = fields.Boolean(
- string='Actif',
- default=True)
-
-
\ No newline at end of file
+ sequence = fields.Integer('Sequence')
+ name = fields.Char(string='Nom', required=True, index=True)
+ active = fields.Boolean(string='Actif', default=True)
diff --git a/models/cgscop_incub_prescription.py b/models/cgscop_incub_prescription.py
index 0afff7e..283ca56 100644
--- a/models/cgscop_incub_prescription.py
+++ b/models/cgscop_incub_prescription.py
@@ -1,19 +1,14 @@
-from odoo import models, fields, api
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-class cgscop_incub_prescription(models.Model):
+from odoo import models, fields
+
+
+class CgscopIncubPrescription(models.Model):
_name = 'cgscop_incub.prescription'
_description = "Canaux de prescription du projet"
- _order = 'sequence,id'
- _rec_name = 'name'
-
- sequence = fields.Integer(
- string='Sequence')
- name = fields.Char(
- string='Nom',
- required=True,
- index=True)
- active = fields.Boolean(
- string='Actif',
- default=True)
+ _order = 'sequence, id'
-
\ No newline at end of file
+ sequence = fields.Integer(string='Sequence')
+ name = fields.Char(string='Nom', required=True, index=True)
+ active = fields.Boolean(string='Actif', default=True)
diff --git a/models/cgscop_incub_statut_prefig.py b/models/cgscop_incub_statut_prefig.py
index 01b2419..96336f6 100644
--- a/models/cgscop_incub_statut_prefig.py
+++ b/models/cgscop_incub_statut_prefig.py
@@ -1,19 +1,14 @@
-from odoo import models, fields, api
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-class cgscop_incub_statut_prefig(models.Model):
+from odoo import models, fields
+
+
+class CgscopIncubStatutPrefig(models.Model):
_name = 'cgscop_incub.statut_prefig'
_description = "Statuts de préfiguration"
- _order = 'sequence,id'
- _rec_name = 'name'
-
- sequence = fields.Integer(
- string='Sequence')
- name = fields.Char(
- string='Nom',
- required=True,
- index=True)
- active = fields.Boolean(
- string='Actif',
- default=True)
+ _order = 'sequence, id'
-
\ No newline at end of file
+ sequence = fields.Integer(string='Sequence')
+ name = fields.Char(string='Nom', required=True, index=True)
+ active = fields.Boolean(string='Actif', default=True)
diff --git a/models/cgscop_incub_thematique.py b/models/cgscop_incub_thematique.py
index e75ed81..03cb960 100644
--- a/models/cgscop_incub_thematique.py
+++ b/models/cgscop_incub_thematique.py
@@ -1,19 +1,14 @@
-from odoo import models, fields, api
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-class cgscop_incub_thematique(models.Model):
+from odoo import models, fields
+
+
+class CgscopIncubThematique(models.Model):
_name = 'cgscop_incub.thematique'
_description = "Thematique du projet"
- _order = 'sequence,id'
- _rec_name = 'name'
-
- sequence = fields.Integer(
- string='Sequence')
- name = fields.Char(
- string='Nom',
- required=True,
- index=True)
- active = fields.Boolean(
- string='Actif',
- default=True)
+ _order = 'sequence, id'
-
\ No newline at end of file
+ sequence = fields.Integer(string='Sequence')
+ name = fields.Char(string='Nom', required=True, index=True)
+ active = fields.Boolean(string='Actif', default=True)
diff --git a/models/cgscop_incub_typologie_porteur.py b/models/cgscop_incub_typologie_porteur.py
index bcfeab5..11bd438 100644
--- a/models/cgscop_incub_typologie_porteur.py
+++ b/models/cgscop_incub_typologie_porteur.py
@@ -1,19 +1,14 @@
-from odoo import models, fields, api
+# © 2020 Le Filament (<http://www.le-filament.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-class cgscop_incub_typologie_porteur(models.Model):
+from odoo import models, fields
+
+
+class CgscopIncubTypologiePorteur(models.Model):
_name = 'cgscop_incub.typologie_porteur'
_description = "Typologie du porteur de projet"
- _order = 'sequence,id'
- _rec_name = 'name'
-
- sequence = fields.Integer(
- string='Sequence')
- name = fields.Char(
- string='Nom',
- required=True,
- index=True)
- active = fields.Boolean(
- string='Actif',
- default=True)
+ _order = 'sequence, id'
-
\ No newline at end of file
+ sequence = fields.Integer(string='Sequence')
+ name = fields.Char(string='Nom', required=True, index=True)
+ active = fields.Boolean(string='Actif', default=True)
diff --git a/models/res_partner.py b/models/res_partner.py
index f1b5511..b053ee6 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -70,125 +70,100 @@ class ScopPartner(models.Model):
string='Typologie du porteur de projet',
required=False,
track_visibility='onchange')
-
incub_projet_description = fields.Text(
string='Description du projet',
required=False,
track_visibility='onchange')
-
incub_nb_assos = fields.Integer(
string="Nombre d'associés au projet",
required=False,
track_visibility='onchange')
-
incub_sensibilite_coop = fields.Selection(
selection=PERCENT,
string='Sensibilté coopérative',
required=False,
track_visibility='onchange')
-
incub_percent_realisation = fields.Selection(
selection=PERCENT,
string='Probabilité de réalisation',
required=False,
track_visibility='onchange')
-
incub_fiche_entree = fields.Boolean(
string="Fiche d'entrée",
required=False,
track_visibility='onchange')
-
incub_fiche_sortie = fields.Boolean(
string="Fiche de sortie",
required=False,
track_visibility='onchange')
-
incub_convention = fields.Boolean(
string="Convention d'accompagnement",
required=False,
track_visibility='onchange')
-
incub_preincub_bypass = fields.Boolean(
string="Pas de pré-incubation",
required=False,
track_visibility='onchange')
-
incub_incubation_bypass = fields.Boolean(
string="Pas d'incubation",
required=False,
track_visibility='onchange')
-
incub_preincub_deb = fields.Date(
string="Date d'entrée pré-incubation",
track_visibility='onchange')
-
incub_preincub_fin = fields.Date(
string="Date de sortie pré-incubation",
track_visibility='onchange')
-
incub_parcours_preincub = fields.Many2one(
'cgscop_incub.parcours_preincub',
string='Parcours pré-incubation',
required=False,
track_visibility='onchange')
-
incub_statut_prefig = fields.Many2one(
'cgscop_incub.statut_prefig',
string='Statuts de préfiguration',
required=False,
track_visibility='onchange')
-
incub_prefig_date = fields.Date(
string="Date de création préfiguration",
track_visibility='onchange')
-
incub_inter_bilan_date = fields.Date(
string="Date de bilan intermédiaire",
track_visibility='onchange')
-
incub_incubation_deb = fields.Date(
string="Date d'entrée incubation",
track_visibility='onchange')
-
incub_incubation_fin = fields.Date(
string="Date de sortie incubation",
track_visibility='onchange')
-
incub_expertise_ids = fields.One2many(
comodel_name='cgscop_incub.expertise_projet',
inverse_name='partner_id',
string='Expertises')
-
incub_preincub_mt_exp = fields.Float(
string="Montant expertises pre-incub",
compute="_compute_preincub_montant",
store=True)
-
incub_incubation_mt_exp = fields.Float(
string="Montant expertises incubation",
compute="_compute_incubation_montant",
store=True)
-
incub_financement_ids = fields.One2many(
comodel_name='cgscop_incub.financement_projet',
inverse_name='partner_id',
string='Financements')
-
incub_financement_mt_dmd = fields.Float(
string="Financement montant demandé",
compute="_compute_financement_mt",
store=True)
-
incub_financement_mt_recu = fields.Float(
string="Financement montant recu",
compute="_compute_financement_mt",
store=True)
-
incub_sortie_notes = fields.Text(
string='Commentaires fin de projet',
required=False,
track_visibility='onchange')
-
incub_motif_abandon_id = fields.Many2one(
'cgscop_incub.motif_abandon',
string="Motif d'abandon",
@@ -202,23 +177,25 @@ class ScopPartner(models.Model):
@api.depends('incub_expertise_ids')
def _compute_preincub_montant(self):
for partner in self:
- xps = partner.incub_expertise_ids.search(
- [['partner_id', '=', partner.id], ['incub_phase', '=', '2_pre-incubation']],
- )
+ xps = partner.incub_expertise_ids.search([
+ ('partner_id', '=', partner.id),
+ ('incub_phase', '=', '2_pre-incubation')])
if xps:
for xp in xps:
- partner.incub_preincub_mt_exp = partner.incub_preincub_mt_exp + xp.montant
+ partner.incub_preincub_mt_exp = (
+ partner.incub_preincub_mt_exp + xp.montant)
@api.depends('incub_expertise_ids')
@api.multi
def _compute_incubation_montant(self):
for partner in self:
- xps = partner.incub_expertise_ids.search(
- [['partner_id', '=', partner.id], ['incub_phase', '=', '3_incubation']],
- )
+ xps = partner.incub_expertise_ids.search([
+ ('partner_id', '=', partner.id),
+ ('incub_phase', '=', '3_incubation')],)
if xps:
for xp in xps:
- partner.incub_incubation_mt_exp = partner.incub_incubation_mt_exp + xp.montant
+ partner.incub_incubation_mt_exp = (
+ partner.incub_incubation_mt_exp + xp.montant)
@api.depends('incub_financement_ids')
@api.multi
@@ -228,9 +205,10 @@ class ScopPartner(models.Model):
[['partner_id', '=', partner.id]])
if fis:
for fi in fis:
- partner.incub_financement_mt_dmd = partner.incub_financement_mt_dmd + fi.montant_dmd
- partner.incub_financement_mt_recu = partner.incub_financement_mt_recu + fi.montant_recu
-
+ partner.incub_financement_mt_dmd = (
+ partner.incub_financement_mt_dmd + fi.montant_dmd)
+ partner.incub_financement_mt_recu = (
+ partner.incub_financement_mt_recu + fi.montant_recu)
# ------------------------------------------------------
# Constains
@@ -241,7 +219,8 @@ class ScopPartner(models.Model):
for rec in self:
if rec.incub_preincub_fin and rec.incub_preincub_deb:
if rec.incub_preincub_fin < rec.incub_preincub_deb:
- raise ValidationError("La date de fin de pré-incubation doit être supérieure à la date de début")
+ raise ValidationError("La date de fin de pré-incubation \
+ doit être supérieure à la date de début")
@api.constrains('incub_incubation_deb', 'incub_incubation_fin')
@api.multi
@@ -249,15 +228,17 @@ class ScopPartner(models.Model):
for rec in self:
if rec.incub_incubation_fin and rec.incub_incubation_deb:
if rec.incub_incubation_fin < rec.incub_incubation_deb:
- raise ValidationError("La date de fin d'incubation doit être supérieure à la date de début")
+ raise ValidationError("La date de fin d'incubation doit \
+ être supérieure à la date de début")
@api.constrains('incub_preincub_fin', 'incub_incubation_deb')
@api.multi
def _incub_date_constrains(self):
for rec in self:
- if rec.incub_preincub_fin and rec.incub_incubation_deb:
+ if rec.incub_preincub_fin and rec.incub_incubation_deb:
if rec.incub_incubation_deb < rec.incub_preincub_fin:
- raise ValidationError("La date de début d'incubation doit être supérieure à la date de fin de pre-incubation")
+ raise ValidationError("La date de début d'incubation doit \
+ être supérieure à la date de fin de pre-incubation")
# ------------------------------------------------------
# Button
--
GitLab