[MIG] hr_timesheet_holiday: Migration to 15.0

JasminSForgeFlow · JasminSForgeFlow · commit 13758eba7beb · 2024-02-28T09:57:08.000+05:30
diff --git a/hr_timesheet_holiday/README.rst b/hr_timesheet_holiday/README.rst
@@ -75,7 +75,7 @@ Contributors
 * Tom Blauwendraat <tom@sunflowerweb.nl>
 * Terrence Nzaywa <terrence@sunflowerweb.nl>
 * Holger Brunn <hbrunn@therp.nl>
-* Aaron Henriquez <ahenriquez@eficent.com>
+* Aaron Henriquez <aaron.henriquez@forgeflow.com>
 
 Maintainer
 ----------
diff --git a/hr_timesheet_holiday/__manifest__.py b/hr_timesheet_holiday/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "HR Timesheet Holiday",
-    "version": "10.0.1.0.1",
+    "version": "15.0.1.0.0",
     "category": "Generic Modules/Human Resources",
     "summary": """When holidays are granted, add lines to the analytic account
         that is linked to the Leave Type""",
@@ -14,6 +14,7 @@
         "hr_timesheet_sheet",
         "hr_holidays",
         "hr_holidays_settings",
+        "project_timesheet_holidays",
     ],
     "data": [
         "views/hr_holidays_view.xml",
diff --git a/hr_timesheet_holiday/models/__init__.py b/hr_timesheet_holiday/models/__init__.py
@@ -1,5 +1,5 @@
 from . import analytic_account
 from . import analytic_line
 from . import company
-from . import hr_holidays
-from . import hr_holidays_status
+from . import hr_leave
+from . import hr_leave_type
diff --git a/hr_timesheet_holiday/models/analytic_account.py b/hr_timesheet_holiday/models/analytic_account.py
@@ -16,7 +16,7 @@ class AnalyticAccount(models.Model):
         default=False,
     )
     holiday_status_ids = fields.One2many(
-        comodel_name="hr.holidays.status",
+        comodel_name="hr.leave.type",
         inverse_name="analytic_account_id",
     )
 
@@ -26,7 +26,6 @@ def _trigger_project_creation(self, vals):
             return True
         return super(AnalyticAccount, self)._trigger_project_creation(vals)
 
-    @api.multi
     def project_create(self, vals):
         res = super(AnalyticAccount, self).project_create(vals)
         if isinstance(res, (int, float)):
@@ -37,7 +36,6 @@ def project_create(self, vals):
         return res
 
     @api.constrains("is_leave_account", "project_ids")
-    @api.multi
     def _check_account_allow_timesheet(self):
         for aa in self:
             if any(project.allow_timesheets is False for project in aa.project_ids):
diff --git a/hr_timesheet_holiday/models/analytic_line.py b/hr_timesheet_holiday/models/analytic_line.py
@@ -10,7 +10,7 @@ class AnalyticLine(models.Model):
 
     _inherit = "account.analytic.line"
 
