diff --git a/beesdoo_easy_my_coop/__openerp__.py b/beesdoo_easy_my_coop/__openerp__.py index 9e17648..993515a 100644 --- a/beesdoo_easy_my_coop/__openerp__.py +++ b/beesdoo_easy_my_coop/__openerp__.py @@ -19,12 +19,14 @@ 'version': '1.0', # any module necessary for this one to work correctly - 'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop'], + 'depends': ['beesdoo_base', 'beesdoo_shift', 'easy_my_coop', ], # always loaded 'data': [ 'data/product_share.xml', + 'views/partner.xml', ], + 'auto_install': True, # only loaded in demonstration mode } diff --git a/beesdoo_easy_my_coop/models/res_partner.py b/beesdoo_easy_my_coop/models/res_partner.py index c007247..598d072 100644 --- a/beesdoo_easy_my_coop/models/res_partner.py +++ b/beesdoo_easy_my_coop/models/res_partner.py @@ -4,11 +4,24 @@ from openerp import models, fields, api, _ class Partner(models.Model): _inherit = 'res.partner' - share_type = fields.Selection(compute='_get_share_product_type') + cooperator_type = fields.Selection(selection='_get_share_type', compute='_compute_share_type', string='Cooperator Type', store=True) @api.multi @api.depends('share_ids', 'share_ids.share_product_id', 'share_ids.share_product_id.default_code') - def _get_share_product_type(self): + def _compute_share_type(self): for rec in self: codes = rec.share_ids.mapped('share_product_id.default_code') - rec.share_type = codes[0] if codes else '' \ No newline at end of file + rec.cooperator_type = codes[0] if codes else '' + + @api.multi + def _get_share_type(self): + share_type_list = [('','')] + for share_type in self.env['product.product'].search([('is_share','=',True)]): + share_type_list.append((share_type.default_code, share_type.short_name)) + return share_type_list + + @api.noguess + def _auto_init(self, cr, context=None): + cr.execute("ALTER TABLE res_partner DROP COLUMN IF EXISTS cooperator_type") + res = super(Partner, self)._auto_init(cr, context=context) + return res \ No newline at end of file diff --git a/beesdoo_easy_my_coop/views/partner.xml b/beesdoo_easy_my_coop/views/partner.xml new file mode 100644 index 0000000..b0d2fee --- /dev/null +++ b/beesdoo_easy_my_coop/views/partner.xml @@ -0,0 +1,11 @@ + + + + beesdoo.partner.form.view.remove_duplicate_cooperator_type + res.partner + + + + + +