[MIG] purchase_request: Migration to 18.0

purchase_request/README.rst

@@ -17,13 +17,13 @@ Purchase Request
     :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
     :alt: License: LGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github
-    :target: https://github.com/OCA/purchase-workflow/tree/17.0/purchase_request
+    :target: https://github.com/OCA/purchase-workflow/tree/18.0/purchase_request
     :alt: OCA/purchase-workflow
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/purchase-workflow-17-0/purchase-workflow-17-0-purchase_request
+    :target: https://translation.odoo-community.org/projects/purchase-workflow-18-0/purchase-workflow-18-0-purchase_request
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -85,9 +85,9 @@ To configure the product follow this steps:
 Note that MTO route is archived by default, you should unarchive it
 first:
 
--  Go to Inventory > Configuration > Routes, in the Search dropdown
-   menu, click *Archived* to show *Replenish on Order (MTO)* route and
-   *Unarchive* it.
+- Go to Inventory > Configuration > Routes, in the Search dropdown menu,
+  click *Archived* to show *Replenish on Order (MTO)* route and
+  *Unarchive* it.
 
 With this configuration, whenever a procurement order is created and the
 supply rule selected is 'Buy' the application will create a Purchase
@@ -110,7 +110,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/purchase-workflow/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/purchase-workflow/issues/new?body=module:%20purchase_request%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/purchase-workflow/issues/new?body=module:%20purchase_request%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -125,27 +125,31 @@ Authors
 Contributors
 ------------
 
--  Jordi Ballester Alomar <jordi.ballester@forgeflow.com>
+- Jordi Ballester Alomar <jordi.ballester@forgeflow.com>
 
--  Jonathan Nemry <jonathan.nemry@acsone.eu>
+- Jonathan Nemry <jonathan.nemry@acsone.eu>
 
--  Aaron Henriquez <ahenriquez@forgeflow.com>
+- Aaron Henriquez <ahenriquez@forgeflow.com>
 
--  Adrien Peiffer <adrien.peiffer@acsone.eu>
+- Adrien Peiffer <adrien.peiffer@acsone.eu>
 
--  Lois Rilo <lois.rilo@forgeflow.com>
+- Lois Rilo <lois.rilo@forgeflow.com>
 
--  Héctor Villarreal <hector.villarreal@forgeflow.com>
+- Héctor Villarreal <hector.villarreal@forgeflow.com>
 
--  Ben Cai <ben.cai@elico-corp.com>
+- Ben Cai <ben.cai@elico-corp.com>
 
--  Rattapong Chokmasermkul <rattapongc@ecosoft.co.th>
+- Rattapong Chokmasermkul <rattapongc@ecosoft.co.th>
 
--  Stefan Rijnhart <stefan@opener.amsterdam>
+- Stefan Rijnhart <stefan@opener.amsterdam>
 
--  ``Trobz <https://trobz.com>``\ \_:
+- ``Trobz <https://trobz.com>``\ \_:
 
-   -  Son Ho sonhd@trobz.com
+  - Son Ho sonhd@trobz.com
+
+- `Komit Company Limited <https://komit-consulting.com/>`__:
+
+  - Quoc Pham Ngoc <quoc-pn@komit-consulting.com>
 
 Other credits
 -------------
@@ -157,7 +161,7 @@ The development of this module has been financially supported by:
 Images
 ~~~~~~
 
--  Enric Tobella (logo)
+- Enric Tobella (logo)
 
 .. |Aleph Objects, Inc| image:: https://upload.wikimedia.org/wikipedia/en/3/3b/Aleph_Objects_Logo.png
    :target: https://www.alephobjects.com
@@ -175,6 +179,6 @@ 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.
 