-    leave_id = fields.Many2one(comodel_name="hr.holidays", string="Leave id")
+    leave_id = fields.Many2one(comodel_name="hr.leave", string="Leave id")
 
     @api.depends(
         "date",
@@ -25,12 +25,12 @@ def _compute_sheet(self):
         """Links the timesheet line to the corresponding sheet"""
         for ts_line in self:
             if not ts_line.account_id.is_leave_account:
-                super(AnalyticLine, ts_line)._compute_sheet()
+                return super(AnalyticLine, ts_line)._compute_sheet()
             else:
-                sheets = self.env["hr_timesheet_sheet.sheet"].search(
+                sheets = self.env["hr_timesheet.sheet"].search(
                     [
-                        ("date_to", ">=", ts_line.date),
-                        ("date_from", "<=", ts_line.date),
+                        ("date_start", ">=", ts_line.date),
+                        ("date_end", "<=", ts_line.date),
                         ("employee_id.user_id.id", "=", ts_line.user_id.id),
                         ("state", "in", ["draft", "new"]),
                     ]
@@ -39,7 +39,6 @@ def _compute_sheet(self):
                     ts_line.sheet_id_computed = sheets[0]
                     ts_line.sheet_id = sheets[0]
 
-    @api.multi
     def write(self, vals):
         if not self.env.context.get("force_write", False):
             for rec in self:
@@ -51,4 +50,4 @@ def write(self, vals):
                             "Please edit the leave request instead."
                         )
                     )
-        super(AnalyticLine, self).write(vals)
+        return super(AnalyticLine, self).write(vals)
diff --git a/hr_timesheet_holiday/models/company.py b/hr_timesheet_holiday/models/company.py
@@ -9,6 +9,4 @@ class ResCompany(models.Model):
 
     _inherit = "res.company"
 
-    timesheet_hours_per_day = fields.Float(
-        string="Timesheet Hours Per Day", digits=(2, 2), default=8.0
-    )
+    timesheet_hours_per_day = fields.Float(digits=(2, 2), default=8.0)
diff --git a/hr_timesheet_holiday/models/hr_leave.py b/hr_timesheet_holiday/models/hr_leave.py
@@ -7,10 +7,10 @@
 from odoo.exceptions import Warning as UserError
 
 
-class HrHolidays(models.Model):
+class HrLeave(models.Model):
     """Update analytic lines on status change of Leave Request"""
 
-    _inherit = "hr.holidays"
+    _inherit = "hr.leave"
 
     # Timesheet entry linked to this leave request
     analytic_line_ids = fields.One2many(
@@ -19,10 +19,6 @@ class HrHolidays(models.Model):
         string="Analytic Lines",
     )
 
-    def check_no_duplicate_leaves_hook(self, user, date, hours):
-        return
-
-    @api.multi
     def add_timesheet_line(self, description, date, hours, account):
         """Add a timesheet line for this leave"""
         self.ensure_one()
@@ -31,9 +27,6 @@ def add_timesheet_line(self, description, date, hours, account):
             raise UserError(_("No active projects for this Analytic Account"))
         # User exists because already checked during the action_approve
         user = self.employee_id.user_id
-        public = self.check_no_duplicate_leaves_hook(user, date, hours)
-        if public:
-            return
         self.sudo().with_context(force_write=True).write(
             {
                 "analytic_line_ids": [
@@ -66,15 +59,14 @@ def _get_hours_per_day(self, company, employee):
             )
         return hours_per_day
 
-    @api.multi
     def action_approve(self):
         """On grant of leave, add timesheet lines"""
-        res = super(HrHolidays, self).action_approve()
+        res = super(HrLeave, self).action_approve()
 
         # Postprocess Leave Types that have an analytic account configured
         for leave in self:
             account = leave.holiday_status_id.analytic_account_id
-            if not account or leave.type != "remove":
+            if not account:
                 # we only work on leaves (type=remove, type=add is allocation)
                 # which have an account set
                 continue
@@ -92,7 +84,7 @@ def action_approve(self):
                 )
 
             # Add analytic lines for these leave hours
-            leave.analytic_line_ids.sudo(user.id).unlink()  # to be sure
+            leave.analytic_line_ids.with_user(user.id).unlink()  # to be sure
             dt_from = fields.Datetime.from_string(leave.date_from)
             dt_current = dt_from
             at_least_one_complete_day = False
@@ -122,9 +114,8 @@ def action_approve(self):
                 )
         return res
 
-    @api.multi
     def action_refuse(self):
         """On refusal of leave, delete timesheet lines"""
-        res = super(HrHolidays, self).action_refuse()
+        res = super(HrLeave, self).action_refuse()
         self.mapped("analytic_line_ids").with_context(force_write=True).unlink()
         return res
diff --git a/hr_timesheet_holiday/models/hr_leave_type.py b/hr_timesheet_holiday/models/hr_leave_type.py
@@ -4,17 +4,13 @@
 from odoo import fields, models
 
 
-class HrHolidaysStatus(models.Model):
+class HrLeaveType(models.Model):
     """Add project to holiday status"""
 
-    _inherit = "hr.holidays.status"
+    _inherit = "hr.leave.type"
 
     analytic_account_id = fields.Many2one(
         comodel_name="account.analytic.account",
         string="Analytic Account",
-        related="project_id.analytic_account_id",
-    )
-    project_id = fields.Many2one(
-        comodel_name="project.project",
-        string="Project",
+        related="timesheet_project_id.analytic_account_id",
     )
diff --git a/hr_timesheet_holiday/tests/test_all.py b/hr_timesheet_holiday/tests/test_all.py
@@ -8,16 +8,29 @@
 
 from odoo.exceptions import UserError, ValidationError
 
-from odoo.addons.hr_holidays.tests.common import TestHrHolidaysBase
+from odoo.addons.hr_holidays.tests.common import TestHrHolidaysCommon
+from odoo.addons.mail.tests.common import mail_new_test_user
 
 
-class TimesheetHolidayTest(TestHrHolidaysBase):
+class TimesheetHolidayTest(TestHrHolidaysCommon):
     def setUp(self):
         super(TimesheetHolidayTest, self).setUp()
-        self.leave = self.env["hr.holidays"]
+        self.leave = self.env["hr.leave"]
         self.project = self.env["project.project"]
-        self.sheet = self.env["hr_timesheet_sheet.sheet"]
-        self.employee = self.env.ref("hr.employee_qdp")
+        self.sheet = self.env["hr_timesheet.sheet"]
+        # grant analytic account access
+        self.user_hruser.groups_id += self.env.ref("analytic.group_analytic_accounting")
+
+        self.employee_user = mail_new_test_user(
+            self.env, login="Test Emp", groups="base.group_user"
+        )
+        self.employee = self.env["hr.employee"].create(
+            {
+                "name": "Test Employee",
+                "user_id": self.employee_user.id,
+                "department_id": self.rd_dept.id,
+            }
+        )
         self.sl = self.env.ref("hr_holidays.holiday_status_sl")
 
     def _create_timesheet(self, employee, date_from, date_to):
@@ -40,6 +53,7 @@ def test_all(self):
                 "allow_timesheets": False,
             }
         )
