Merge pull request #70 from hbrunn/14.0-528-klippa-expense-ou

[IMP] #528 ps_klippa: set expense OU from employee's default OU

Author: Stephanvandenberg

ps_expense/models/hr_expense.py

@@ -26,9 +26,10 @@ def action_move_create(self):
 
     def _create_sheet_from_expenses(self):
         """Allow creating expense sheet from expenses without product"""
+        self = self.with_context(
+            default_operating_unit_id=self.mapped("operating_unit_id")[:1].id
+        )
         result = super()._create_sheet_from_expenses()
-        if not result.operating_unit_id:
-            result.operating_unit_id = self.mapped("operating_unit_id")[:1]
         return result
 
     def action_view_sheet(self):

ps_klippa/models/hr_expense.py

@@ -10,6 +10,7 @@ class HrExpense(models.Model):
     @api.model
     def _klippa_update_expenses(self):
         user = self.env.ref("ps_klippa.user_klippa")
+
         for this in self.search(
             [
                 ("create_uid", "=", user.id),
@@ -18,7 +19,8 @@ def _klippa_update_expenses(self):
                 ("analytic_account_id", "!=", False),
             ]
         ):
-            this.operating_unit_id = this.analytic_account_id.operating_unit_ids.ids[:1]
+            this.operating_unit_id = this.analytic_account_id.operating_unit_ids[:1]
+
         for row in self.read_group(
             [
                 ("create_uid", "=", user.id),
@@ -30,6 +32,15 @@ def _klippa_update_expenses(self):
             lazy=False,
         ):
             expenses = self.search(row["__domain"])
+            expense_user = expenses.employee_id.user_id
+            ou = expense_user.with_company(
+                expense_user.company_id
+            ).operating_unit_default_get(expense_user.id)
+            expenses.write(
+                {
+                    "operating_unit_id": ou.id,
+                }
+            )
             sheet = expenses._create_sheet_from_expenses()
             sheet.name = expenses[0].name
             sheet.action_submit_sheet()

ps_klippa/tests/test_ps_klippa.py

@@ -7,6 +7,8 @@ def test_ps_klippa(self):
         demo_expenses = self.env.ref("ps_klippa.expense_demo1") + self.env.ref(
             "ps_klippa.expense_demo2"
         )
+        demo_ou = self.env.ref("operating_unit.b2c_operating_unit")
+        self.env.ref("base.user_demo").default_operating_unit_id = demo_ou
         demo_expenses_other = self.env.ref("ps_klippa.expense_demo3")
         chs_expense = self.env.ref("ps_klippa.expense_chs")
         all_expenses = demo_expenses + demo_expenses_other + chs_expense
@@ -20,6 +22,7 @@ def test_ps_klippa(self):
         self.assertEqual(len(sheets), 3)
         self.assertEqual(demo_expenses[0].name, demo_expenses[1].sheet_id.name)
         self.assertEqual(set(sheets.mapped("state")), {"submit"})
+        self.assertIn(demo_ou, sheets.operating_unit_id)
         new_expenses = sum(
             (expense.copy() for expense in demo_expenses), self.env["hr.expense"]
         )

ps_landing_page/models/hr_employee_landing_page.py

@@ -23,7 +23,10 @@ def _compute_all(self):
             AND type_id = (SELECT id FROM date_range_type WHERE calender_week = true)
             LIMIT 1"""
         )
-        current_week_id = self.env.cr.fetchone()[0]
+        try:
+            current_week_id = self.env.cr.fetchone()[0]
+        except TypeError:
+            current_week_id = 0
 
         next_week_id = self.get_upcoming_week()
         if current_week_id == next_week_id.id or current_week_id < next_week_id.id:

ps_planning/wizards/ps_planning_report_wizard.py

@@ -31,7 +31,10 @@ def action_open_report(self):
         _get_work_days = ContractedLine._get_work_days_dates
         mtd_fraction = _get_work_days(
             self.reference_date.replace(day=1), self.reference_date
-        ) / _get_work_days(month.date_start, month.date_end)
+        ) / _get_work_days(
+            month.date_start or self.reference_date.replace(day=1),
+            month.date_end or self.reference_date,
+        )
         for project in self.env["project.project"].search(
             [("ps_contracted_line_ids", "!=", False)]
         ):
@@ -75,8 +78,14 @@ def action_open_report(self):
                     TimeLine.search(
                         [
                             ("task_id.project_id", "=", project.id),
-                            ("date", ">=", month.date_start.replace(month=1, day=1)),
-                            ("date", "<", month.date_start),
+                            (
+                                "date",
+                                ">=",
+                                (month.date_start or self.reference_date).replace(
+                                    month=1, day=1
+                                ),
+                            ),
+                            ("date", "<", month.date_start or self.reference_date),
                             ("product_uom_id", "=", uom_hours.id),
                         ]
                     ).mapped(lambda x: x.unit_amount / 8)
@@ -87,9 +96,15 @@ def action_open_report(self):
                             (
                                 "range_id.date_start",
                                 ">=",
-                                month.date_start.replace(month=1, day=1),
+                                (month.date_start or self.reference_date).replace(
+                                    month=1, day=1
+                                ),
+                            ),
+                            (
+                                "range_id.date_end",
+                                "<",
+                                month.date_start or self.reference_date,
                             ),
-                            ("range_id.date_end", "<", month.date_start),
                             ("task_id.project_id", "=", project.id),
                             ("line_type", "=", "contracted"),
                         ]

ps_planning/wizards/ps_planning_wizard.py

@@ -234,8 +234,8 @@ class PsPlanningWizardLine(models.TransientModel):
     y_axis_display = fields.Char()
     range_id = fields.Many2one("date.range")
     days = fields.Float()
-    planning_line_id = fields.Many2one("ps.planning.line")
-    contracted_line_id = fields.Many2one("ps.contracted.line")
+    planning_line_id = fields.Many2one("ps.planning.line", ondelete="cascade")
+    contracted_line_id = fields.Many2one("ps.contracted.line", ondelete="cascade")
     line_type = fields.Char()
     state = fields.Char()
     task_id = fields.Many2one("project.task")

ps_timesheet_invoicing/demo/date_range.xml

@@ -6,8 +6,8 @@
             name="create"
             eval="[{
                 'type_id': ref('ps_date_range_week.date_range_calender_week'),
-                'date_start': datetime.now().date() + relativedelta(years=-1, month=1, day=1),
-                'date_end': datetime.now().date() + relativedelta(month=12, day=31),
+                'date_start': '2023-01-01',
+                'date_end': '2024-12-31',
                 'unit_of_time': '2',
                 'duration_count': 1,
                 'count': 104,
@@ -21,8 +21,8 @@
             name="create"
             eval="[{
                 'type_id': ref('account_fiscal_month.date_range_fiscal_month'),
-                'date_start': datetime.now().date() + relativedelta(years=-1, month=1, day=1),
-                'date_end': datetime.now().date() + relativedelta(month=12, day=31),
+                'date_start': '2023-01-01',
+                'date_end': '2024-12-31',
                 'unit_of_time': '1',
                 'duration_count': 1,
                 'count': 24,
@@ -36,8 +36,8 @@
             name="create"
             eval="[{
                 'type_id': ref('ps_timesheet_invoicing.date_range_quarter'),
-                'date_start': datetime.now().date() + relativedelta(years=-1, month=1, day=1),
-                'date_end': datetime.now().date() + relativedelta(month=12, day=31),
+                'date_start': '2023-01-01',
+                'date_end': '2024-12-31',
                 'unit_of_time': '1',
                 'duration_count': 3,
                 'count': 8,