Fix bug

odex25_hr/hr_base/models/hr_base.py

@@ -102,7 +102,11 @@ class HrEmployee(models.Model):
     r_name = fields.Char("Name")
 
     # fields of page work information in employees view
-    emp_no = fields.Char(string="Employee number", tracking=True, default=lambda self: self._default_emp_code())
+    emp_no = fields.Char(
+        string="Employee number",
+        tracking=True,
+        default=lambda self: self.env['ir.sequence'].next_by_code('hr.employee')
+    )
     english_name = fields.Char(string="English Name")
     home_no = fields.Char()
     present_address = fields.Char()
@@ -267,8 +271,11 @@ class HrEmployee(models.Model):
                     help='New participants who have no prior periods of contribution under the GOSI.')
     gosi_years = fields.Integer(string="GOSI Years", compute='_compute_gosi_years', store=True,
                                 help='GOSI Years According To The New activation Date Until Today')
+<<<<<<< HEAD
 
     
+=======
+>>>>>>> 5eaada3d742d71839972b574c7532eabc21a7459
     @api.depends('new_gosi')
     def _compute_gosi_years(self):
         for emp in self: