devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #627 from expsa/membership_test 

Membership test
This commit is contained in:
zainab2097 2024-08-11 14:02:48 +03:00 committed by GitHub
parent 241d4b029b aae8ec0d5d
commit cc830e578b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
odex25_sales/dev_membership/models/res_partner.py
View File

@ -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)],

2
odex25_sales/dev_membership/views/membership_level.xml
View File

@ -10,8 +10,6 @@
<field name="years"/>
<field name="min"/>
<field name="max"/>
<field name="max"/>
<field widget='color' name="color"/>
</tree>
</field>

9
odex25_sales/dev_membership/views/partner_extended.xml
View File

@ -14,6 +14,7 @@
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<field name="join_date" optional="show"/>
<field name="membrship_level" optional="hide"/>
<field name="membrship_no" optional="hide"/>
<field name="memebership_end_date" optional="show"/>
<field name="product_id" optional="show"/>
@ -50,6 +51,8 @@
<field name="join_date"/>
<field name="memebership_end_date"/>
<field name="membrship_level"/>
<field name="membrship_no"/>
<field name="category_id" widget="many2many_tags"/>
<field name="image_128"/>
@ -123,6 +126,8 @@
<field name="memebership_status"/>
</b><br/><b style="color:#7C7BAD">
<field name="membrship_level"/>
</b><br/><b style="color:#7C7BAD">
<field name="membrship_no"/>
</b>
</span>
<div class="o_row">
@ -162,7 +167,9 @@
<field name="gender"/>
<field name="nationality_id"/>
<field name="birth_date"/>
<field name="age"/><field name="membrship_level"/>
<field name="age"/>
<field name="membrship_level"/>
<field name="membrship_no"/>
</xpath>
<xpath expr="//field[@name='function']" position="after">
<field name="employer"/>

4
odex25_sales/membership_card_odoo/models/res_partner.py
View File

@ -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,