Merge branch 'dev_odex25_benefit' into ENS-3799
This commit is contained in:
Abdurrahman Saber
commit
8c0059c932
|
|
@ -1115,11 +1115,6 @@ msgstr "مرفق التسجيل الأكاديمي"
|
|||
msgid "Accept"
|
||||
msgstr "قبول"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:res.groups,name:odex_benefit.group_accept_income_and_expenses
|
||||
msgid "Accept income and expenses"
|
||||
msgstr "الموافقة على الدخل والمصاريف"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields.selection,name:odex_benefit.selection__expenses_line__state__accepted
|
||||
#: model:ir.model.fields.selection,name:odex_benefit.selection__family_debits__state__accepted
|
||||
|
|
@ -1861,7 +1856,6 @@ msgstr ""
|
|||
|
||||
#. module: odex_benefit
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.family_member_form
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
|
||||
msgid "Attachment Name"
|
||||
msgstr "اسم المرفق"
|
||||
|
||||
|
|
@ -2047,7 +2041,6 @@ msgid "Bank"
|
|||
msgstr "بنك"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:res.groups,name:odex_benefit.group_benefit_bank_info
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
|
||||
msgid "Bank Account Information"
|
||||
msgstr "معلومات الحساب البنكي"
|
||||
|
|
@ -2112,11 +2105,6 @@ msgstr "ملفات في القائمة السوداء"
|
|||
msgid "Beneficiaries Category"
|
||||
msgstr "فئات الأسر"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:res.groups,name:odex_benefit.group_benefit_edit
|
||||
msgid "Beneficiaries Edit User"
|
||||
msgstr "تعديل المستفيدين"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:res.groups,name:odex_benefit.group_benefit_info
|
||||
msgid "Beneficiaries Inforamtion"
|
||||
|
|
@ -2797,6 +2785,7 @@ msgstr "المرتد"
|
|||
#: model:ir.model.fields,field_description:odex_benefit.field_changes_requests__branch_custom_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_changes_requests__researcher_branch_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_committees_line__branch_custom_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_committees_line__branch_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_confirm_benefit_expense__branch_custom_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_res_districts__branch_custom_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__branch_custom_id
|
||||
|
|
@ -3386,6 +3375,7 @@ msgstr "طريقة التواصل الافتراضية"
|
|||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__contract_num
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__name
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.view_rent_contract_form
|
||||
msgid "Contract Number"
|
||||
msgstr "رقم عقد الإيجار"
|
||||
|
||||
|
|
@ -8596,7 +8586,14 @@ msgstr "نهاية الوقت المعين للنشاط"
|
|||
#: model:ir.model.fields,field_description:odex_benefit.field_education_exam_type__name
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.view_property_type_settings_form
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_education_period__name
|
||||
<<<<<<< HEAD
|
||||
#: model_terms:ir.ui.view,arch_db:odex_benefit.view_rent_contract_form
|
||||
=======
|
||||
msgid "Name"
|
||||
msgstr "الاسم"
|
||||
|
||||
#. module: odex_benefit
|
||||
>>>>>>> dev_odex25_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_cars_line__name
|
||||
#, fuzzy
|
||||
msgid "Name"
|
||||
|
|
@ -9145,11 +9142,6 @@ msgstr ""
|
|||
msgid "Open Edit Info"
|
||||
msgstr "فتح تحرير البيانات"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_hr_department__operation_manager_id
|
||||
msgid "Operation Manager"
|
||||
msgstr ""
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_benefits_representative__opportunity_ids
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_external_benefits__opportunity_ids
|
||||
|
|
@ -10014,11 +10006,15 @@ msgstr ""
|
|||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_benefit_housing__rent_amount
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_amount
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__rent_amount
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__rent_amount
|
||||
msgid "Rent Amount"
|
||||
msgstr "قيمة الإيجار"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_rent_contract__rent_amount
|
||||
msgid "Rent Amount"
|
||||
msgstr "قيمة الإيجار الشهري"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_services_settings__rent_amount_for_alternative_housing
|
||||
msgid "Rent Amount For Alternative Housing"
|
||||
|
|
@ -10031,7 +10027,6 @@ msgstr "احتساب قيمة الإيجار"
|
|||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_attachment
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__member_rent_attachment
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__rent_attachment
|
||||
msgid "Rent Attachment"
|
||||
msgstr "مرفق عقد الإيجار"
|
||||
|
|
@ -10042,14 +10037,12 @@ msgid "Rent Contract Information"
|
|||
msgstr "معلومات عقد الإيجار"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__member_rent_contract_number
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__rent_contract_number
|
||||
msgid "Rent Contract Number"
|
||||
msgstr "رقم العقد"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_end_date
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__member_rent_end_date
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__rent_end_date
|
||||
msgid "Rent End Date"
|
||||
msgstr "تاريخ نهاية العقد"
|
||||
|
|
@ -10081,7 +10074,6 @@ msgstr "سكن مشترك إيجار"
|
|||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_grant_benefit__rent_start_date
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__member_rent_start_date
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__rent_start_date
|
||||
msgid "Rent Start Date"
|
||||
msgstr "تاريخ بداية العقد"
|
||||
|
|
@ -11191,7 +11183,6 @@ msgstr ""
|
|||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.actions.act_window,name:odex_benefit.survey_setting_action
|
||||
#: model:ir.ui.menu,name:odex_benefit.menu_survey_setting
|
||||
msgid "Survey Setting"
|
||||
msgstr "إعدادات الاستبيان"
|
||||
|
||||
|
|
@ -14388,11 +14379,6 @@ msgstr "سبب إعادة الطلب"
|
|||
msgid "Reason For Return Wizard"
|
||||
msgstr "سبب إعادة الطلب"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:res.groups,name:odex_benefit.group_approval_of_beneficiary_services
|
||||
msgid "Approval Of Beneficiary Services"
|
||||
msgstr "اعتماد خدمات المستفيدين"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_service_request__exception_or_steal_attach
|
||||
msgid "Exception or steal Attachment"
|
||||
|
|
@ -17605,7 +17591,9 @@ msgstr ""
|
|||
#: code:addons/odex_benefit/models/service_request.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Payment Type requires a period of %s months, but selected period is %s months."
|
||||
"Payment Type requires a period of %s months, but selected period is %s "
|
||||
"months."
|
||||
>>>>>>> dev_odex25_benefit
|
||||
msgstr "يتطلب نوع السداد فترة %s أشهر، ولكن الفترة المحددة هي %s أشهر."
|
||||
|
||||
#. module: odex_benefit
|
||||
|
|
@ -18239,7 +18227,7 @@ msgstr ""
|
|||
#: model:ir.model.fields.selection,name:odex_benefit.selection__attachments_settings__attach_type__expense_attach
|
||||
#, python-format
|
||||
msgid "Expense Attach"
|
||||
msgstr "مرفق المصروفات"
|
||||
msgstr "مرفق الالتزام"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: code:addons/odex_benefit/models/service_request.py:0
|
||||
|
|
@ -18356,3 +18344,33 @@ msgstr ""
|
|||
#: model_terms:ir.ui.view,arch_db:odex_benefit.grant_benefit_form
|
||||
msgid "View All Rent Contracts"
|
||||
msgstr "عرض جميع عقود الإيجار"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_branch_settings__manager_id
|
||||
msgid "Manager"
|
||||
msgstr "المدير"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_branch_settings__operation_manager_id
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_hr_department__operation_manager_id
|
||||
msgid "Operation Manager"
|
||||
msgstr "رئيس العمليات"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: model:ir.model.fields,field_description:odex_benefit.field_family_member__exit_benefit_date
|
||||
msgid "Exit Benefit Date"
|
||||
msgstr "تاريخ الخروج من الاستفادة"
|
||||
|
||||
#. module: odex_benefit
|
||||
#: code:addons/odex_benefit/models/service_request.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Requested rent period must be fully within the contract period because the "
|
||||
"contract is fixed-term."
|
||||
msgstr "يجب أن تكون فترة الإيجار المطلوبة بالكامل ضمن فترة العقد لأن العقد محدد المدة."
|
||||
|
||||
#. module: odex_benefit
|
||||
#: code:addons/odex_benefit/models/service_request.py:0
|
||||
#, python-format
|
||||
msgid "Requested start date cannot be before the contract start date."
|
||||
msgstr "لا يمكن أن يكون تاريخ البدء المطلوب قبل تاريخ بدء العقد."
|
||||
|
|
|
|||
|
|
@ -825,7 +825,7 @@ class GrantBenefitProfile(models.Model):
|
|||
else:
|
||||
estimated_rent_amount = self.env['rent.lines'].search(
|
||||
[('benefit_count', '=', rec.benefit_member_count)], order="estimated_rent_governorate desc",limit=1).estimated_rent_governorate
|
||||
rec.estimated_rent_amount = min(estimated_rent_amount, rec.rent_amount) / 12.0
|
||||
rec.estimated_rent_amount = min(estimated_rent_amount / 12.0, rec.rent_amount)
|
||||
|
||||
def assign_sequence_to_all(self):
|
||||
sequence = self.env['ir.sequence'].search([('code', '=', 'benefit.sequence')], limit=1)
|
||||
|
|
@ -1736,9 +1736,9 @@ class GrantBenefitProfile(models.Model):
|
|||
user.write({'active': True})
|
||||
else:
|
||||
user = self.create_user()
|
||||
group_e = self.env.ref('odex_benefit.group_benefit_edit', False)
|
||||
#group_e = self.env.ref('odex_benefit.group_benefit_edit', False)
|
||||
try:
|
||||
group_e.sudo().write({'users': [(4, user.id)]})
|
||||
#group_e.sudo().write({'users': [(4, user.id)]})
|
||||
self.old_stage = self.state
|
||||
template = self.env.ref('odex_benefit.edit_benefit_email', False)
|
||||
except:
|
||||
|
|
@ -2366,8 +2366,8 @@ class GrantBenefitProfile(models.Model):
|
|||
|
||||
def action_finish_edit(self):
|
||||
for rec in self:
|
||||
group_e = self.env.ref('odex_benefit.group_benefit_edit', False)
|
||||
group_e.write({'users': [(3, self.user_id.id)]})
|
||||
#group_e = self.env.ref('odex_benefit.group_benefit_edit', False)
|
||||
#group_e.write({'users': [(3, self.user_id.id)]})
|
||||
rec.state = rec.old_stage
|
||||
|
||||
# @api.multi
|
||||
|
|
|
|||
|
|
@ -478,7 +478,7 @@ class ExpensesLine(models.Model):
|
|||
currency_id = fields.Many2one('res.currency', related='benefit_id.currency_id')
|
||||
#expenses_type_custom = fields.Many2one('expenses.type')
|
||||
expenses_type_custom = fields.Many2one('attachments.settings', string='Expenses Type Custom',
|
||||
domain="[('attach_type','=','expenses_attach')]")
|
||||
domain="[('attach_type','=','expense_attach')]")
|
||||
expenses_type = fields.Selection(
|
||||
string='',
|
||||
selection=[('governmental', 'Governmental Expenses'),
|
||||
|
|
@ -640,7 +640,7 @@ class Committees(models.Model):
|
|||
_inherit = ['mail.thread', 'mail.activity.mixin']
|
||||
|
||||
name = fields.Char()
|
||||
employee_id = fields.Many2many('hr.employee')
|
||||
employee_id = fields.Many2many('hr.employee',domain="[('branch_name','=',branch_id)]", string="Employee")
|
||||
type = fields.Selection(
|
||||
string='',
|
||||
selection=[('male', 'Men'),
|
||||
|
|
@ -649,6 +649,7 @@ class Committees(models.Model):
|
|||
],
|
||||
required=False, )
|
||||
branch_custom_id = fields.Many2one("branch.settings", string="Branch")
|
||||
branch_id = fields.Many2one('hr.department',string='Branch',related='branch_custom_id.branch',store=True)
|
||||
active = fields.Boolean('Active', default=True)
|
||||
benefit_count = fields.Integer(compute="get_benefit_count")
|
||||
mobile = fields.Char(string="Mobile Number")
|
||||
|
|
@ -765,6 +766,8 @@ class BranchSettings(models.Model):
|
|||
|
||||
name = fields.Char(related='branch.name')
|
||||
branch = fields.Many2one('hr.department',string='Branch',domain =[('is_branch', '=', True)])
|
||||
manager_id = fields.Many2one('hr.employee', related='branch.manager_id')
|
||||
operation_manager_id = fields.Many2one('hr.employee', related='branch.operation_manager_id')
|
||||
branch_type = fields.Selection(
|
||||
selection=[
|
||||
('branches', 'Branches'),
|
||||
|
|
@ -1038,8 +1041,3 @@ class RentContract(models.Model):
|
|||
for rec in self:
|
||||
if rec.landlord_type == 'family':
|
||||
rec.member_id = False
|
||||
|
||||
@api.onchange('contract_type')
|
||||
def _onchange_contract_type(self):
|
||||
if self.contract_type == 'unlimited':
|
||||
self.end_date = False
|
||||
|
|
@ -281,6 +281,7 @@ class FamilyMemberProfile(models.Model):
|
|||
resume_reason_id = fields.Many2one('suspend.reason', string='Return Reason')
|
||||
resume_date = fields.Date(string="Return Date")
|
||||
resume_notes = fields.Text(string="Return Notes")
|
||||
exit_benefit_date = fields.Date(string="Exit Benefit Date")
|
||||
|
||||
# def create(self, vals):
|
||||
# for line_vals in vals:
|
||||
|
|
@ -689,6 +690,10 @@ class FamilyMemberProfile(models.Model):
|
|||
if rec.member_status == 'non_benefit':
|
||||
reasons = [str(r) for r in reasons if r]
|
||||
rec.non_benefit_reason = "\n".join(reasons)
|
||||
if not rec.exit_benefit_date:
|
||||
rec.exit_benefit_date = fields.Date.today()
|
||||
elif rec.member_status == 'benefit':
|
||||
rec.exit_benefit_date = False
|
||||
|
||||
# @api.depends('relationn','birth_date', 'is_scientific_specialty', 'is_medical_specialty', 'has_disabilities', 'is_married',
|
||||
# 'minor_siblings','member_income','is_married','member_location_conf','education_status','case_study','state','is_dead')
|
||||
|
|
|
|||
|
|
@ -76,13 +76,6 @@ class ServiceRequest(models.Model):
|
|||
rent_payment_date_exception = fields.Boolean(string='Rent Payment Date Exception?')
|
||||
start = fields.Date(string="Start Date")
|
||||
end = fields.Date(string='End Date')
|
||||
# Rent details for member
|
||||
member_rent_contract_number = fields.Char(string="Rent Contract Number")
|
||||
member_rent_start_date = fields.Date(string='Rent Start Date')
|
||||
member_rent_end_date = fields.Date(string='Rent End Date')
|
||||
member_rent_attachment = fields.Many2many('ir.attachment', 'rel_member_rent_attachment_service_request',
|
||||
'service_request_id',
|
||||
'attachment_id', string='Rent Attachment')
|
||||
added_amount_if_mother_dead = fields.Float(string="Added Amount (If mother dead)",
|
||||
compute="_get_added_amount_if_mother_dead")
|
||||
attachment_lines = fields.One2many(
|
||||
|
|
@ -774,12 +767,35 @@ class ServiceRequest(models.Model):
|
|||
for rec in self:
|
||||
if rec.service_type != 'rent':
|
||||
continue
|
||||
# if rec.start and rec.end and rec.rent_start_date and rec.rent_end_date:
|
||||
# if not (rec.rent_start_date <= rec.start <= rec.rent_end_date and
|
||||
# rec.rent_start_date <= rec.end <= rec.rent_end_date):
|
||||
# raise UserError(_(
|
||||
# "The Start Date and End Date must be within the Rent Start Date and Rent End Date range."
|
||||
# ))
|
||||
|
||||
contract = rec.family_id.current_rent_contract_id if rec.benefit_type == 'family' else False
|
||||
if rec.benefit_type == 'member' and rec.member_id:
|
||||
member_contracts = rec.family_id.rent_contract_ids.filtered(
|
||||
lambda c: c.state == 'active' and c.member_id == rec.member_id and c.landlord_type == 'member'
|
||||
).sorted('start_date', reverse=True)
|
||||
contract = member_contracts[:1] or False
|
||||
|
||||
if contract:
|
||||
if contract.contract_type == 'fixed':
|
||||
if rec.start and rec.end and rec.rent_start_date and rec.rent_end_date:
|
||||
if not (rec.rent_start_date <= rec.start <= rec.rent_end_date and
|
||||
rec.rent_start_date <= rec.end <= rec.rent_end_date):
|
||||
raise UserError(_(
|
||||
"The Start Date and End Date must be within the Rent Start Date and Rent End Date range."
|
||||
))
|
||||
raise UserError(
|
||||
_("Requested rent period must be fully within the contract period "
|
||||
"because the contract is fixed-term.")
|
||||
)
|
||||
else:
|
||||
if rec.start and rec.rent_start_date:
|
||||
if rec.start <= rec.rent_start_date:
|
||||
raise UserError(
|
||||
_("Requested start date cannot be before the contract start date.")
|
||||
)
|
||||
if rec.payment_type and rec.start and rec.end:
|
||||
months_map = {
|
||||
'1': 12, # yearly
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ access_benefit_researcher_record,access_benefit_researcher_record,model_grant_be
|
|||
access_benefit_woman_commitee_record,access_benefit_record,model_grant_benefit,odex_benefit.group_benefit_woman_commitee,1,1,1,1
|
||||
access_benefit_branch_manager_record,access_benefit_branch_manager_record,model_grant_benefit,odex_benefit.group_benefit_branch_manager,1,1,1,1
|
||||
access_benefit_manager_record,access_benefit_manager_record,model_grant_benefit,odex_benefit.group_benefit_manager,1,1,1,1
|
||||
access_benefit_edit_record,access_benefit_edit_record,model_grant_benefit,odex_benefit.group_benefit_edit,1,1,1,1
|
||||
access_education_status_all,education_status,model_education_status,odex_benefit.group_benefit_info,1,1,1,1
|
||||
access_education_status_all_users,education_status_all_users,model_education_status,,1,0,0,0
|
||||
access_weak_course_all,weak_course,model_weak_course,odex_benefit.group_benefit_info,1,1,1,1
|
||||
|
|
|
|||
|
|
|
@ -40,13 +40,6 @@
|
|||
<field name="category_id" ref="module_category_benefit"/>
|
||||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
||||
</record>
|
||||
|
||||
<record id="group_benefit_edit" model="res.groups">
|
||||
<field name="name">Beneficiaries Edit User</field>
|
||||
<field name="category_id" ref="module_category_benefit"/>
|
||||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
||||
<field name="implied_ids" eval="[(4, ref('group_benefit_info'))]"/>
|
||||
</record>
|
||||
<!-- <record id="group_benefit_officer" model="res.groups">-->
|
||||
<!-- <field name="name">Beneficiaries Officer</field>-->
|
||||
<!-- <field name="category_id" ref="module_category_benefit"/>-->
|
||||
|
|
@ -60,12 +53,6 @@
|
|||
<field name="implied_ids" eval="[(4, ref('group_benefit_info'))]"/>
|
||||
<field name="comment">the user will be able to approve Beneficiaries requests.</field>
|
||||
</record>
|
||||
<record id="group_approval_of_beneficiary_services" model="res.groups">
|
||||
<field name="name">Approval Of Beneficiary Services</field>
|
||||
<field name="category_id" ref="module_category_benefit"/>
|
||||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
||||
<field name="comment">the user will be able to approve Beneficiaries Services.</field>
|
||||
</record>
|
||||
<record id="group_benefit_researcher" model="res.groups">
|
||||
<field name="name">Beneficiaries Researcher</field>
|
||||
<field name="category_id" ref="module_category_benefit"/>
|
||||
|
|
@ -93,21 +80,6 @@
|
|||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
||||
<field name="implied_ids" eval="[(4, ref('group_benefit_info'))]"/>
|
||||
</record>
|
||||
<record id="group_benefit_requests_manager" model="res.groups">
|
||||
<field name="name">Requests Manager</field>
|
||||
<field name="category_id" ref="module_category_benefit"/>
|
||||
<field name="implied_ids" eval="[(4, ref('group_benefit_branch_manager'))]"/>
|
||||
</record>
|
||||
<record id="group_benefit_accounting_accept" model="res.groups">
|
||||
<field name="name">Accounting Accept</field>
|
||||
<field name="category_id" ref="module_category_benefit"/>
|
||||
<!-- <field name="implied_ids" eval="[(4, ref('group_benefit_info'))]"/>-->
|
||||
</record>
|
||||
<record id="group_benefit_bank_info" model="res.groups">
|
||||
<field name="name">Bank Account Information</field>
|
||||
<field name="category_id" ref="module_category_benefit"/>
|
||||
<field name="implied_ids" eval="[(4, ref('group_benefit_info'))]"/>
|
||||
</record>
|
||||
<record id="group_benefit_accountant_accept" model="res.groups">
|
||||
<field name="name">Service Request Accountant Accept</field>
|
||||
<field name="category_id" ref="odex25_account_payment_fix.module_category_payment_access"/>
|
||||
|
|
@ -118,10 +90,6 @@
|
|||
<field name="category_id" ref="odex25_account_payment_fix.module_category_payment_access"/>
|
||||
<!-- <field name="implied_ids" eval="[(4, ref('group_benefit_info'))]"/>-->
|
||||
</record>
|
||||
<record id="group_accept_income_and_expenses" model="res.groups">
|
||||
<field name="name">Accept income and expenses</field>
|
||||
<field name="category_id" ref="module_category_benefit"/>
|
||||
</record>
|
||||
|
||||
<record id="group_otp_manager" model="res.groups">
|
||||
<field name="name">OTP Manager</field>
|
||||
|
|
@ -279,7 +247,7 @@
|
|||
<field name="name">Show All Service Requests</field>
|
||||
<field name="model_id" ref="model_service_request"/>
|
||||
<field name="domain_force">[(1, '=', 1)]</field>
|
||||
<field name="groups" eval="[(4, ref('group_benefit_requests_manager')),(4, ref('group_benefit_supervisor')),(4, ref('group_benefit_accountant_accept')),(4, ref('group_benefit_payment_accountant_accept'))]"/>
|
||||
<field name="groups" eval="[(4, ref('group_benefit_supervisor')),(4, ref('group_benefit_accountant_accept')),(4, ref('group_benefit_payment_accountant_accept'))]"/>
|
||||
<field name="active" eval="True"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -774,7 +774,7 @@
|
|||
<!--Benefit Menus-->
|
||||
<!--###########################################################-->
|
||||
<menuitem id="benefits_root_menu" name="Benefit Management"
|
||||
web_icon="odex_benefit,static/description/icon1.png" groups="odex_benefit.group_benefit_info,odex_benefit.group_benefit_edit,odex_benefit.group_benefit_manager,odex_benefit.group_benefit_researcher,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_branch_manager"/>
|
||||
web_icon="odex_benefit,static/description/icon1.png" groups="odex_benefit.group_benefit_info,odex_benefit.group_benefit_manager,odex_benefit.group_benefit_researcher,odex_benefit.group_benefit_woman_commitee,odex_benefit.group_benefit_branch_manager"/>
|
||||
<!-- <menuitem id="benefits_root_menu" name="Benefit Management"/>-->
|
||||
<!--#ملفات المستفيدين-->
|
||||
<menuitem id="benefit_main_menu" name="Benefit Managements"
|
||||
|
|
@ -874,13 +874,6 @@
|
|||
parent="benefit_vehicle_model_settings_menu"
|
||||
action="visits_types_action"
|
||||
sequence="9"
|
||||
/>
|
||||
<menuitem
|
||||
id="menu_survey_setting"
|
||||
name="Survey Setting"
|
||||
parent="benefit_vehicle_model_settings_menu"
|
||||
action="survey_setting_action"
|
||||
sequence="100"
|
||||
/>
|
||||
<menuitem
|
||||
id="menu_suspend_reason"
|
||||
|
|
@ -1007,7 +1000,7 @@
|
|||
<menuitem id="loan_giver_menu" name="Loan Giver"
|
||||
parent="menu_benefits_config_benefits" action="loan_giver_action" sequence="9"/>
|
||||
<menuitem id="loan_reason_menu" name="Loan Reason"
|
||||
parent="menu_benefits_config_benefits" action="loan_reason_action" sequence="10"/>
|
||||
parent="menu_benefits_config_others" action="loan_reason_action" sequence="10"/>
|
||||
<!-- <menuitem id="sport_type_menu" name="Sport Type"-->
|
||||
<!-- parent="menu_benefits_config_benefits" action="sport_type_action" sequence="5"/>-->
|
||||
<!-- <menuitem id="needs_categories_menu" name="Needs Categories"-->
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
<group>
|
||||
<field name="is_benefit" string="Is Benefit" widget="boolean_toggle"/>
|
||||
</group>
|
||||
<group>
|
||||
<group invisible="1">
|
||||
<field name="expenses_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="category_id" invisible="1"/>
|
||||
|
|
@ -990,6 +990,8 @@
|
|||
<group>
|
||||
<group>
|
||||
<field name="branch"/>
|
||||
<field name="manager_id"/>
|
||||
<field name="operation_manager_id"/>
|
||||
<field name="branch_type"/>
|
||||
</group>
|
||||
<group>
|
||||
|
|
@ -1009,6 +1011,9 @@
|
|||
<tree>
|
||||
<field name="branch" context="{'hierarchical_naming': False}"/>
|
||||
<field name="branch_type"/>
|
||||
<field name="manager_id"/>
|
||||
<field name="operation_manager_id"/>
|
||||
<field name="has_employees"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -1092,7 +1097,7 @@
|
|||
<!-- <field name="hobby_id"/>-->
|
||||
<!-- <field name="diseases_id"/>-->
|
||||
<!-- <field name="disabilities_id"/>-->
|
||||
<field name="is_mother_salary"/>
|
||||
<field name="is_mother_salary" attrs="{'invisible':[('attach_type','!=','income_attach')]}"/>
|
||||
<field name="is_required"/>
|
||||
<field name="is_default"/>
|
||||
<field name="show_in_portal"/>
|
||||
|
|
@ -1526,13 +1531,13 @@
|
|||
<sheet>
|
||||
<div class="oe_title">
|
||||
<h1>
|
||||
<field placeholder="Name" name="name" class="oe_inline"/>
|
||||
<field placeholder="Contract Number" name="name" class="oe_inline"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="landlord_type"/>
|
||||
<field name="family_id"/>
|
||||
<field name="family_id" invisible="1"/>
|
||||
<field name="member_id" attrs="{'invisible': [('landlord_type', '!=', 'member')]}"/>
|
||||
<field name="contract_type"/>
|
||||
<field name="start_date"/>
|
||||
|
|
|
|||
|
|
@ -483,7 +483,7 @@
|
|||
/>
|
||||
<button name="action_edit_info" type="object"
|
||||
string="Open Edit Info" class="btn btn-info"
|
||||
groups="odex_benefit.group_benefit_edit"
|
||||
groups="odex_benefit.group_benefit_researcher"
|
||||
states="second_approve"
|
||||
confirm="Are you sure you want to open info edition !"
|
||||
/>
|
||||
|
|
@ -1772,8 +1772,7 @@
|
|||
attrs="{'readonly': [('state', '=', 'black_list')]}"/>
|
||||
<field name="black_list_message"/>
|
||||
</page>
|
||||
<page string="Bank Account Information"
|
||||
groups="odex_benefit.group_benefit_bank_info,odex_benefit.group_benefit_branch_manager">
|
||||
<page string="Bank Account Information">
|
||||
<group>
|
||||
<group>
|
||||
<field name="is_family_member"
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
<group>
|
||||
<field name="name"/>
|
||||
<field name="branch_custom_id"/>
|
||||
<field name="branch_id"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="type" required="1"/>
|
||||
|
|
|
|||
|
|
@ -141,6 +141,7 @@
|
|||
domain="[('location_type', '=', relationn_type in ['mother','replacement_mother'] and 'mother_location' or 'member')]"
|
||||
options="{'no_create': True, 'no_create_edit': True}"
|
||||
attrs="{'readonly':[('state','not in',['draft','complete_info'])]}"/>
|
||||
<field name="exit_benefit_date" readonly="1" force_save="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="age" readonly="1" required="1" force_save="1"/>
|
||||
|
|
@ -306,7 +307,8 @@
|
|||
<field name="attachment_ids" mode="tree" options="{'no_open': True}"
|
||||
widget="one2many_list">
|
||||
<tree editable="bottom">
|
||||
<field name="name" string="Attachment Name"/>
|
||||
<field name="name" string="Attachment Name" force_save="1"
|
||||
attrs="{'readonly':[('is_default','=',True)]}"/>
|
||||
<field name="datas" string="File content"
|
||||
attrs="{'readonly':[('parent.state','not in',['draft','complete_info'])]}"/>
|
||||
<button name="action_preview_attachment" type="object" icon="fa-search-plus"
|
||||
|
|
@ -315,8 +317,13 @@
|
|||
attrs="{'readonly':[('parent.state','not in',['draft','complete_info'])]}"/>
|
||||
<field name="attach_status"
|
||||
attrs="{'readonly':[('parent.state','not in',['draft','complete_info'])]}"/>
|
||||
<field name="allow_days"/>
|
||||
<field name="member_id" invisible="1"/>
|
||||
<field name="is_default" invisible="1"/>
|
||||
<field name="benefit_id" invisible="1"/>
|
||||
<field name="is_required" invisible="1"/>
|
||||
<field name="file_size" invisible="1"/>
|
||||
<field name="attach_id" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
|
|
@ -334,6 +341,7 @@
|
|||
<field name="name" force_save="1"/>
|
||||
<field name="relationn"/>
|
||||
<field name="member_location_conf"/>
|
||||
<field name="exit_benefit_date"/>
|
||||
<field name="member_status" widget="badge"
|
||||
decoration-success="member_status == 'benefit'"
|
||||
decoration-danger="member_status == 'non_benefit'" string="Is Benefit?"/>
|
||||
|
|
|
|||
|
|
@ -84,12 +84,10 @@
|
|||
readonly="1"/>
|
||||
<field name="family_domain_ids" widget="many2many_tags" invisible="1"/>
|
||||
<field name="payment_order_id" readonly="1" invisible="1"
|
||||
groups="odex_benefit.group_benefit_accounting_accept"
|
||||
attrs="{
|
||||
'invisible': [('payment_order_id', '=', False)],
|
||||
'readonly': [('state', '!=', 'draft')]}"/>
|
||||
<field name="vendor_bill" invisible="1" readonly="1"
|
||||
groups="odex_benefit.group_benefit_accounting_accept"
|
||||
attrs="{
|
||||
'invisible': [('vendor_bill', '=', False)],
|
||||
'readonly': [('state', '!=', 'draft')]}"
|
||||
|
|
|
|||
|
|
@ -102,15 +102,14 @@
|
|||
<button name="action_accounting_approve" type="object" invisible="1"
|
||||
string="Accounting Approve" class="oe_highlight"
|
||||
confirm="Are you sure you want to approve ?"
|
||||
states="accounting_approve" groups="odex_benefit.group_benefit_accounting_accept"/>
|
||||
states="accounting_approve"/>
|
||||
<button name="action_first_refuse" type="object"
|
||||
string="Return the request to the specialist" class="btn btn-warning"
|
||||
states="accounting_approve"
|
||||
groups="odex_benefit.group_benefit_accounting_accept"/>
|
||||
/>
|
||||
<button name="action_refuse" type="object"
|
||||
string="Refuse" class="btn btn-danger"
|
||||
states="accounting_approve"
|
||||
groups="odex_benefit.group_benefit_accounting_accept"
|
||||
/>
|
||||
<button name="action_processed" type="object"
|
||||
string="Processed" class="oe_highlight"
|
||||
|
|
@ -221,7 +220,7 @@
|
|||
attrs="{'invisible':[('state','in',['draft','researcher','waiting_approve','first_approve','gm_assistant'])]}"/>
|
||||
<field name="payment_order_id" readonly="1"
|
||||
attrs="{'invisible':[('payment_order_id','=',False)]}"
|
||||
groups="odex_benefit.group_benefit_accounting_accept"/>
|
||||
/>
|
||||
<field name="vendor_bill" invisible="1"/>
|
||||
<field name="is_service_producer" invisible="1"/>
|
||||
<field name="service_producer_id" force_save="1"
|
||||
|
|
@ -337,40 +336,19 @@
|
|||
attrs="{'required':[('service_type','=','rent')]}"/>
|
||||
<!--Family Rent-->
|
||||
<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"/>
|
||||
|
||||
<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"/>
|
||||
<!--Member Rent-->
|
||||
<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"/>
|
||||
</group>
|
||||
<group attrs="{'invisible':[('benefit_type','!=','family')]}">
|
||||
|
|
@ -489,8 +467,8 @@
|
|||
<field name="sub_service_category" invisible="1"/>
|
||||
<field name="service_cat"/>
|
||||
<field name="requested_service_amount"/>
|
||||
<field name="payment_order_id" invisible="1" groups="odex_benefit.group_benefit_accounting_accept"/>
|
||||
<field name="vendor_bill" invisible="1" groups="odex_benefit.group_benefit_accounting_accept"/>
|
||||
<field name="payment_order_id" invisible="1"/>
|
||||
<field name="vendor_bill" invisible="1"/>
|
||||
<field name="state" widget="badge" decoration-success="state in ['gm_assistant']"
|
||||
decoration-muted="state == 'draft'"
|
||||
decoration-danger="state in ['refused']"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ access_benefit_researcher_record,access_benefit_researcher_record,model_grant_be
|
|||
access_benefit_woman_commitee_record,access_benefit_record,model_grant_benefit,odex_benefit.group_benefit_woman_commitee,1,1,1,1
|
||||
access_benefit_branch_manager_record,access_benefit_branch_manager_record,model_grant_benefit,odex_benefit.group_benefit_branch_manager,1,1,1,1
|
||||
access_benefit_manager_record,access_benefit_manager_record,model_grant_benefit,odex_benefit.group_benefit_manager,1,1,1,1
|
||||
access_benefit_edit_record,access_benefit_edit_record,model_grant_benefit,odex_benefit.group_benefit_edit,1,1,1,1
|
||||
access_benefit_family_record,access_benefit_family_record,model_benefit_family,,1,1,1,0
|
||||
access_benefit_record_city,access_benefit_record_city,model_res_country_city,,1,1,0,0
|
||||
access_benefit_record_reason,access_benefit_record_reason,model_entity_refuse_reason,,1,1,1,0
|
||||
|
|
|
|||
|
Loading…
Reference in New Issue