[17.0][IMP] sale_validity_auto_cancel: Extend the auto cancel expired…

… SO functionality by adding new field to contact

[17.0][IMP] sale_validity_auto_cancel: Extend the auto cancel expired SO functionality by adding new field to contact

[17.0][IMP] sale_validity_auto_cancel: Extend the auto cancel expired SO functionality by adding new field to contact

sale_validity_auto_cancel/README.rst

@@ -72,6 +72,7 @@ Authors
 -------
 
 * ForgeFlow
+* OERP Canada
 
 Contributors
 ------------

sale_validity_auto_cancel/__manifest__.py

@@ -1,4 +1,5 @@
 # Copyright 2023 ForgeFlow S.L.
+# Copyright 2024 OERP Canada <https://www.oerp.ca>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 {
@@ -8,9 +9,13 @@
     "license": "LGPL-3",
     "summary": "Automatically cancel quotations after validity period.",
     "depends": ["sale_management"],
-    "author": "ForgeFlow, Odoo Community Association (OCA)",
+    "author": "ForgeFlow, OERP Canada, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/sale-workflow",
-    "data": ["data/ir_cron.xml", "views/res_config_settings.xml"],
+    "data": [
+        "data/ir_cron.xml",
+        "views/res_config_settings.xml",
+        "views/res_partner_views.xml",
+    ],
     "installable": True,
     "maintainers": ["JordiMForgeFlow"],
 }

sale_validity_auto_cancel/data/ir_cron.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2023 ForgeFlow S.L.
+     Copyright 2024 OERP Canada <https://www.oerp.ca>
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
  -->
 <odoo noupdate="1">

sale_validity_auto_cancel/i18n/sale_validity_auto_cancel.pot

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 17.0+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-24 16:06+0000\n"
-"PO-Revision-Date: 2024-06-24 16:06+0000\n"
+"POT-Creation-Date: 2024-07-02 19:37+0000\n"
+"PO-Revision-Date: 2024-07-02 19:37+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,17 @@ msgstr ""
 msgid "<span> days</span>"
 msgstr ""
 
+#. module: sale_validity_auto_cancel
+#: model:ir.model.fields,field_description:sale_validity_auto_cancel.field_sale_order__auto_cancel_expired_so
+msgid "Auto Cancel"
+msgstr ""
+
+#. module: sale_validity_auto_cancel
+#: model:ir.model.fields,field_description:sale_validity_auto_cancel.field_res_partner__auto_cancel_expired_so
+#: model:ir.model.fields,field_description:sale_validity_auto_cancel.field_res_users__auto_cancel_expired_so
+msgid "Auto Cancel Expired SaleOrder"
+msgstr ""
+
 #. module: sale_validity_auto_cancel
 #: model:ir.model.fields,field_description:sale_validity_auto_cancel.field_res_company__sale_validity_auto_cancel_days
 #: model:ir.model.fields,field_description:sale_validity_auto_cancel.field_res_config_settings__sale_validity_auto_cancel_days
@@ -46,6 +57,15 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#. module: sale_validity_auto_cancel
+#: model:ir.model.fields,help:sale_validity_auto_cancel.field_res_partner__auto_cancel_expired_so
+#: model:ir.model.fields,help:sale_validity_auto_cancel.field_res_users__auto_cancel_expired_so
+#: model:ir.model.fields,help:sale_validity_auto_cancel.field_sale_order__auto_cancel_expired_so
+msgid ""
+"If unchecked, you will be able to restrict this contact's expired SO from "
+"being auto-canceled."
+msgstr ""
+
 #. module: sale_validity_auto_cancel
 #: model_terms:ir.ui.view,arch_db:sale_validity_auto_cancel.res_config_settings_view_form
 msgid ""

sale_validity_auto_cancel/models/__init__.py

@@ -2,4 +2,5 @@
 
 from . import res_company
 from . import res_config_settings
+from . import res_partner
 from . import sale_order

sale_validity_auto_cancel/models/res_company.py

@@ -1,4 +1,5 @@
 # Copyright 2023 ForgeFlow S.L.
+# Copyright 2024 OERP Canada <https://www.oerp.ca>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from odoo import fields, models

sale_validity_auto_cancel/models/res_config_settings.py

@@ -1,4 +1,5 @@
 # Copyright 2023 ForgeFlow S.L.
+# Copyright 2024 OERP Canada <https://www.oerp.ca>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 from odoo import fields, models

sale_validity_auto_cancel/models/res_partner.py

@@ -0,0 +1,16 @@
+# Copyright 2023 ForgeFlow S.L.
+# Copyright 2024 OERP Canada <https://www.oerp.ca>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ResPartner(models.Model):
+    _inherit = "res.partner"
+
+    auto_cancel_expired_so = fields.Boolean(
+        string="Auto Cancel Expired SaleOrder",
+        default=True,
+        help="If unchecked, you will be able to restrict \n"
+        "this contact's expired SO from being auto-canceled.",
+    )

sale_validity_auto_cancel/models/sale_order.py

@@ -1,4 +1,5 @@
 # Copyright 2023 ForgeFlow S.L.
+# Copyright 2024 OERP Canada <https://www.oerp.ca>
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 import logging
 
@@ -12,6 +13,10 @@
 class SaleOrder(models.Model):
     _inherit = "sale.order"
 
+    auto_cancel_expired_so = fields.Boolean(
+        related="partner_id.auto_cancel_expired_so", string="Auto Cancel"
+    )
+
     def _get_expired_order_states(self):
         # Can be inherited to exclude/include order states
         return ["draft", "sent"]
@@ -27,6 +32,7 @@ def cron_sale_validity_auto_cancel(self):
                 [
                     ("state", "in", expired_states),
                     ("validity_date", "<", threshold),
+                    ("auto_cancel_expired_so", "=", True),
                 ]
             )
             for order in orders:

sale_validity_auto_cancel/static/description/index.html

@@ -414,6 +414,7 @@ <h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>ForgeFlow</li>
+<li>OERP Canada</li>
 </ul>
 </div>
 <div class="section" id="contributors">

sale_validity_auto_cancel/tests/test_sale_validity_auto_cancel.py

@@ -41,3 +41,10 @@ def test_sale_validity_auto_cancel(self):
         self.assertEqual(so.state, "draft")
         so.cron_sale_validity_auto_cancel()
         self.assertEqual(so.state, "cancel")
+
+    def test_sale_validity_auto_cancel_keep_so(self):
+        self.partner.write({"auto_cancel_expired_so": False})
+        so = self.create_so()
+        self.assertEqual(so.state, "draft")
+        so.cron_sale_validity_auto_cancel()
+        self.assertEqual(so.state, "draft")

sale_validity_auto_cancel/views/res_config_settings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
   Copyright 2023 ForgeFlow S.L.
+  Copyright 2024 OERP Canada <https://www.oerp.ca>
   License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 -->
 <odoo>

sale_validity_auto_cancel/views/res_partner_views.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright 2023 ForgeFlow S.L.
+  Copyright 2024 OERP Canada <https://www.oerp.ca>
+  License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+-->
+<odoo>
+    <record id="view_partner_form" model="ir.ui.view">
+        <field name="name">res.partner.form</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form" />
+        <field name="arch" type="xml">
+            <xpath expr='//group[@name="sale"]' position="inside">
+                <field name="auto_cancel_expired_so" />
+            </xpath>
+        </field>
+    </record>
+</odoo>