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

Fix Issues

This commit is contained in:
eman 2024-11-30 15:34:50 +02:00
parent 2bfa7d100c
commit ce7efddfce
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
odex25_ensan/odex_benefit/models/service_request.py
View File

@ -160,7 +160,7 @@ class ServiceRequest(models.Model):
if not res.name or res.name == _('New'):
res.name = self.env['ir.sequence'].sudo().next_by_code('service.request.sequence') or _('New')
# Check if any of the specified fields are present in vals
if any(field in vals for field in new_rent_fields):
if any(field in vals for field in new_rent_fields) and vals['new_rent_contract']:
if res.family_id:
# Prepare values for family_id write
update_values = {}
@ -187,7 +187,7 @@ class ServiceRequest(models.Model):
'new_payment_type', 'new_rent_attachment']
result = super(ServiceRequest, self).write(vals)
update_values = {}
if any(field in vals for field in new_rent_fields):
if any(field in vals for field in new_rent_fields) and self.new_rent_contract:
for record in self:
# Ensure family_id exists before proceeding
if record.family_id:
@ -773,7 +773,7 @@ class ServiceRequest(models.Model):
@api.onchange('member_id')
def onchange_member_id(self):
for rec in self:
if rec.member_id and rec.member_id.member_location != 'study_inside_saudi_arabia':
if rec.member_id and rec.member_id.member_location != 'study_inside_saudi_arabia' and rec.service_type == 'rent':
raise UserError(_("You Cannot request Service if you not study inside Saudi Arabia"))
@api.onchange('start', 'end', 'rent_start_date', 'rent_end_date','new_start', 'new_end', 'new_rent_start_date', 'new_rent_end_date', 'new_rent_contract')

22
odex25_ensan/odex_benefit/views/service_request.xml
View File

@ -113,9 +113,9 @@
<br/>
<field name="rent_payment_date_exception" widget="boolean_toggle"/>
<field name="rent_payment_date" attrs="{'required':[('service_type','=','rent'),('new_rent_contract','=',False)]}"/>
<field name="rent_contract_number" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<field name="rent_start_date" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<field name="rent_end_date" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<field name="rent_contract_number" attrs="{'invisible':[('benefit_type','!=','family')]}" force_save="1"/>
<field name="rent_start_date" attrs="{'invisible':[('benefit_type','!=','family')]}" force_save="1"/>
<field name="rent_end_date" attrs="{'invisible':[('benefit_type','!=','family')]}" force_save="1"/>
<label for="start" string="Period" />
<div name="dates" class="o_row">
<field name="start" attrs="{'readonly':[('state','not in',['draft','researcher','send_request'])]}"/>
@ -123,14 +123,14 @@
<i class="fa fa-long-arrow-right mx-2 oe_read_only" aria-label="Arrow icon" title="Arrow" attrs="{'invisible': [('start', '=', False), ('end', '=', False)]}" />
<field name="end" attrs="{'readonly':[('state','not in',['draft','researcher','send_request'])]}" />
</div>
<field name="rent_amount" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<field name="rent_amount_payment" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<field name="payment_type" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<field name="rent_attachment" widget="many2many_attachment_preview" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<field name="member_rent_contract_number" attrs="{'invisible':[('benefit_type','!=','member')]}"/>
<field name="member_rent_start_date" attrs="{'invisible':[('benefit_type','!=','member')]}"/>
<field name="member_rent_end_date" attrs="{'invisible':[('benefit_type','!=','member')]}"/>
<field name="member_rent_attachment" widget="many2many_attachment_preview" attrs="{'invisible':[('benefit_type','!=','member')]}"/>
<field name="rent_amount" attrs="{'invisible':[('benefit_type','!=','family')]}" force_save="1"/>
<field name="rent_amount_payment" attrs="{'invisible':[('benefit_type','!=','family')]}" force_save="1"/>
<field name="payment_type" attrs="{'invisible':[('benefit_type','!=','family')]}" force_save="1"/>
<field name="rent_attachment" widget="many2many_attachment_preview" attrs="{'invisible':[('benefit_type','!=','family')]}" force_save="1"/>
<field name="member_rent_contract_number" attrs="{'invisible':[('benefit_type','!=','member')]}" force_save="1"/>
<field name="member_rent_start_date" attrs="{'invisible':[('benefit_type','!=','member')]}" force_save="1"/>
<field name="member_rent_end_date" attrs="{'invisible':[('benefit_type','!=','member')]}" force_save="1"/>
<field name="member_rent_attachment" widget="many2many_attachment_preview" attrs="{'invisible':[('benefit_type','!=','member')]}" force_save="1"/>
<field name="new_rent_contract" widget="boolean_toggle" attrs="{'invisible':[('benefit_type','!=','family')]}"/>
<!-- <field name="is_alternative_housing" widget="boolean_toggle"/>-->
</group>