diff --git a/odex25_hr/hr_loans_salary_advance/i18n/ar_001.po b/odex25_hr/hr_loans_salary_advance/i18n/ar_001.po index 8830475f2..cd2235f67 100644 --- a/odex25_hr/hr_loans_salary_advance/i18n/ar_001.po +++ b/odex25_hr/hr_loans_salary_advance/i18n/ar_001.po @@ -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 "طلبـاتي" + diff --git a/odex25_hr/hr_loans_salary_advance/models/hr_loan_salary_advance.py b/odex25_hr/hr_loans_salary_advance/models/hr_loan_salary_advance.py index e5db91c90..62a35dcbc 100644 --- a/odex25_hr/hr_loans_salary_advance/models/hr_loan_salary_advance.py +++ b/odex25_hr/hr_loans_salary_advance/models/hr_loan_salary_advance.py @@ -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') diff --git a/odex25_hr/hr_loans_salary_advance/views/hr_loan_salary_advance.xml b/odex25_hr/hr_loans_salary_advance/views/hr_loan_salary_advance.xml index d0cf28752..a2ac559b6 100644 --- a/odex25_hr/hr_loans_salary_advance/views/hr_loan_salary_advance.xml +++ b/odex25_hr/hr_loans_salary_advance/views/hr_loan_salary_advance.xml @@ -5,6 +5,7 @@ Employee loan salary advance hr.loan.salary.advance tree,form + {"search_default_my_request":1} Employee loan salary advance @@ -56,6 +57,7 @@ attrs="{'readonly':[('state','!=','draft')]}"/> + + + - @@ -161,6 +164,28 @@ + + + Employee loan salary advance + hr.loan.salary.advance + search + + + + + + + + + + + + + + + + +