Merge PR #1136 into 15.0

Signed-off-by brian10048

fieldservice_recurring/README.rst

@@ -7,7 +7,7 @@ Field Service Recurring Work Orders
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:98c09c17b602f5380080fbf9508c47fdd5ea41108abe6326e1d9cb8818b6be57
+   !! source digest: sha256:2f025a2b495e312b9abe51d59297a3e4c4535ac887584ab1a64e1064ffeb02dd
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

fieldservice_recurring/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Field Service Recurring Work Orders",
     "summary": "Manage recurring Field Service orders",
-    "version": "15.0.1.0.1",
+    "version": "15.0.2.0.0",
     "category": "Field Service",
     "author": "Brian McMaster, "
     "Open Source Integrators, "
@@ -21,6 +21,7 @@
         "views/fsm_order.xml",
         "views/fsm_recurring_template.xml",
         "views/fsm_recurring.xml",
+        "views/fsm_team.xml",
         "data/recurring_cron.xml",
     ],
     "demo": [

fieldservice_recurring/migrations/15.0.2.0.0/pre-migration.py

@@ -0,0 +1,7 @@
+# Copyright (C) 2022 Raphaël Reverdy <raphael.reverdy@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+
+def migrate(env, version):
+    env.execute("UPDATE fsm_recurring SET state = 'close' WHERE state = 'cancel';")
+    env.execute("UPDATE fsm_recurring SET state = 'progress' WHERE state = 'pending';")

fieldservice_recurring/models/__init__.py

@@ -7,4 +7,5 @@
     fsm_frequency,
     fsm_recurring_template,
     fsm_recurring,
+    fsm_team,
 )

fieldservice_recurring/models/fsm_frequency.py

@@ -1,6 +1,7 @@
 # Copyright (C) 2019 Brian McMaster, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
