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

[UPDATE]UPDATE

This commit is contained in:
zainab8585 2024-07-08 17:48:55 +02:00
parent 930ba7e78a
commit dd9931441d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,8 @@ class PartnerExtended(models.Model):
is_member = fields.Boolean(string='Is Member') is_member = fields.Boolean(string='Is Member')
membership_count = fields.Integer(string="Membership Count", compute="_get_membership_count") membership_count = fields.Integer(string="Membership Count", compute="_get_membership_count")
active_membership_id = fields.Many2one('dev.membership', string='Membership', compute='check_active_membership') active_membership_id = fields.Many2one('dev.membership', string='Membership', compute='check_active_membership')
state = fields.Selection(related='active_membership_id.state',store=True)
nationality_id = fields.Many2one('res.country', string="Nationality") nationality_id = fields.Many2one('res.country', string="Nationality")
is_membership_expire = fields.Boolean('Expire Membership', compute='check_active_membership') is_membership_expire = fields.Boolean('Expire Membership', compute='check_active_membership')
memebership_status = fields.Char('Membership Status', compute='check_memebership_status') memebership_status = fields.Char('Membership Status', compute='check_memebership_status')

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

@ -152,6 +152,7 @@
<xpath expr="//field[@name='vat']" position="before"> <xpath expr="//field[@name='vat']" position="before">
<field name="nationality_id"/> <field name="nationality_id"/>
<field name="birth_date"/> <field name="birth_date"/>
<field name="state"/>
<field name="age"/> <field name="age"/>
</xpath> </xpath>
<xpath expr="//field[@name='function']" position="after"> <xpath expr="//field[@name='function']" position="after">
@ -202,7 +203,7 @@
<field name="identification_number"/> <field name="identification_number"/>
<filter string="Archived" name="archived" domain="[('active', '=', False)]"/> <filter string="Archived" name="archived" domain="[('active', '=', False)]"/>
<filter string="Expired Membership" name="membership_end_date" <filter string="Expired Membership" name="membership_end_date"
domain="[('memebership_end_date', '&lt;=',context_today().strftime('%Y-%m-%d'))]"/> domain="['|',('state', '=', 'expire'),('memebership_end_date', '&lt;=',context_today().strftime('%Y-%m-%d'))]"/>
<group string="Group By"> <group string="Group By">
<filter string="Membership Type" name="product_id" context="{'group_by': 'product_id'}"/> <filter string="Membership Type" name="product_id" context="{'group_by': 'product_id'}"/>
<filter string="Branch" name="branch_id" context="{'group_by': 'branch_id'}"/> <filter string="Branch" name="branch_id" context="{'group_by': 'branch_id'}"/>