From f33fa6ec7f7f1ddc201c2eca758248ad3af2ae07 Mon Sep 17 00:00:00 2001 From: houssine Date: Wed, 24 Jul 2019 13:53:10 +0200 Subject: [PATCH] [FIX] fix _compute_cooperator_type combining beesdoo modules and easy my coop without the beesdoo easy my coop module lead to problems. has the shares are hard coded in beesdoo_easy_my_coop We've changed the way it's computed. --- easy_my_coop/models/partner.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py index 20493ed..8cc5344 100644 --- a/easy_my_coop/models/partner.py +++ b/easy_my_coop/models/partner.py @@ -64,7 +64,8 @@ class ResPartner(models.Model): product_obj = self.env['product.product'] share_type_list = [('', '')] for share_type in product_obj.search([('is_share', '=', True)]): - share_type_list.append((str(share_type.id), share_type.short_name)) + share_type_list.append([share_type.default_code, + share_type.short_name]) return share_type_list @api.multi @@ -76,12 +77,14 @@ class ResPartner(models.Model): partner.effective_date = partner.share_ids[0].effective_date @api.multi - @api.depends('share_ids') + @api.depends('share_ids', 'share_ids.share_product_id', + 'share_ids.share_product_id.default_code', + 'share_ids.share_number') def _compute_cooperator_type(self): for partner in self: share_type = '' for line in partner.share_ids: - share_type = str(line.share_product_id.id) + share_type = str(line.share_product_id.default_code) if share_type != '': partner.cooperator_type = share_type @@ -119,16 +122,16 @@ class ResPartner(models.Model): 'partner_id', string='Share Lines') cooperator_register_number = fields.Integer(string='Cooperator Number') - number_of_share = fields.Integer(compute="_compute_share_info", + number_of_share = fields.Integer(compute=_compute_share_info, multi='share', string='Number of share', readonly=True) - total_value = fields.Float(compute="_compute_share_info", + total_value = fields.Float(compute=_compute_share_info, multi='share', string='Total value of shares', readonly=True) company_register_number = fields.Char(string='Company Register Number') - cooperator_type = fields.Selection(selection='_get_share_type', + cooperator_type = fields.Selection(selection=_get_share_type, compute=_compute_cooperator_type, string='Cooperator Type', store=True)