Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • lefilament/cgscop/cgscop_partner
  • hsilvant/cgscop_partner
2 results
Select Git revision
Show changes
Commits on Source (5)
...@@ -542,7 +542,7 @@ class ScopPartner(models.Model): ...@@ -542,7 +542,7 @@ class ScopPartner(models.Model):
"scop.action.te", "scop.action.te",
column1="partner_id", column1="partner_id",
column2="action_id", column2="action_id",
string="Actions transition éco.", string="Expertises transition éco.",
) )
is_rse = fields.Boolean( is_rse = fields.Boolean(
string="Engagement TE", compute="_compute_is_rse", store=True, default=False string="Engagement TE", compute="_compute_is_rse", store=True, default=False
...@@ -1212,11 +1212,11 @@ class ScopPartner(models.Model): ...@@ -1212,11 +1212,11 @@ class ScopPartner(models.Model):
) )
def _compute_last_effective(self): def _compute_last_effective(self):
for partner in self: for partner in self:
lm = partner.staff_ids.sorted(key="effective_date", reverse=True) lines = partner._get_staff_lines()
if lm: if lines:
partner.staff_last = lm[0].staff_count partner.staff_last = lines[0].staff_count
partner.staff_shareholder_last = lm[0].staff_shareholder_count partner.staff_shareholder_last = lines[0].staff_shareholder_count
partner.staff_last_date = lm[0].effective_date partner.staff_last_date = lines[0].effective_date
def _compute_segment_nb(self): def _compute_segment_nb(self):
for partner in self: for partner in self:
...@@ -1256,8 +1256,8 @@ class ScopPartner(models.Model): ...@@ -1256,8 +1256,8 @@ class ScopPartner(models.Model):
else: else:
partner.is_administrative = False partner.is_administrative = False
@api.depends("revision_next_exercice", @api.depends(
"revision_same_exercice", "revision_next_exercice", "revision_same_exercice",
) )
def _compute_revision_next_year(self): def _compute_revision_next_year(self):
for partner in self: for partner in self:
...@@ -1741,6 +1741,10 @@ class ScopPartner(models.Model): ...@@ -1741,6 +1741,10 @@ class ScopPartner(models.Model):
cedex = f" CEDEX {self.postal_cedex}" if self.postal_cedex else "" cedex = f" CEDEX {self.postal_cedex}" if self.postal_cedex else ""
return f"{street_address}\n{city_address}{cedex}" return f"{street_address}\n{city_address}{cedex}"
def _get_staff_lines(self):
self.ensure_one()
return self.staff_ids.sorted(key="effective_date", reverse=True)
# ------------------------------------------------------ # ------------------------------------------------------
# CRON function # CRON function
# ------------------------------------------------------ # ------------------------------------------------------
......
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
from odoo import fields, models from odoo import fields, models
class ScopActionTe(models.Model): class ScopActionTe(models.Model):
_name = "scop.action.te" _name = "scop.action.te"
_description = "Actions transition écologique" _description = "Expertises transition écologique"
_order = "name" _order = "name"
name = fields.Char( name = fields.Char(
......
...@@ -78,7 +78,7 @@ class ScopPartnerStaff(models.Model): ...@@ -78,7 +78,7 @@ class ScopPartnerStaff(models.Model):
) )
effective_date = fields.Date( effective_date = fields.Date(
string="Date", string="Date",
default=fields.Date.today(), default=lambda self: fields.Date.today(),
required=True, required=True,
) )
staff_count = fields.Integer( staff_count = fields.Integer(
......
...@@ -21,7 +21,7 @@ class ScopPeriod(models.Model): ...@@ -21,7 +21,7 @@ class ScopPeriod(models.Model):
start = fields.Date( start = fields.Date(
"Début de validité", "Début de validité",
required=True, required=True,
default=fields.Date.today(), default=lambda self: fields.Date.today(),
index=True, index=True,
) )
end = fields.Date("Fin de validité") end = fields.Date("Fin de validité")
......
...@@ -1120,6 +1120,10 @@ ...@@ -1120,6 +1120,10 @@
options="{'no_open': True, 'no_create': True}" options="{'no_open': True, 'no_create': True}"
/> />
<field name="secteur_id" /> <field name="secteur_id" />
<field
name="social_object"
attrs="{'invisible': [('project_status', '=', '4_suivi')]}"
/>
<field <field
name="activity_desc" name="activity_desc"
help="L'activité renseignée ici apparaitra sur l'annuaire des coopératives." help="L'activité renseignée ici apparaitra sur l'annuaire des coopératives."
...@@ -1499,6 +1503,7 @@ ...@@ -1499,6 +1503,7 @@
<group> <group>
<field <field
name="social_object" name="social_object"
attrs="{'invisible': [('project_status', '!=', '4_suivi')]}"
/> />
</group> </group>
</group> </group>
...@@ -1753,7 +1758,7 @@ ...@@ -1753,7 +1758,7 @@
</page> </page>
<page <page
name='scop_rse' name='scop_rse'
string="Actions Transition éco." string="Transition éco."
attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', 'not in', ['4_suivi', '6_decede'])]}" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', 'not in', ['4_suivi', '6_decede'])]}"
> >
<group> <group>
......
...@@ -126,7 +126,7 @@ class ScopPeriodWizard(models.TransientModel): ...@@ -126,7 +126,7 @@ class ScopPeriodWizard(models.TransientModel):
comments = fields.Text("Commentaires") comments = fields.Text("Commentaires")
# Fields new period # Fields new period
start = fields.Date("Début de validité", required=True, default=fields.Date.today()) start = fields.Date("Début de validité", required=True, default=lambda self: fields.Date.today())
name = fields.Char("Raison Sociale", required=True, default=_default_name) name = fields.Char("Raison Sociale", required=True, default=_default_name)
cooperative_form_id = fields.Many2one( cooperative_form_id = fields.Many2one(
"res.partner.cooperative.form", "res.partner.cooperative.form",
......
...@@ -33,7 +33,7 @@ class ScopDecesWizard(models.TransientModel): ...@@ -33,7 +33,7 @@ class ScopDecesWizard(models.TransientModel):
# Fields previous period # Fields previous period
last_period_id = fields.Integer(default=_default_last_period_id) last_period_id = fields.Integer(default=_default_last_period_id)
end = fields.Date("Fin de validité", required=True, default=fields.Date.today()) end = fields.Date("Fin de validité", required=True, default=lambda self: fields.Date.today())
dissolution_reason_id = fields.Many2one( dissolution_reason_id = fields.Many2one(
"res.partner.dissolution.reason", "res.partner.dissolution.reason",
string="Motif Décès", string="Motif Décès",
......
...@@ -21,7 +21,7 @@ class ScopMembershipOutWizard(models.TransientModel): ...@@ -21,7 +21,7 @@ class ScopMembershipOutWizard(models.TransientModel):
type_id = fields.Many2one( type_id = fields.Many2one(
"scop.membership.type", string="Type d'adhésion", ondelete="restrict" "scop.membership.type", string="Type d'adhésion", ondelete="restrict"
) )
end = fields.Date("Fin d'adhésion", required=True, default=fields.Date.today()) end = fields.Date("Fin d'adhésion", required=True, default=lambda self: fields.Date.today())
end_reason_id = fields.Many2one( end_reason_id = fields.Many2one(
"scop.membership.reason.end", "scop.membership.reason.end",
string="Motif de fin d’adhésion", string="Motif de fin d’adhésion",
......
...@@ -27,7 +27,7 @@ class ScopMembershipPeriodWizard(models.TransientModel): ...@@ -27,7 +27,7 @@ class ScopMembershipPeriodWizard(models.TransientModel):
ondelete="restrict", ondelete="restrict",
required=True, required=True,
) )
start = fields.Date("Début d’adhésion", required=True, default=fields.Date.today()) start = fields.Date("Début d’adhésion", required=True, default=lambda self: fields.Date.today())
number = fields.Char("No adhérent", required=True, default=_default_number) number = fields.Char("No adhérent", required=True, default=_default_number)
note = fields.Text("Commentaires") note = fields.Text("Commentaires")
......
...@@ -125,7 +125,7 @@ class ScopPeriodWizard(models.TransientModel): ...@@ -125,7 +125,7 @@ class ScopPeriodWizard(models.TransientModel):
comments = fields.Text("Commentaires") comments = fields.Text("Commentaires")
# Fields new period # Fields new period
start = fields.Date("Début de validité", required=True, default=fields.Date.today()) start = fields.Date("Début de validité", required=True, default=lambda self: fields.Date.today())
name = fields.Char("Raison Sociale", required=True, default=_default_name) name = fields.Char("Raison Sociale", required=True, default=_default_name)
cooperative_form_id = fields.Many2one( cooperative_form_id = fields.Many2one(
"res.partner.cooperative.form", "res.partner.cooperative.form",
......