diff --git a/odex25_sales/dev_membership/models/res_partner.py b/odex25_sales/dev_membership/models/res_partner.py index 9cd8ec49a..5d0b17c18 100644 --- a/odex25_sales/dev_membership/models/res_partner.py +++ b/odex25_sales/dev_membership/models/res_partner.py @@ -23,6 +23,7 @@ class PartnerExtended(models.Model): nationality_id = fields.Many2one('res.country', string="Nationality") is_membership_expire = fields.Boolean('Expire Membership',store=True, compute='check_active_membership') memebership_status = fields.Char('Membership Status', compute='check_memebership_status') + membrship_no = fields.Char('Membership Number') birth_date = fields.Date(string='Birth Date') join_date = fields.Date(string='Join Date') memebership_end_date = fields.Date(string='Memebership End Date',store=True,related='active_membership_id.to_date') @@ -83,7 +84,7 @@ class PartnerExtended(models.Model): partner.memebership_status = 'Membership Expire' else: if partner.active_membership_id: - partner.memebership_status = 'Membership : ' + partner.active_membership_id.name + partner.memebership_status = 'Membership : ' + partner.active_membership_id.product_id..name else: # البحث عن حالة الاشتراك الأخيرة last_membership = self.env['dev.membership'].search([('partner_id', '=', partner.id)], diff --git a/odex25_sales/dev_membership/views/membership_level.xml b/odex25_sales/dev_membership/views/membership_level.xml index cb2b03b0f..c983de070 100644 --- a/odex25_sales/dev_membership/views/membership_level.xml +++ b/odex25_sales/dev_membership/views/membership_level.xml @@ -10,8 +10,6 @@ - - diff --git a/odex25_sales/dev_membership/views/partner_extended.xml b/odex25_sales/dev_membership/views/partner_extended.xml index 46f940ee3..a7e116ea6 100644 --- a/odex25_sales/dev_membership/views/partner_extended.xml +++ b/odex25_sales/dev_membership/views/partner_extended.xml @@ -14,6 +14,7 @@ + @@ -50,6 +51,8 @@ + + @@ -123,6 +126,8 @@
+
+
@@ -162,7 +167,9 @@ - + + + diff --git a/odex25_sales/membership_card_odoo/models/res_partner.py b/odex25_sales/membership_card_odoo/models/res_partner.py index 9e753478d..0e9c9fcc6 100644 --- a/odex25_sales/membership_card_odoo/models/res_partner.py +++ b/odex25_sales/membership_card_odoo/models/res_partner.py @@ -44,6 +44,10 @@ class ResPartner(models.Model): if self.is_member or partner_id.member_lines: data = { 'name': partner_id.name, + 'product_id': partner_id.product_id.name, + 'membrship_level':partner_id.membrship_level.name, + 'membrship_level_color':partner_id.membrship_level.color, + 'membrship_no':partner_id.membrship_no, 'image': partner_id.image_1920, 'phone': partner_id.phone, 'function': partner_id.function,