+        project._create_analytic_account()
         account = project.analytic_account_id
         with self.assertRaises(ValidationError):
             # Create analytic account
@@ -48,30 +62,29 @@ def test_all(self):
         account.write({"is_leave_account": True})
         # Link sick leave to analytic account
         sl = self.sl
-        sl.write({"project_id": project.id})
+        sl.write({"timesheet_project_id": project.id})
         # Confirm leave and check hours added to account
         hours_before = sum(account.line_ids.mapped("amount"))
-        # Holidays.sudo(self.user_employee_id)
-        hol_empl_grp = self.leave.sudo(self.user_hruser_id)
+        # Holidays.with_user(self.user_employee_id)
+        hol_empl_grp = self.leave.with_user(self.user_hruser_id)
         leave = hol_empl_grp.create(
             {
                 "name": "One week sick leave",
                 "employee_id": self.employee_emp_id,
                 "holiday_status_id": self.sl.id,
                 "date_from": (datetime.today() - relativedelta(days=7)),
                 "date_to": datetime.today(),
-                "number_of_days_temp": 7.0,
             }
         )
         self.assertEqual(
             leave.state,
             "confirm",
             "hr_holidays: newly created leave request should be in " "confirm state",
         )
-        leave.sudo(self.user_hruser_id).action_approve()
+        leave.with_user(self.user_hruser_id).action_approve()
 
         hours_after = sum(account.line_ids.mapped("unit_amount"))
