diff --git a/odex25_hr/hr_docs_expiry/models/employee_documents.py b/odex25_hr/hr_docs_expiry/models/employee_documents.py index 6061bf20d..6922dc870 100644 --- a/odex25_hr/hr_docs_expiry/models/employee_documents.py +++ b/odex25_hr/hr_docs_expiry/models/employee_documents.py @@ -98,7 +98,7 @@ class HrEmployeeDocument(models.Model): company_id = fields.Many2one('res.company',string="Company", default=lambda self: self.env.user.company_id) - employee_number = fields.Char(related="employee_ref.contract_id.name", copy=False, string='Employee Number') + employee_number = fields.Char(related="employee_ref.emp_no", copy=False, string='Employee Number') def set_last_document(self): 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 317d83568..052539b74 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 @@ -9,7 +9,7 @@ from datetime import datetime, date class HrSalaryAdvance(models.Model): _name = 'hr.loan.salary.advance' - _rec_name = 'code' + _rec_name = 'employee_id' _description = 'Employee Loan' _inherit = ['mail.thread', 'mail.activity.mixin'] @@ -281,7 +281,7 @@ class HrSalaryAdvance(models.Model): else: raise exceptions.Warning(_('Employee %s has no contract') % item.employee_id.name) - @api.depends('deduction_lines') + @api.depends('deduction_lines','deduction_lines.paid') def get_total_paid_installment(self): for item in self: tota_number = 0.0 @@ -291,7 +291,7 @@ class HrSalaryAdvance(models.Model): tota_number += line.installment_amount item.total_paid_inst = tota_number - @api.depends('deduction_lines') + @api.depends('deduction_lines','total_paid_inst') def get_remaining_loan_amount(self): for item in self: item.remaining_loan_amount = item.gm_propos_amount - item.total_paid_inst