Skip to content
Extraits de code Groupes Projets
Valider 9330d94b rédigé par jordan's avatar jordan
Parcourir les fichiers

[update] prepare module to use exos

parent 04e085d5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -14,12 +14,12 @@ class ScopInstance(models.Model): ...@@ -14,12 +14,12 @@ class ScopInstance(models.Model):
# Fields declaration # Fields declaration
# ------------------------------------------------------ # ------------------------------------------------------
name = fields.Char('Instance', compute='_compute_name') name = fields.Char('Instance', compute='_compute_name')
type_id = fields.Many2one(
comodel_name='scop.instance.type',
string='Type')
date = fields.Datetime('Date', required=True) date = fields.Datetime('Date', required=True)
date_start = fields.Datetime('Début', compute='_compute_dates', store=True) date_start = fields.Datetime('Début', compute='_compute_dates', store=True)
date_stop = fields.Datetime('Fin', compute='_compute_dates', store=True) date_stop = fields.Datetime('Fin', compute='_compute_dates', store=True)
# Adhésions
is_type_membership = fields.Boolean("Adhésions")
date_membership = fields.Date( date_membership = fields.Date(
string="Date d'adhésion statistique", string="Date d'adhésion statistique",
) )
...@@ -38,19 +38,16 @@ class ScopInstance(models.Model): ...@@ -38,19 +38,16 @@ class ScopInstance(models.Model):
compute='_compute_emails' compute='_compute_emails'
) )
# Exonérations
is_type_exo = fields.Boolean("Exonérations")
# ------------------------------------------------------ # ------------------------------------------------------
# Computed fields / Search Fields # Computed fields / Search Fields
# ------------------------------------------------------ # ------------------------------------------------------
@api.multi @api.multi
def _compute_name(self): def _compute_name(self):
for r in self: for r in self:
r.name = str() r.name = "Instance - " + r.date.strftime("%d/%m/%Y")
if r.type_id:
r.name = r.type_id.name + " - "
else:
r.name = "Instance - "
if r.date:
r.name += r.date.strftime("%d/%m/%Y")
@api.multi @api.multi
def _compute_partners_count(self): def _compute_partners_count(self):
......
...@@ -10,27 +10,40 @@ ...@@ -10,27 +10,40 @@
<field name="model">scop.instance</field> <field name="model">scop.instance</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<sheet>
<div class="oe_title">
<h1>
<field name="name" placeholder="Title"/>
</h1>
</div>
<group>
<group>
<field name="date" widget="date"/>
<field name="comments"/>
</group>
<group name="instance_type">
<field name="is_type_membership" widget="boolean_toggle"/>
<field name="is_type_exo" widget="boolean_toggle"/>
</group>
</group>
<notebook>
<page name="membership" string="Adhésion" attrs="{'invisible':[('is_type_membership','=',False)]}">
<header> <header>
<button name="action_add_coop" type="object" <button name="action_add_coop" type="object"
string="Associer des coopératives" string="Associer des coopératives"
class="btn-primary"/> class="btn-primary"/>
<button name="create_report_instance_adhesion" type="object" <button name="create_report_instance_adhesion" type="object"
string="États préparatoires" string="États préparatoires"
class="btn-info" class="btn-info"/>
attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>
<button name="scop_valid_cg_mass" type="object" <button name="scop_valid_cg_mass" type="object"
string="Valider les coops" string="Valider les coops"
class="btn-info" class="btn-info"/>
attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>
<button name="create_report_adhesion_all" type="object" <button name="create_report_adhesion_all" type="object"
string="Générer tous les courriers" class="btn-info" string="Générer tous les courriers" class="btn-info"/>
attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>
<button name="create_report_adhesion_per_ur" type="object" <button name="create_report_adhesion_per_ur" type="object"
string="Générer les courriers par UR" class="btn-info" string="Générer les courriers par UR" class="btn-info"/>
attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>
<button name="action_send_mail_adhesion" type="object" <button name="action_send_mail_adhesion" type="object"
string="Envoyer les mails d'adhésion" class="btn-info" string="Envoyer les mails d'adhésion" class="btn-info"/>
attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>
<!-- <button name="temp_scop_push_invoices" type="object"--> <!-- <button name="temp_scop_push_invoices" type="object"-->
<!-- string="Déposer les factures sur Alfresco"--> <!-- string="Déposer les factures sur Alfresco"-->
<!-- groups="base.group_no_one"--> <!-- groups="base.group_no_one"-->
...@@ -42,7 +55,6 @@ ...@@ -42,7 +55,6 @@
<!-- class="btn-warning"--> <!-- class="btn-warning"-->
<!-- attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>--> <!-- attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>-->
</header> </header>
<sheet>
<div class="oe_button_box" name="button_box"> <div class="oe_button_box" name="button_box">
<button name="action_show_coop" type="object" <button name="action_show_coop" type="object"
class="oe_stat_button" icon="fa-address-card-o"> class="oe_stat_button" icon="fa-address-card-o">
...@@ -52,27 +64,11 @@ ...@@ -52,27 +64,11 @@
<field name="email_count" widget="statinfo" string="Mails"/> <field name="email_count" widget="statinfo" string="Mails"/>
</button> </button>
</div> </div>
<div class="oe_title">
<h1>
<field name="name" placeholder="Title"/>
</h1>
</div>
<group>
<group> <group>
<field name="type_id" options="{'no_create': True, 'no_edit': True, 'no_open': True}"/> <field name="date_membership" required="1"/>
<field name="date" widget="date"/>
<field name="date_membership"
attrs="{'invisible':[('type_id','!=', %(cgscop_instance.type_adhesion)d)],'required':[('type_id','=',%(cgscop_instance.type_adhesion)d)]}"/>
<button name="update_membership_date" type="object" <button name="update_membership_date" type="object"
string="Mettre à jour la date d'adhésion statistique" class="btn-outline-dark btn-sm" string="Mettre à jour la date d'adhésion statistique" class="btn-outline-dark btn-sm"/>
attrs="{'invisible':[('type_id','!=',%(cgscop_instance.type_adhesion)d)]}"/>
</group> </group>
<group>
<field name="comments"/>
</group>
</group>
<h5>Coopératives</h5>
<field name="instance_partner_ids"> <field name="instance_partner_ids">
<tree string="Coopératives" create="false" <tree string="Coopératives" create="false"
decoration-danger="state == 'negative'" decoration-danger="state == 'negative'"
...@@ -94,6 +90,11 @@ ...@@ -94,6 +90,11 @@
string="Détacher la coop" icon="fa-times"/> string="Détacher la coop" icon="fa-times"/>
</tree> </tree>
</field> </field>
</page>
<page name="exoneration" string="Exonérations" attrs="{'invisible':[('is_type_exo','=',False)]}">
</page>
</notebook>
</sheet> </sheet>
</form> </form>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter