diff --git a/models/res_partner.py b/models/res_partner.py index 33807507d8391cafb7af5c73834cdb4bfaf14eea..df69e7d05f8e0337a22e00d57d559180a61772f8 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 56c682ab0ac3c7453d8bbb788c9a85d0f226802e..25c8bceca2dd52299ae1d0e3ac180a118ec9b3a4 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 e3e28e08cc5d3255760ba9b5559f0b5d386ed50d..2654e0d3279d9e4739a453106ba73feec9483046 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 b56a7d95796a350df241f45f157b7547e7b8c4fa..bf4042eb072c96e7a47bc9ac60a44e8dd195ce4c 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 ca4a97fc9621ed3a1343d9d15a078a71af882638..60ad8d065e8860d7f41721d653861de3e93569c9 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 cbcfa5de563431cba8c2c285124e38d7772a5656..e3656d7ee73ab48f07da72758622bc6beb7b0dd2 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>