-This module is part of the `OCA/purchase-workflow <https://github.com/OCA/purchase-workflow/tree/17.0/purchase_request>`_ project on GitHub.
+This module is part of the `OCA/purchase-workflow <https://github.com/OCA/purchase-workflow/tree/18.0/purchase_request>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

purchase_request/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "Purchase Request",
     "author": "ForgeFlow, Odoo Community Association (OCA)",
-    "version": "17.0.1.2.3",
+    "version": "18.0.1.0.0",
     "summary": "Use this module to have notification of requirements of "
     "materials and/or external services and keep track of such "
     "requirements.",

purchase_request/models/purchase_order.py

@@ -1,6 +1,8 @@
 # Copyright 2018-2019 ForgeFlow, S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
 
+from markupsafe import Markup
+
 from odoo import _, api, exceptions, fields, models
 
 
@@ -15,14 +17,13 @@ def _purchase_request_confirm_message_content(self, request, request_dict=None):
             "po_name": self.name,
             "pr_name": request.name,
         }
-        message = "<h3>%s</h3><ul>" % title
+        message = f"<h3>{title}</h3><ul>"
         message += _(
             "The following requested items from Purchase Request %(pr_name)s "
-            "have now been confirmed in Purchase Order %(po_name)s:"
-        ) % {
-            "po_name": self.name,
-            "pr_name": request.name,
-        }
+            "have now been confirmed in Purchase Order %(po_name)s:",
+            po_name=self.name,
+            pr_name=request.name,
+        )
 
         for line in request_dict.values():
             message += _(
@@ -46,7 +47,7 @@ def _purchase_request_confirm_message(self):
                     request_id = request_line.request_id.id
                     if request_id not in requests_dict:
                         requests_dict[request_id] = {}
-                    date_planned = "%s" % line.date_planned
+                    date_planned = line.date_planned
                     data = {
                         "name": request_line.name,
                         "product_qty": line.product_qty,
@@ -60,9 +61,8 @@ def _purchase_request_confirm_message(self):
                     request, requests_dict[request_id]
                 )
                 request.message_post(
-                    body=message,
+                    body=Markup(message),
                     subtype_id=self.env.ref("mail.mt_comment").id,
-                    body_is_html=True,
                 )
         return True
 
@@ -132,7 +132,7 @@ def action_open_request_line_tree_view(self):
             "name": _("Purchase Request Lines"),
             "type": "ir.actions.act_window",
             "res_model": "purchase.request.line",
-            "view_mode": "tree,form",
+            "view_mode": "list,form",
             "domain": domain,
         }
 
@@ -182,9 +182,8 @@ def update_service_allocations(self, prev_qty_received):
                     message_data
                 )
                 alloc.purchase_request_line_id.request_id.message_post(
-                    body=message,
+                    body=Markup(message),
                     subtype_id=self.env.ref("mail.mt_comment").id,
-                    body_is_html=True,
                 )
 
                 alloc.purchase_request_line_id._compute_qty()
@@ -195,24 +194,22 @@ def _purchase_request_confirm_done_message_content(self, message_data):
         title = (
             _("Service confirmation for Request %s") % (message_data["request_name"])
         )
-        message = "<h3>%s</h3>" % title
+        message = f"<h3>{title}</h3>"
         message += _(
             "The following requested services from Purchase"
             " Request %(request_name)s requested by %(requestor)s "
-            "have now been received:"
-        ) % {
-            "request_name": message_data["request_name"],
-            "requestor": message_data["requestor"],
-        }
+            "have now been received:",
+            request_name=message_data["request_name"],
+            requestor=message_data["requestor"],
+        )
         message += "<ul>"
         message += _(
             "<li><b>%(product_name)s</b>: "
-            "Received quantity %(product_qty)s %(product_uom)s</li>"
-        ) % {
-            "product_name": message_data["product_name"],
-            "product_qty": message_data["product_qty"],
-            "product_uom": message_data["product_uom"],
-        }
+            "Received quantity %(product_qty)s %(product_uom)s</li>",
+            product_name=message_data["product_name"],
+            product_qty=message_data["product_qty"],
+            product_uom=message_data["product_uom"],
+        )
         message += "</ul>"
         return message
 

purchase_request/models/purchase_request_allocation.py

@@ -1,6 +1,8 @@
 # Copyright 2019 ForgeFlow, S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
 
+from markupsafe import Markup
+
 from odoo import _, api, fields, models
 
 
@@ -128,7 +130,6 @@ def _notify_allocation(self, allocated_qty):
             message_data = self._prepare_message_data(po_line, request, allocated_qty)
             message = self._purchase_request_confirm_done_message_content(message_data)
             request.message_post(
-                body=message,
+                body=Markup(message),
                 subtype_id=self.env.ref("mail.mt_comment").id,
-                body_is_html=True,
             )

purchase_request/models/stock_move.py

@@ -41,10 +41,7 @@ def _action_cancel(self):
         """Create an activity on the request for the cancelled procurement move"""
         for move in self:
             if move.created_purchase_request_line_id:
-                try:
-                    activity_type_id = self.env.ref("mail.mail_activity_data_todo").id
-                except ValueError:
-                    activity_type_id = False
+                activity_type_id = self.env.ref("mail.mail_activity_data_todo").id
                 pr_line = move.created_purchase_request_line_id
                 self.env["mail.activity"].sudo().create(
                     {

purchase_request/models/stock_move_line.py

@@ -1,6 +1,8 @@
 # Copyright 2017 ForgeFlow, S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0)
 
+from markupsafe import Markup
+
 from odoo import _, api, models
 
 
@@ -10,57 +12,53 @@ class StockMoveLine(models.Model):
     @api.model
     def _purchase_request_confirm_done_message_content(self, message_data):
         title = _(
-            "Receipt confirmation %(picking_name)s for your Request %(request_name)s"
-        ) % {
-            "picking_name": message_data["picking_name"],
-            "request_name": message_data["request_name"],
-        }
-        message = "<h3>%s</h3>" % title
+            "Receipt confirmation %(picking_name)s for your Request %(request_name)s",
+            picking_name=message_data["picking_name"],
+            request_name=message_data["request_name"],
+        )
+        message = f"<h3>{title}</h3>"
         message += _(
             "The following requested items from Purchase Request %(request_name)s "
             "have now been received in %(location_name)s using Picking "
-            "%(picking_name)s:"
-        ) % {
-            "request_name": message_data["request_name"],
-            "location_name": message_data["location_name"],
-            "picking_name": message_data["picking_name"],
-        }
+            "%(picking_name)s:",
+            request_name=message_data["request_name"],
+            location_name=message_data["location_name"],
+            picking_name=message_data["picking_name"],
+        )
         message += "<ul>"
         message += _(
             "<li><b>%(product_name)s</b>: "
-            "Transferred quantity %(product_qty)s %(product_uom)s</li>"
-        ) % {
-            "product_name": message_data["product_name"],
-            "product_qty": message_data["product_qty"],
-            "product_uom": message_data["product_uom"],
-        }
+            "Transferred quantity %(product_qty)s %(product_uom)s</li>",
+            product_name=message_data["product_name"],
+            product_qty=message_data["product_qty"],
+            product_uom=message_data["product_uom"],
+        )
         message += "</ul>"
         return message
 
     @api.model
     def _picking_confirm_done_message_content(self, message_data):
-        title = (
-            _("Receipt confirmation for Request %s") % (message_data["request_name"])
+        title = _(
+            "Receipt confirmation for Request %(name)s",
+            name=message_data["request_name"],
         )
-        message = "<h3>%s</h3>" % title
+        message = f"<h3>{title}</h3>"
         message += _(
             "The following requested items from Purchase Request %(request_name)s "
             "requested by %(requestor)s "
-            "have now been received in %(location_name)s:"
-        ) % {
-            "request_name": message_data["request_name"],
-            "requestor": message_data["requestor"],
-            "location_name": message_data["location_name"],
-        }
+            "have now been received in %(location_name)s:",
+            request_name=message_data["request_name"],
+            requestor=message_data["requestor"],
+            location_name=message_data["location_name"],
+        )
         message += "<ul>"
         message += _(
             "<li><b>%(product_name)s</b>: "
-            "Transferred quantity %(product_qty)s %(product_uom)s</li>"
-        ) % {
-            "product_name": message_data["product_name"],
-            "product_qty": message_data["product_qty"],
-            "product_uom": message_data["product_uom"],
-        }
+            "Transferred quantity %(product_qty)s %(product_uom)s</li>",
+            product_name=message_data["product_name"],
+            product_qty=message_data["product_qty"],
+            product_uom=message_data["product_uom"],
+        )
         message += "</ul>"
         return message
 
@@ -107,18 +105,16 @@ def allocate(self):
                         message_data
                     )
                     request.message_post(
-                        body=message,
+                        body=Markup(message),
                         subtype_id=self.env.ref("mail.mt_comment").id,
-                        body_is_html=True,
                     )
 
                     picking_message = self._picking_confirm_done_message_content(
                         message_data
                     )
                     ml.move_id.picking_id.message_post(
-                        body=picking_message,
+                        body=Markup(picking_message),
                         subtype_id=self.env.ref("mail.mt_comment").id,
-                        body_is_html=True,
                     )
 
                 allocation._compute_open_product_qty()

purchase_request/readme/CONTRIBUTORS.md

@@ -10,3 +10,5 @@
 - `Trobz <https://trobz.com>`_:
 
     * Son Ho <sonhd@trobz.com>
+- [Komit Company Limited](https://komit-consulting.com/):
+  - Quoc Pham Ngoc \<<quoc-pn@komit-consulting.com>\>

purchase_request/reports/report_purchase_request.xml

@@ -7,7 +7,7 @@
             <t t-foreach="docs" t-as="o">
                 <t t-call="web.external_layout">
                     <div class="page">
-                        <div class="oe_structure" />
+                        <div id="oe_structure_report_request_1" class="oe_structure" />
                         <h2>
                             Purchase Request
                             <span t-field="o.name" />
@@ -115,7 +115,7 @@
                                 </tbody>
                             </table>
                         </t>
-                        <div class="oe_structure" />
+                        <div id="oe_structure_report_request_2" class="oe_structure" />
                     </div>
                 </t>
             </t>