-        self.assertEqual(hours_after - hours_before, 35.0)
+        self.assertEqual(hours_after - hours_before, 28.0)
 
         # Test editing of lines forbidden
         self.assertRaises(
@@ -81,7 +94,7 @@ def test_all(self):
         # Test force editing of lines allowed
         account.line_ids[0].with_context(force_write=True).write({"unit_amount": 5.0})
         hours_after = sum(account.line_ids.mapped("unit_amount"))
-        self.assertEqual(hours_after - hours_before, 33.0)
+        self.assertEqual(hours_after - hours_before, 26.0)
         # Ensure the user_id defined on generated analytic lines is the user
         # set on the employee
         user_employee = self.env["hr.employee"].browse(self.employee_emp_id).user_id
@@ -100,21 +113,21 @@ def test_timesheet(self):
                 "allow_timesheets": True,
             }
         )
+        project._create_analytic_account()
         account = project.analytic_account_id
         account.write({"is_leave_account": True})
         # Link sick leave to analytic account
         sl = self.sl
         sl.write({"analytic_account_id": account.id})
 
-        hol_empl_grp = self.leave.sudo(self.user_employee_id)
+        hol_empl_grp = self.leave.with_user(self.user_employee_id)
         leave = hol_empl_grp.create(
             {
                 "name": "One week sick leave",
                 "employee_id": self.employee_emp_id,
                 "holiday_status_id": self.sl.id,
                 "date_from": time.strftime("1900-01-06"),
                 "date_to": time.strftime("1900-01-12"),
-                "number_of_days_temp": 7.0,
             }
         )
         with self.assertRaises(UserError):
@@ -128,6 +141,7 @@ def test_allocation(self):
                 "allow_timesheets": True,
             }
         )
+        project._create_analytic_account()
         account = project.analytic_account_id
         account.write({"is_leave_account": True})
         # Link sick leave to analytic account
@@ -139,9 +153,7 @@ def test_allocation(self):
                 "holiday_status_id": self.sl.id,
                 "date_from": time.strftime("%Y-%m-06"),
                 "date_to": time.strftime("%Y-%m-12"),
-                "number_of_days_temp": 7.0,
                 "employee_id": self.employee.id,
-                "type": "add",
             }
         )
         leave.action_approve()
@@ -160,26 +172,27 @@ def test_timesheet_half_day(self):
                 "allow_timesheets": False,
             }
         )
+        project._create_analytic_account()
         account = project.analytic_account_id
         project.write({"allow_timesheets": True})
         account.write({"is_leave_account": True})
         # Link sick leave to analytic account
         sl = self.sl
-        sl.write({"project_id": project.id})
+        sl.write({"timesheet_project_id": project.id})
         # Confirm leave and check hours added to account
         hours_before = sum(account.line_ids.mapped("amount"))
-        # Holidays.sudo(self.user_employee_id)
-        hol_empl_grp = self.leave.sudo(self.user_hruser_id)
+        # Holidays.with_user(self.user_employee_id)
+        hol_empl_grp = self.leave.with_user(self.user_hruser_id)
+        leave_date = datetime.today() + (relativedelta(days=10))
         leave = hol_empl_grp.create(
             {
                 "name": "One day and a half sick leave",
                 "employee_id": self.employee_emp_id,
                 "holiday_status_id": self.sl.id,
-                "date_from": (datetime.today() - relativedelta(hours=10.5)),
-                "date_to": datetime.today(),
-                "number_of_days_temp": 1.5,
+                "date_from": leave_date - relativedelta(hours=10.5),
+                "date_to": leave_date,
             }
         )
-        leave.sudo(self.user_hruser_id).action_approve()
+        leave.with_user(self.user_hruser_id).action_approve()
         hours_after = sum(account.line_ids.mapped("unit_amount"))
-        self.assertEqual(hours_after - hours_before, 10.5)
+        self.assertEqual(hours_after - hours_before, 3.5)
diff --git a/hr_timesheet_holiday/views/hr_holidays_view.xml b/hr_timesheet_holiday/views/hr_holidays_view.xml
diff --git a/setup/hr_timesheet_holiday/odoo/__init__.py b/setup/hr_timesheet_holiday/odoo/__init__.py
diff --git a/setup/hr_timesheet_holiday/odoo/addons/__init__.py b/setup/hr_timesheet_holiday/odoo/addons/__init__.py