+import pytz
 from dateutil.rrule import (
     DAILY,
     FR,
@@ -114,18 +115,47 @@ def _check_month_day(self):
                 if not (1 <= rec.month_day <= 31):
                     raise UserError(_("'Day of Month must be between 1 and 31"))
 
-    def _get_rrule(self, dtstart=None, until=None):
+    def _get_rrule(self, dtstart=None, until=None, tz=None):
         self.ensure_one()
         freq = FREQUENCIES[self.interval_type]
-        return rrule(
-            freq,
-            interval=self.interval,
-            dtstart=dtstart,
-            until=until,
-            byweekday=self._byweekday(),
-            bymonth=self._bymonth(),
-            bymonthday=self._bymonthday(),
-            bysetpos=self._bysetpos(),
+        # localize dtstart and until to user timezone
+        tz = pytz.timezone(
+            tz or self._context.get("tz", None) or self.env.user.tz or "UTC"
+        )
+
+        if dtstart:
+            dtstart = pytz.timezone("UTC").localize(dtstart).astimezone(tz)
+        if until:
+            until = pytz.timezone("UTC").localize(until).astimezone(tz)
+            # We force until in the starting timezone to avoid incoherent results
+            until = tz.normalize(until.replace(tzinfo=dtstart.tzinfo))
+
+        return (
+            # Replace original timezone with current date timezone
+            # without changing the time and force it back to UTC,
+            # this will keep the same final time even in case of
+            # daylight saving time change
+            #
+            # for instance recurring weekly
+            # from 2022-03-21 15:00:00+01:00 to 2022-04-11 15:30:00+02:00
+            # will give:
+            #
+            # utc naive -> datetime timezone aware
+            # 2022-03-21 14:00:00 -> 2022-03-21 15:00:00+01:00
+            # 2022-03-28 13:00:00 -> 2022-03-28 15:00:00+02:00
+            date.replace(tzinfo=tz.normalize(date).tzinfo)
+            .astimezone(pytz.UTC)
+            .replace(tzinfo=None)
+            for date in rrule(
+                freq,
+                interval=self.interval,
+                dtstart=dtstart,
+                until=until,
+                byweekday=self._byweekday(),
+                bymonth=self._bymonth(),
+                bymonthday=self._bymonthday(),
+                bysetpos=self._bysetpos(),
+            )
         )
 
     def _byweekday(self):

fieldservice_recurring/models/fsm_frequency_set.py

@@ -36,12 +36,12 @@ class FSMFrequencySet(models.Model):
            that an event can be done""",
     )
 
-    def _get_rruleset(self, dtstart=None, until=None):
+    def _get_rruleset(self, dtstart=None, until=None, tz=None):
         self.ensure_one()
         rset = rruleset()
         for rule in self.fsm_frequency_ids:
             if not rule.is_exclusive:
-                rset.rrule(rule._get_rrule(dtstart, until))
+                rset.rrule(rule._get_rrule(dtstart, until, tz))
             else:
-                rset.exrule(rule._get_rrule(dtstart))
+                rset.exrule(rule._get_rrule(dtstart, tz=tz))
         return rset

fieldservice_recurring/models/fsm_order.py

@@ -29,7 +29,9 @@ def create(self, vals):
         return super().create(vals)
 
     def action_view_fsm_recurring(self):
-        action = self.env.ref("fieldservice_recurring.action_fsm_recurring").read()[0]
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "fieldservice_recurring.action_fsm_recurring"
+        )
         action["views"] = [
             (self.env.ref("fieldservice_recurring.fsm_recurring_form_view").id, "form")
         ]

fieldservice_recurring/models/fsm_recurring.py

@@ -15,7 +15,11 @@ class FSMRecurringOrder(models.Model):
     _inherit = ["mail.thread", "mail.activity.mixin"]
 
     def _default_team_id(self):
-        return self.env.ref("fieldservice.fsm_team_default")
+        return self.env["fsm.team"].search(
+            [["company_id", "in", (self.env.company.id, False)]],
+            limit=1,
+            order="sequence",
+        )
 
     name = fields.Char(
         required=True,
@@ -27,9 +31,8 @@ def _default_team_id(self):
         [
             ("draft", "Draft"),
             ("progress", "In Progress"),
-            ("pending", "To Renew"),
+            ("suspend", "Suspended"),
             ("close", "Closed"),
-            ("cancel", "Cancelled"),
         ],
         readonly=True,
         default="draft",
@@ -79,6 +82,7 @@ def _default_team_id(self):
     person_id = fields.Many2one(
         "fsm.person", string="Assigned To", index=True, tracking=True
     )
+    equipment_ids = fields.Many2many("fsm.equipment")
 
     @api.depends("fsm_order_ids")
     def _compute_order_count(self):
@@ -129,15 +133,12 @@ def action_start(self):
             rec.write({"state": "progress"})
             rec._generate_orders()
 
-    def action_renew(self):
-        return self.action_start()
-
-    def action_cancel(self):
+    def action_suspend(self):
         for order in self.fsm_order_ids.filtered(
             lambda o: o.stage_id.is_closed is False
         ):
             order.action_cancel()
-        return self.write({"state": "cancel"})
+        return self.write({"state": "suspend"})
 
     def _get_rruleset(self):
         self.ensure_one()
@@ -190,6 +191,7 @@ def _prepare_order_values(self, date=None):
             "category_ids": [(6, False, self.fsm_order_template_id.category_ids.ids)],
             "company_id": self.company_id.id,
             "person_id": self.person_id.id,
+            "equipment_ids": [(6, 0, self.equipment_ids.ids)],
         }
 
     def _create_order(self, date):
@@ -231,44 +233,26 @@ def _cron_generate_orders(self):
         """
         return (
             self.env["fsm.recurring"]
-            .search([("state", "in", ("progress", "pending"))])
+            .search([("state", "=", "progress")])
             ._generate_orders()
         )
 
     @api.model
     def _cron_manage_expiration(self):
         """
-        Executed by Cron task to put all 'pending' recurring orders into
+        Executed by Cron task to put all 'in progress' recurring orders into
         'close' stage if it is after their end date or the max orders have
-        been generated.  Next, the 'progress' recurring orders are put in
-        'pending' stage by first checking if the end date is within the next
-        30 days and then checking if the max number of orders will be created
-        within the next 30 days
+        been generated.
         """
         to_close = self.env["fsm.recurring"]
-        pending_rec = self.env["fsm.recurring"].search([("state", "=", "pending")])
-        for rec in pending_rec:
+        open_rec = self.env["fsm.recurring"].search([("state", "=", "progress")])
+        for rec in open_rec:
             if rec.end_date and rec.end_date <= datetime.today():
                 to_close += rec
                 continue
             if rec.max_orders > 0 and rec.fsm_order_count >= rec.max_orders:
                 to_close += rec
         to_close.write({"state": "close"})
-        to_renew = self.env["fsm.recurring"]
-        expire_date = datetime.today() + relativedelta(days=+30)
-        open_rec = self.env["fsm.recurring"].search([("state", "=", "progress")])
-        for rec in open_rec:
-            if rec.end_date and rec.end_date <= expire_date:
-                to_renew += rec
-                continue
-            if rec.max_orders > 0:
-                orders_in_30 = rec.fsm_order_count
-                orders_in_30 += rec.fsm_frequency_set_id._get_rruleset(
-                    until=expire_date
-                ).count()
-                if orders_in_30 >= rec.max_orders:
-                    to_renew += rec
-        to_renew.write({"state": "pending"})
 
     @api.model
     def _cron_scheduled_task(self):

fieldservice_recurring/models/fsm_team.py

@@ -0,0 +1,25 @@
+# Copyright (C) 2022 Raphaël Reverdy (Akretion)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class FSMTeam(models.Model):
+    _inherit = "fsm.team"
+
+    def _compute_recurring_draft_count(self):
+        order_data = self.env["fsm.recurring"].read_group(
+            [
+                ("team_id", "in", self.ids),
+                ("state", "=", "draft"),
+            ],
+            ["team_id"],
+            ["team_id"],
+        )
+        result = {data["team_id"][0]: int(data["team_id_count"]) for data in order_data}
+        for team in self:
+            team.recurring_draft_count = result.get(team.id, 0)
+
+    recurring_draft_count = fields.Integer(
+        compute="_compute_recurring_draft_count", string="Recurring in draft"
+    )

fieldservice_recurring/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Field Service Recurring Work Orders</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:98c09c17b602f5380080fbf9508c47fdd5ea41108abe6326e1d9cb8818b6be57
+!! source digest: sha256:2f025a2b495e312b9abe51d59297a3e4c4535ac887584ab1a64e1064ffeb02dd
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" 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 image-reference" 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 image-reference" href="https://github.com/OCA/field-service/tree/15.0/fieldservice_recurring"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-15-0/field-service-15-0-fieldservice_recurring"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to manage your recurring field service work orders</p>

fieldservice_recurring/tests/test_fsm_recurring.py

@@ -14,6 +14,7 @@
 class FSMRecurringCase(TransactionCase):
     def setUp(self):
         super(FSMRecurringCase, self).setUp()
+        self.Equipment = self.env["fsm.equipment"]
         self.Recurring = self.env["fsm.recurring"]
         self.Frequency = self.env["fsm.frequency"]
         self.FrequencySet = self.env["fsm.frequency.set"]
@@ -53,6 +54,7 @@ def setUp(self):
         self.fsm_recurring_template = self.env["fsm.recurring.template"].create(
             {"name": "Test Template"}
         )
+        self.test_equipment = self.Equipment.create({"name": "Equipment"})
 
     def test_cron_generate_orders_rule1(self):
         """Test recurring order with following rule,
@@ -98,7 +100,8 @@ def test_cron_generate_orders_rule1(self):
             {
                 "fsm_frequency_set_id": fr_set.id,
                 "location_id": self.test_location.id,
-                "start_date": fields.Datetime.today(),
+                "start_date": fields.Datetime.now().replace(hour=12),
+                "equipment_ids": [(6, 0, [self.test_equipment.id])],
             }
         )
         test_recurring = self.Recurring.create(
@@ -110,7 +113,6 @@ def test_cron_generate_orders_rule1(self):
         )
         recurring.action_start()
         test_recurring.action_start()
-        test_recurring.action_renew()
         # Run schedule job now, to compute the future work orders
         recurring._cron_scheduled_task()
         recurring.onchange_recurring_template_id()
@@ -176,23 +178,23 @@ def test_cron_generate_orders_rule2(self):
             {
                 "fsm_frequency_set_id": fr_set.id,
                 "location_id": self.test_location.id,
-                "start_date": fields.Datetime.today(),
+                "start_date": fields.Datetime.now().replace(hour=12),
                 "end_date": expire_date1,
             }
         )
         test_recurring = self.Recurring.create(
             {
                 "fsm_frequency_set_id": fr_set.id,
                 "location_id": self.test_location.id,
-                "start_date": fields.Datetime.today(),
+                "start_date": fields.Datetime.now().replace(hour=12),
                 "max_orders": 1,
             }
         )
         test_recurring1 = self.Recurring.create(
             {
                 "fsm_frequency_set_id": fr_set.id,
                 "location_id": self.test_location.id,
-                "start_date": fields.Datetime.today(),
+                "start_date": fields.Datetime.now().replace(hour=12),
                 "max_orders": 1,
             }
         )
@@ -209,7 +211,7 @@ def test_cron_generate_orders_rule2(self):
         x = False
         for d in all_dates:
             if x:
-                diff_days = (d - x).days
+                diff_days = (d.date() - x.date()).days
                 self.assertEqual(diff_days, 21)
             x = d
 
@@ -251,7 +253,7 @@ def test_cron_generate_orders_rule3(self):
             {
                 "fsm_frequency_set_id": fr_set.id,
                 "location_id": self.test_location.id,
-                "start_date": fields.Datetime.today(),
+                "start_date": fields.Datetime.now().replace(hour=12),
             }
         )
         recurring.action_start()
@@ -291,4 +293,3 @@ def test_fsm_order(self):
         fsm_order = self.env["fsm.order"].create(order_vals)
         self.env["fsm.order"].create(order_vals2)
         fsm_order.action_view_fsm_recurring()
-        recurring.action_cancel()

fieldservice_recurring/views/fsm_order.xml

@@ -2,6 +2,10 @@
     <record id="view_fsm_order_form" model="ir.ui.view">
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form" />
+        <field
+            name="groups_id"
+            eval="[(4, ref('fieldservice_recurring.group_fsm_recurring'))]"
+        />
         <field name="arch" type="xml">
             <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
                 <button