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