[16.0][MIG] hr_timesheet_sheet

hr_timesheet_sheet/__manifest__.py

@@ -6,7 +6,7 @@
 
 {
     "name": "HR Timesheet Sheet",
-    "version": "15.0.1.1.0",
+    "version": "16.0.1.0.0",
     "category": "Human Resources",
     "sequence": 80,
     "summary": "Timesheet Sheets, Activities",
@@ -26,10 +26,4 @@
         "views/account_analytic_line_views.xml",
         "views/res_config_settings_views.xml",
     ],
-    "assets": {
-        "web.assets_backend": [
-            "hr_timesheet_sheet/static/src/js/backend.js",
-            "hr_timesheet_sheet/static/src/scss/backend.scss",
-        ]
-    },
 }

hr_timesheet_sheet/models/account_analytic_line.py

@@ -56,7 +56,7 @@ def _check_company_id_sheet_id(self):
                     )
                 )
 
-    @api.model
+    @api.model_create_multi
     def create(self, values):
         if not self.env.context.get("sheet_create") and "sheet_id" in values:
             del values["sheet_id"]

hr_timesheet_sheet/models/hr_timesheet_sheet.py

@@ -149,15 +149,22 @@ def _default_department_id(self):
     add_line_project_id = fields.Many2one(
         comodel_name="project.project",
         string="Select Project",
+        domain="[('company_id', '=', company_id), ('allow_timesheets', '=', True)]",
         help="If selected, the associated project is added "
         "to the timesheet sheet when clicked the button.",
     )
     add_line_task_id = fields.Many2one(
         comodel_name="project.task",
         string="Select Task",
+        domain="[('id', 'in', available_task_ids)]",
         help="If selected, the associated task is added "
         "to the timesheet sheet when clicked the button.",
     )
