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 #485 from expsa/zainab_sale 

Zainab sale
This commit is contained in:
zainab2097 2024-08-04 11:17:41 +03:00 committed by GitHub
parent 5919b83149 1aa52201e1
commit 5d8a752f01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ class DevMembership(models.Model):
self.to_date = self.from_date + relativedelta(days=+self.duration)
def action_confirm_membership(self):
if self.partner_id.nationality_id not in self.product_id.nationality_ids:
if self.partner_id.nationality_id not in self.product_id.nationality_ids and self.prodcut_id.nationality_ids!=False:
raise ValidationError(_("The member's nationality does not meet the membership requirements"))
if self.partner_id.age <18:
raise ValidationError(_('The member must be at least 18 years old.'))

4
odex25_sales/dev_membership/models/membership_cancel_request.py
View File

@ -10,7 +10,7 @@ class MembershipCancellationRequest(models.Model):
membership_id = fields.Many2one('dev.membership', string='Membership',required=True)
member_id = fields.Many2one('res.partner', string='Member',related='membership_id.partner_id',store=True, required=True)
membership_type_id = fields.Many2one('product.product',related='membership_id.product_id',store=True, string='Membership Type', required=True)
cancel_reason = fields.Char(string='Cancellation Reason', required=True)
cancel_reason = fields.Many2one('cancellation.reason',string='Cancellation Reason', required=True)
request_date = fields.Datetime(string='Request Date', default=fields.Datetime.now)
state = fields.Selection([
('draft', 'Draft'),
@ -30,4 +30,4 @@ class MembershipCancellationRequest(models.Model):
for record in self:
if record.state != 'draft':
raise UserError(_("Requests can only be deleted if they are in the draft state."))
return super(MembershipCancellationRequest, self).unlink()
return super(MembershipCancellationRequest, self).unlink()

4
odex25_sales/dev_membership/views/dev_membership.xml
View File

@ -249,8 +249,8 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">dev.membership</field>
<field name="view_mode">kanban,tree,activity,form</field>
<field name="domain">[('state', '!=', 'cancel')]</field>
<!-- <field name="domain">[('state', '!=', 'cancel')]</field>
-->
</record>
<!-- Active Membership-->

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

@ -62,5 +62,5 @@
</record>
<!-- Menu Item -->
<menuitem id="menu_membership_cancellation_request" name="Membership Cancellation Requests" parent="dev_membership.menu_configuration_root" action="action_membership_cancellation_request"/>
<menuitem id="menu_membership_cancellation_request" name="Membership Cancellation Requests" parent="dev_membership.menu_membership_root" action="action_membership_cancellation_request"/>
</odoo>

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

@ -35,5 +35,5 @@
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_membership_level" sequence="7" name="Membership Levels" parent="menu_membership_main" action="action_membership_level"/>
<menuitem id="menu_membership_level" sequence="7" name="Membership Levels" parent="menu_configuration_root" action="action_membership_level"/>
</odoo>

4
odex25_sales/dev_membership/views/res_config_settings.xml
View File

@ -42,7 +42,7 @@
<!-- todo end -->
</div>
</div>
<div class="app_settings_block" data-string="Member Experience Evaluation" data-key="dev_membership">
<div class="app_settings_block" data-string="Member Experience Evaluation" data-key="">
<h2>Membership Experience Evaluation</h2>
<div class="row mt16 o_settings_container" name="dev_membership_setting_container">
<div class="col-12 col-lg-6 o_setting_box" id="late_reg">
@ -78,7 +78,7 @@
<!-- todo end -->
</div>
</div>
<div class="app_settings_block" data-string="Membership Cancellation" data-key="dev_membership">
<div class="app_settings_block" data-string="Membership Cancellation" data-key="">
<h2>Membership Cancellation</h2>
<div class="row mt16 o_settings_container" name="dev_membership_setting_container">
<div class="col-12 col-lg-6 o_setting_box" id="late_cancellfine">

2
odex25_sales/dev_membership/wizard/cancel_membership.py
View File

@ -49,7 +49,7 @@ class MembershipRefues(models.TransientModel):
'member_id': membership.partner_id.id,
'membership_type_id': membership.product_id.id,
'membership_id': membership.id,
'cancel_reason': self.reason_id.name,
'cancel_reason': self.reason_id.id,
'state': 'draft'
})
# return {'type': 'ir.actions.act_window_close'}