add filter and search loan

This commit is contained in:
Bakry 2024-08-12 16:25:04 +03:00
parent 91e1431b85
commit 92df1b18bc
3 changed files with 47 additions and 13 deletions

View File

@ -238,6 +238,8 @@ msgstr "تاريخ بداية الاقساط الشهرية"
#. module: hr_loans_salary_advance
#: model:ir.model.fields,field_description:hr_loans_salary_advance.field_hr_loan_salary_advance__department_id
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.hr_loan_salary_advance_filter
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
msgid "Department"
msgstr "الهيكل الإداري"
@ -271,6 +273,7 @@ msgstr "سلفة مستحقة الدفع"
#: code:addons/hr_loans_salary_advance/report/loan_payslip_monthly_report.py:0
#: model:ir.model.fields,field_description:hr_loans_salary_advance.field_hr_loan_payment_suspension__employee_id
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.hr_loan_salary_advance_filter
#, python-format
msgid "Employee"
msgstr "الموظف"
@ -667,6 +670,9 @@ msgstr "دفع/إعادة جدولة السلفة"
#. module: hr_loans_salary_advance
#: model:ir.model.fields,field_description:hr_loans_salary_advance.field_loan_request_type__loan_type
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.hr_loan_salary_advance_filter
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_request_type_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loans_request_type_tree_view
msgid "Loan Type"
msgstr "نوع السلفة"
@ -696,12 +702,6 @@ msgstr "اسم السلفة"
msgid "Code"
msgstr "الرمز"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_request_type_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loans_request_type_tree_view
msgid "Loan type"
msgstr "نوع السلفة"
#. module: hr_loans_salary_advance
#: model:ir.model.fields,field_description:hr_loans_salary_advance.field_payslip_monthly_report__loan_ids
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payslip_xslx_report_form
@ -1502,11 +1502,6 @@ msgstr "يجب انشاء اقساط السلفة"
msgid "contract Start Date"
msgstr "تاريخ بداية العقد"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
msgid "department"
msgstr "الهيكل الإداري"
#. module: hr_loans_salary_advance
#: model:ir.model,name:hr_loans_salary_advance.model_employee_reward_loan
msgid "employee.reward.loan"
@ -1762,3 +1757,16 @@ msgid "Sorry, Approved Amount Must Be Greater Than Zero"
msgstr "عفوآ, المبلغ المصدق يجب ان يكون اكبر من صفر"
#. module: hr_loans_salary_advance
#: model:ir.model.fields,help:hr_loans_salary_advance.field_hr_loan_salary_advance__employee_no
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_tree_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.hr_loan_salary_advance_filter
msgid "Employee Number"
msgstr "رقم الموظف"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.hr_loan_salary_advance_filter
msgid "My Requests"
msgstr "طلبـاتي"

View File

@ -45,11 +45,12 @@ class HrSalaryAdvance(models.Model):
# Relational fields
company_id = fields.Many2one('res.company', default=lambda self: self.env.company)
job_id = fields.Many2one(related='employee_id.job_id', readonly=True)
department_id = fields.Many2one(related='employee_id.department_id', readonly=True)
department_id = fields.Many2one(related='employee_id.department_id', readonly=True, store=True)
deduction_lines = fields.One2many('loan.installment.line', 'deduction_line')
moves_ids = fields.One2many('hr.account.moves', 'moves_id')
employee_id = fields.Many2one('hr.employee', 'Employee',
default=lambda item: item.get_user_id(), index=True, domain=[('state', '=', 'open')])
employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True)
request_type = fields.Many2one('loan.request.type')
emp_hiring_date = fields.Date(related='employee_id.contract_id.hiring_date')

View File

@ -5,6 +5,7 @@
<field name="name">Employee loan salary advance</field>
<field name="res_model">hr.loan.salary.advance</field>
<field name="view_mode">tree,form</field>
<field name= "context">{"search_default_my_request":1}</field>
</record>
<record model="ir.ui.view" id="employee_loan_salary_form_view">
<field name="name">Employee loan salary advance</field>
@ -56,6 +57,7 @@
attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="employee_id" string="Employee Name"
attrs="{'readonly':['|',('state','!=','draft'),('from_hr_depart','=',False)],'required':True}"/>
<field name="employee_no" string="Employee Number" readonly="1"/>
<field name="request_type" string="Request Type" required="True"
attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="date" string="Date Request" required="True"
@ -151,9 +153,10 @@
<field name="arch" type="xml">
<tree decoration-success="state=='closed'" decoration-danger="state == 'refused'"
decoration-info="state == 'draft'" string="Employee official mission">
<field name="employee_no" string="Employee Number"/>
<field name="employee_id" string="Employee Id"/>
<field name="code" string="Code"/>
<field name="request_type" string="Request Type"/>
<field name="employee_id" string="Employee Id"/>
<field name="date" string="Date"/>
<field name="gm_propos_amount"/>
<field name="state"/>
@ -161,6 +164,28 @@
</field>
</record>
<!--penalty_register_filter -->
<record id="hr_loan_salary_advance_filter" model="ir.ui.view">
<field name="name">Employee loan salary advance</field>
<field name="model">hr.loan.salary.advance</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search>
<field name="employee_id"/>
<field name="employee_no"/>
<field name="department_id" />
<group expand="0" string="Group By">
<filter name="group_employee" string="Employee" domain="[]" context="{'group_by': 'employee_id'}"/>
<filter name="group_loan" string="Loan Type" domain="[]" context="{'group_by': 'request_type'}"/>
<filter name="group_department" string="Department" domain="[]" context="{'group_by': 'department_id'}"/>
</group>
<separator/>
<filter string="My Requests" name="my_request" domain="[('employee_id.user_id', '=', uid)]"/>
<separator/>
</search>
</field>
</record>
<!-- Loans menu -->
<menuitem id="loans_menu_id" name="Employee Loans" parent="hr.menu_hr_root" sequence="3"/>
<menuitem name="Loans/Salary Advance" id="employee_loan_salary_menu_item"