+    available_task_ids = fields.Many2many(
+        comodel_name="project.task",
+        string="Available Tasks",
+        compute="_compute_available_task_ids",
+    )
     total_time = fields.Float(compute="_compute_total_time", store=True)
     can_review = fields.Boolean(
         compute="_compute_can_review", search="_search_can_review"
@@ -443,25 +450,26 @@ def _onchange_dates(self):
     def _onchange_timesheets(self):
         self._compute_line_ids()
 
-    @api.onchange("add_line_project_id")
-    def onchange_add_project_id(self):
-        """Load the project to the timesheet sheet"""
-        if self.add_line_project_id:
-            return {
-                "domain": {
-                    "add_line_task_id": [
-                        ("project_id", "=", self.add_line_project_id.id),
-                        ("company_id", "=", self.company_id.id),
-                        ("id", "not in", self.timesheet_ids.mapped("task_id").ids),
+    @api.depends(
+        "add_line_project_id", "company_id", "timesheet_ids", "timesheet_ids.task_id"
+    )
+    def _compute_available_task_ids(self):
+        project_task_obj = self.env["project.task"]
+        for rec in self:
+            if rec.add_line_project_id:
+                rec.available_task_ids = project_task_obj.search(
+                    [
+                        ("project_id", "=", rec.add_line_project_id.id),
+                        ("company_id", "=", rec.company_id.id),
+                        ("id", "not in", rec.timesheet_ids.mapped("task_id").ids),
                     ]
-                }
-            }
-        else:
-            return {"domain": {"add_line_task_id": [("id", "=", False)]}}
+                ).ids
+            else:
+                rec.available_task_ids = []
 
     @api.model
     def _check_employee_user_link(self, vals):
-        if "employee_id" in vals:
+        if vals.get("employee_id"):
             employee = self.env["hr.employee"].sudo().browse(vals["employee_id"])
             if not employee.user_id:
                 raise UserError(
@@ -479,10 +487,11 @@ def copy(self, default=None):
             raise UserError(_("You cannot duplicate a sheet."))
         return super().copy(default=default)
 
-    @api.model
-    def create(self, vals):
-        self._check_employee_user_link(vals)
-        res = super().create(vals)
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            self._check_employee_user_link(vals)
+        res = super().create(vals_list)
         res.write({"state": "draft"})
         return res
 

hr_timesheet_sheet/readme/INSTALL.rst

@@ -1,4 +1,4 @@
 This module relies on:
 
 * The OCA module '2D matrix for x2many fields', and can be downloaded from
-  Github: https://github.com/OCA/web/tree/11.0/web_widget_x2many_2d_matrix
+  Github: https://github.com/OCA/web/tree/16.0/web_widget_x2many_2d_matrix

hr_timesheet_sheet/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">HR Timesheet Sheet</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/timesheet/tree/15.0/hr_timesheet_sheet"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/timesheet-15-0/timesheet-15-0-hr_timesheet_sheet"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/117/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/timesheet/tree/16.0/hr_timesheet_sheet"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-hr_timesheet_sheet"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/117/16.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module supplies a new screen enabling you to manage your work encoding
 (timesheet) by period. Timesheet entries are made by employees each day. At the
 end of the defined period, employees submit their validated sheet and the
@@ -466,7 +466,7 @@ <h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/timesheet/tree/15.0/hr_timesheet_sheet">OCA/timesheet</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/timesheet/tree/16.0/hr_timesheet_sheet">OCA/timesheet</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

hr_timesheet_sheet/tests/test_hr_timesheet_sheet.py

@@ -8,7 +8,7 @@
 from dateutil.relativedelta import relativedelta
 
 from odoo import fields
-from odoo.exceptions import AccessError, UserError, ValidationError
+from odoo.exceptions import UserError, ValidationError
 from odoo.tests.common import Form, TransactionCase
 
 from ..models.hr_timesheet_sheet import empty_name
@@ -952,7 +952,7 @@ def test_15(self):
         analytic_account = sheet.timesheet_ids.account_id
         self.assertEqual(analytic_account.company_id, self.company)
 
-        with self.assertRaises(AccessError):
+        with self.assertRaises(UserError):
             analytic_account.company_id = self.company_2
 
     def test_16(self):
@@ -983,8 +983,8 @@ def test_16(self):
         )
         sheet_form = Form(self.sheet_model.with_user(self.user))
         sheet_form.employee_id = new_employee
-        sheet_form.department_id = self.department_model
         sheet_no_department = sheet_form.save()
+        sheet_no_department.department_id = self.department_model
         self.assertFalse(sheet_no_department.department_id)
         sheet_no_department._onchange_employee_id()
         self.assertTrue(sheet_no_department.department_id)
@@ -1029,8 +1029,8 @@ def test_employee_no_user(self):
     def test_workflow(self):
         sheet = Form(self.sheet_model.with_user(self.user)).save()
 
-        self.sheet_model.with_user(self.user).fields_view_get(view_type="form")
-        self.sheet_model.with_user(self.user).fields_view_get(view_type="tree")
+        self.sheet_model.with_user(self.user).get_view(view_type="form")
+        self.sheet_model.with_user(self.user).get_view(view_type="tree")
 
         with self.assertRaises(UserError):
             sheet.with_user(self.user_3).action_timesheet_refuse()

hr_timesheet_sheet/views/hr_department_views.xml

@@ -18,18 +18,18 @@
         <field name="name">hr.department.kanban.inherit</field>
         <field name="model">hr.department</field>
         <field name="inherit_id" ref="hr.hr_department_view_kanban" />
-        <field
-            name="groups_id"
-            eval="[(4,ref('hr_timesheet.group_hr_timesheet_user'))]"
-        />
         <field name="arch" type="xml">
             <xpath expr="//templates" position="before">
-                <field name="timesheet_sheet_to_approve_count" />
+                <field
+                    name="timesheet_sheet_to_approve_count"
+                    groups="hr_timesheet.group_hr_timesheet_user"
+                />
             </xpath>
             <xpath expr="//div[hasclass('o_kanban_primary_right')]" position="inside">
                 <div
                     t-if="record.timesheet_sheet_to_approve_count.raw_value > 0"
                     class="row"
+                    groups="hr_timesheet.group_hr_timesheet_user"
                 >
                     <div class="col-xs-9">
                         <a
@@ -45,7 +45,7 @@
                 </div>
             </xpath>
             <xpath expr="//div[hasclass('o_kanban_manage_reports')]" position="inside">
-                <div class="row">
+                <div class="row" groups="hr_timesheet.group_hr_timesheet_user">
                     <div class="col-xs-12 text-left">
                         <a
                             name="%(hr_timesheet_sheet.hr_timesheet_action_from_department)d"

hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml

@@ -101,11 +101,7 @@
                                 /> to <field name="date_end" class="oe_inline" /></div>
                         </group>
                         <group name="details">
-                            <field
-                                name="company_id"
-                                groups="base.group_multi_company"
-                                force_save="1"
-                            />
+                            <field name="company_id" force_save="1" />
                             <field name="department_id" invisible="1" />
                         </group>
                     </group>
@@ -148,10 +144,8 @@
                                     class="oe_edit_only"
                                     attrs="{'invisible': [('state', 'not in', ['new', 'draft'])]}"
                                 >
-                                    <field
-                                        name="add_line_project_id"
-                                        domain="[('company_id', '=', company_id), ('allow_timesheets', '=', True)]"
-                                    />
+                                    <field name="add_line_project_id" />
+                                    <field name="available_task_ids" invisible="1" />
                                     <field
                                         name="add_line_task_id"
                                         attrs="{'invisible': [('add_line_project_id', '=', False)]}"
@@ -160,6 +154,7 @@
                                     <button
                                         name="button_add_line"
                                         type="object"
+                                        colspan="2"
                                         string="Add new line"
                                         class="oe_highlight"
                                         attrs="{'invisible': [('add_line_project_id', '=', False)]}"

hr_timesheet_sheet/views/res_config_settings_views.xml

@@ -43,7 +43,7 @@
                     </div>
                     <div
                         class="col-xs-12 col-md-6 o_setting_box"
-                        attrs="{'invisible':[('sheet_range','!=',2)], 'required':[('sheet_range','=',2)]}"
+                        attrs="{'invisible':[('sheet_range','!=','WEEKLY')], 'required':[('sheet_range','=','WEEKLY')]}"
                     >
                         <div class="o_setting_right_pane">
                             <label for="timesheet_week_start" />