From a2ae71b1211aa02f35cb29e2b7c300650840111f Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@le-filament.com>
Date: Sun, 22 Mar 2020 12:09:02 +0100
Subject: [PATCH] [cgscop #162] suppression du champs state dans
membership.period
---
models/res_partner.py | 8 ++++----
models/scop_membership.py | 6 ------
views/res_partner.xml | 1 -
views/scop_period_views.xml | 1 -
wizard/scop_membership_period_wizard.py | 7 -------
wizard/scop_membership_period_wizard.xml | 1 -
6 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/models/res_partner.py b/models/res_partner.py
index 3380750..df69e7d 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -625,8 +625,9 @@ class ScopPartner(models.Model):
and parent.cooperative_form_id.name == "SCIC"):
partner.contact_legality = 'customer'
- @api.depends('membership_period_ids', 'membership_period_ids.state',
- 'membership_period_ids.end_reason_id')
+ @api.depends('membership_period_ids',
+ 'membership_period_ids.end_reason_id',
+ 'membership_period_ids.end')
@api.multi
def _compute_membership(self):
for partner in self:
@@ -638,8 +639,7 @@ class ScopPartner(models.Model):
limit=1,
order='start desc')
if (last_membership_period
- and not last_membership_period.end_reason_id
- and last_membership_period.state == 'done'):
+ and not last_membership_period.end):
partner.membership_status = "member"
partner.member_number = last_membership_period.number
elif (last_membership_period
diff --git a/models/scop_membership.py b/models/scop_membership.py
index 56c682a..25c8bce 100644
--- a/models/scop_membership.py
+++ b/models/scop_membership.py
@@ -26,12 +26,6 @@ class ScopMembershipPeriod(models.Model):
string='Motif de fin d’adhésion',
ondelete='restrict')
number = fields.Char("No adhérent", index=True)
- state = fields.Selection(
- [("none", "Non Adhérent"),
- ("ongoing", "Traitement de l'adhésion"),
- ("approval", "Attente d'approbation"),
- ("done", "Adhérent")],
- string="Statut adhésion", default="none")
note = fields.Text('Commentaires')
diff --git a/views/res_partner.xml b/views/res_partner.xml
index e3e28e0..2654e0d 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -709,7 +709,6 @@
<field name="start"/>
<field name="type_id"/>
<field name="number"/>
- <field name="state"/>
<field name="end"/>
<field name="end_reason_id"/>
<field name="note"/>
diff --git a/views/scop_period_views.xml b/views/scop_period_views.xml
index b56a7d9..bf4042e 100644
--- a/views/scop_period_views.xml
+++ b/views/scop_period_views.xml
@@ -49,7 +49,6 @@
<field name="start"/>
<field name="type_id" options="{'no_open': True, 'no_create': True}"/>
<field name="number"/>
- <field name="state"/>
<field name="end"/>
<field name="end_reason_id" options="{'no_open': True, 'no_create': True}"/>
<field name="note"/>
diff --git a/wizard/scop_membership_period_wizard.py b/wizard/scop_membership_period_wizard.py
index ca4a97f..60ad8d0 100644
--- a/wizard/scop_membership_period_wizard.py
+++ b/wizard/scop_membership_period_wizard.py
@@ -22,12 +22,6 @@ class ScopMembershipPeriodWizard(models.TransientModel):
start = fields.Date('Début d’adhésion', required=True,
default=fields.Date.today())
number = fields.Char("No adhérent", required=True)
- state = fields.Selection(
- [("none", "Non Adhérent"),
- ("ongoing", "Traitement de l'adhésion"),
- ("approval", "Attente d'approbation"),
- ("done", "Adhérent")],
- string="Statut adhésion", default="none", required=True)
note = fields.Text('Commentaires')
@api.multi
@@ -46,6 +40,5 @@ class ScopMembershipPeriodWizard(models.TransientModel):
'type_id': period.type_id.id,
'start': period.start,
'number': period.number,
- 'state': period.state,
'note': period.note
})
diff --git a/wizard/scop_membership_period_wizard.xml b/wizard/scop_membership_period_wizard.xml
index cbcfa5d..e3656d7 100644
--- a/wizard/scop_membership_period_wizard.xml
+++ b/wizard/scop_membership_period_wizard.xml
@@ -10,7 +10,6 @@
<field name="type_id" options="{'no_open': True, 'no_create': True}"/>
<field name="start"/>
<field name="number"/>
- <field name="state"/>
<field name="note"/>
</group>
<footer>
--
GitLab