Skip to content
Extraits de code Groupes Projets
Valider bc6cc693 rédigé par Benjamin's avatar Benjamin
Parcourir les fichiers

fix bug adhesion

parent d2db653b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -638,7 +638,8 @@ class ScopPartner(models.Model): ...@@ -638,7 +638,8 @@ class ScopPartner(models.Model):
and parent.cooperative_form_id.name == "SCIC"): and parent.cooperative_form_id.name == "SCIC"):
partner.contact_legality = 'customer' partner.contact_legality = 'customer'
@api.model @api.depends('membership_period_ids', 'membership_period_ids.state')
@api.multi
def _compute_membership(self): def _compute_membership(self):
for partner in self: for partner in self:
type_cg = self.env['scop.membership.type'].search([ type_cg = self.env['scop.membership.type'].search([
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
<page name="contacts" string="Contacts &amp; Addresses"> <page name="contacts" string="Contacts &amp; Addresses">
<label for="director_ids" string="Dirigeants"/> <label for="director_ids" string="Dirigeants"/>
<field name="director_ids" mode="kanban" <field name="director_ids" mode="kanban"
context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_city_id': city_id, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'contact', 'default_ur_id': ur_id}"> context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_city_id': city_id, 'default_country_id': country_id, 'default_supplier': supplier, 'default_customer': customer, 'default_lang': lang, 'default_user_id': user_id, 'default_ur_id': ur_id, 'default_type': 'contact'}">
<kanban> <kanban>
<field name="id"/> <field name="id"/>
<field name="color"/> <field name="color"/>
...@@ -348,6 +348,7 @@ ...@@ -348,6 +348,7 @@
<field name="cedex"/> <field name="cedex"/>
<field name="state_id"/> <field name="state_id"/>
<field name="country_id"/> <field name="country_id"/>
<field name="type"/>
</group> </group>
<group> <group>
<field name="title" placeholder="Madame"/> <field name="title" placeholder="Madame"/>
......
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