[MIG] sale_stock_restocking_fee_invoicing: migration to v18

sbejaoui · sbejaoui · commit d98d27866cd0 · 2025-11-03T17:13:22.000+01:00
diff --git a/sale_stock_restocking_fee_invoicing/README.rst b/sale_stock_restocking_fee_invoicing/README.rst
@@ -17,13 +17,13 @@ Sale Stock Restocking Fee Invoicing
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--workflow-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-workflow/tree/17.0/sale_stock_restocking_fee_invoicing
+    :target: https://github.com/OCA/stock-logistics-workflow/tree/18.0/sale_stock_restocking_fee_invoicing
     :alt: OCA/stock-logistics-workflow
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-17-0/stock-logistics-workflow-17-0-sale_stock_restocking_fee_invoicing
+    :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-18-0/stock-logistics-workflow-18-0-sale_stock_restocking_fee_invoicing
     :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/stock-logistics-workflow&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-workflow&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -86,7 +86,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-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/stock-logistics-workflow/issues/new?body=module:%20sale_stock_restocking_fee_invoicing%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-workflow/issues/new?body=module:%20sale_stock_restocking_fee_invoicing%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.
 
@@ -118,6 +118,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/stock-logistics-workflow <https://github.com/OCA/stock-logistics-workflow/tree/17.0/sale_stock_restocking_fee_invoicing>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-workflow <https://github.com/OCA/stock-logistics-workflow/tree/18.0/sale_stock_restocking_fee_invoicing>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/sale_stock_restocking_fee_invoicing/__manifest__.py b/sale_stock_restocking_fee_invoicing/__manifest__.py
@@ -5,14 +5,13 @@
     "name": "Sale Stock Restocking Fee Invoicing",
     "summary": """
         On demand charge restocking fee for accepting returned goods .""",
-    "version": "17.0.1.0.0",
+    "version": "18.0.1.0.0",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-workflow",
     "depends": ["sale", "stock", "sale_stock", "stock_account", "stock_picking_kind"],
     "data": [
         "data/product_product.xml",
-        "views/res_company_views.xml",
         "views/res_partner_views.xml",
         "views/stock_move_views.xml",
         "views/res_config_settings_views.xml",
diff --git a/sale_stock_restocking_fee_invoicing/data/product_product.xml b/sale_stock_restocking_fee_invoicing/data/product_product.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo noupdate="1">
-
     <record id="product_restocking_fee" model="product.product">
         <field name="name">Restocking fee</field>
         <field name="list_price">100</field>
@@ -10,5 +9,4 @@
         <field name="invoice_policy">order</field>
         <field name="company_id" eval="False" />
     </record>
-
 </odoo>
diff --git a/sale_stock_restocking_fee_invoicing/models/res_config_settings.py b/sale_stock_restocking_fee_invoicing/models/res_config_settings.py
@@ -15,6 +15,5 @@ class ResConfigSettings(models.TransientModel):
         "charged for returning goods. In the case where fees are to "
         "be applied, the product specified here is added to the sale"
         " order to charge these fees.",
-        default=lambda self: self.env.user.company_id.restocking_fee_product_id,
         readonly=False,
     )
diff --git a/sale_stock_restocking_fee_invoicing/static/description/index.html b/sale_stock_restocking_fee_invoicing/static/description/index.html
@@ -369,7 +369,7 @@ <h1 class="title">Sale Stock Restocking Fee Invoicing</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:07e5efd90d8616b084a70da14dd71d6a644f6a10e9df957c458bc6fa7d244fb2
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/stock-logistics-workflow/tree/17.0/sale_stock_restocking_fee_invoicing"><img alt="OCA/stock-logistics-workflow" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-workflow-17-0/stock-logistics-workflow-17-0-sale_stock_restocking_fee_invoicing"><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/stock-logistics-workflow&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<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/stock-logistics-workflow/tree/18.0/sale_stock_restocking_fee_invoicing"><img alt="OCA/stock-logistics-workflow" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-workflow-18-0/stock-logistics-workflow-18-0-sale_stock_restocking_fee_invoicing"><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/stock-logistics-workflow&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module extends the functionality of the stock picking return wizard
 to allow you to charge restocking fee in case of return of goods by a
 customer.</p>
@@ -433,7 +433,7 @@ <h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-workflow/issues">GitHub Issues</a>.
 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
-<a class="reference external" href="https://github.com/OCA/stock-logistics-workflow/issues/new?body=module:%20sale_stock_restocking_fee_invoicing%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-workflow/issues/new?body=module:%20sale_stock_restocking_fee_invoicing%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -461,7 +461,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">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/stock-logistics-workflow/tree/17.0/sale_stock_restocking_fee_invoicing">OCA/stock-logistics-workflow</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-workflow/tree/18.0/sale_stock_restocking_fee_invoicing">OCA/stock-logistics-workflow</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>
diff --git a/sale_stock_restocking_fee_invoicing/tests/test_stock_return_picking.py b/sale_stock_restocking_fee_invoicing/tests/test_stock_return_picking.py
@@ -20,10 +20,20 @@ def setUpClass(cls):
         )
 
         cls.product_1 = cls.env["product.product"].create(
-            {"name": "test product 1", "list_price": 20, "type": "product"}
+            {
+                "name": "test product 1",
+                "list_price": 20,
+                "type": "consu",
+                "is_storable": True,
+            }
         )
         cls.product_2 = cls.env["product.product"].create(
-            {"name": "test product 2", "list_price": 30, "type": "product"}
+            {
+                "name": "test product 2",
+                "list_price": 30,
+                "type": "consu",
+                "is_storable": True,
+            }
         )
         cls.so = cls.env["sale.order"].create(
             {
@@ -73,7 +83,7 @@ def _create_return_wizard(self):
 
     def _create_return_picking(self):
         wizard = self._create_return_wizard()
-        res = wizard.create_returns()
+        res = wizard.action_create_returns_all()
         return self.env["stock.picking"].browse(res["res_id"])
 
     def test_00(self):
@@ -174,7 +184,7 @@ def test_04(self):
         self.assertEqual(2, len(self.so.order_line))
         wizard = self._create_return_wizard()
         wizard.product_return_moves[0].charge_restocking_fee = False
-        res = wizard.create_returns()
+        res = wizard.action_create_returns_all()
         picking = self.env["stock.picking"].browse(res["res_id"])
         self.assertEqual(2, len(self.so.order_line))
         self._process_picking(picking)
@@ -199,7 +209,7 @@ def test_05(self):
         self.assertEqual(2, len(self.so.order_line))
         wizard = self._create_return_wizard()
         wizard.product_return_moves[0].charge_restocking_fee = True
-        res = wizard.create_returns()
+        res = wizard.action_create_returns_all()
         picking = self.env["stock.picking"].browse(res["res_id"])
         self.assertEqual(2, len(self.so.order_line))
         self._process_picking(picking)
diff --git a/sale_stock_restocking_fee_invoicing/views/res_company_views.xml b/sale_stock_restocking_fee_invoicing/views/res_company_views.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2020 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record model="ir.ui.view" id="res_company_form_view">
         <field
             name="name"
diff --git a/sale_stock_restocking_fee_invoicing/views/res_config_settings_views.xml b/sale_stock_restocking_fee_invoicing/views/res_config_settings_views.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2020 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record model="ir.ui.view" id="res_config_settings_view_form">
         <field
             name="name"
@@ -30,5 +29,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>
diff --git a/sale_stock_restocking_fee_invoicing/views/res_partner_views.xml b/sale_stock_restocking_fee_invoicing/views/res_partner_views.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2020 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record model="ir.ui.view" id="res_partner_form_view">
         <field
             name="name"
@@ -15,6 +14,4 @@
             </xpath>
         </field>
     </record>
-
-
 </odoo>
diff --git a/sale_stock_restocking_fee_invoicing/views/stock_move_views.xml b/sale_stock_restocking_fee_invoicing/views/stock_move_views.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2020 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record model="ir.ui.view" id="stock_move_form_view">
         <field
             name="name"
@@ -19,5 +18,4 @@
             </field>
         </field>
     </record>
-
 </odoo>
diff --git a/sale_stock_restocking_fee_invoicing/wizards/stock_return_picking.py b/sale_stock_restocking_fee_invoicing/wizards/stock_return_picking.py
@@ -40,11 +40,10 @@ def _onchange_charge_restocking_fee(self):
         for move in self.product_return_moves:
             move.charge_restocking_fee = self.charge_restocking_fee
 
-    def _create_returns(self):
-        new_picking_id, new_picking_type_id = super()._create_returns()
+    def _create_return(self):
+        new_picking = super()._create_return()
         self.ensure_one()
         if self.is_customer_return:
-            new_picking = self.env["stock.picking"].browse(new_picking_id)
             # we must update the stock moves after the creation since there is
             # no hooks where to enrich the data used to create the moves :-(
             new_move_by_returned_move = {
@@ -57,4 +56,4 @@ def _create_returns(self):
                 new_move.charge_restocking_fee = return_line_by_returned_move[
                     returned_move
                 ].charge_restocking_fee
-        return new_picking_id, new_picking_type_id
+        return new_picking
diff --git a/sale_stock_restocking_fee_invoicing/wizards/stock_return_picking_views.xml b/sale_stock_restocking_fee_invoicing/wizards/stock_return_picking_views.xml
@@ -2,7 +2,6 @@
 <!-- Copyright 2020 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
 <odoo>
-
     <record model="ir.ui.view" id="stock_return_picking_form_view">
         <field
             name="name"
@@ -17,7 +16,7 @@
                 </group>
             </xpath>
             <xpath
-                expr="//field[@name='product_return_moves']/tree/field[@name='quantity']"
+                expr="//field[@name='product_return_moves']/list/field[@name='quantity']"
                 position="after"
             >
                 <field name="is_customer_return" invisible="1" />
@@ -28,5 +27,4 @@
             </xpath>
         </field>
     </record>
-
 </odoo>

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,5 @@ class ResConfigSettings(models.TransientModel):`
`15`	`15`	`"charged for returning goods. In the case where fees are to "`
`16`	`16`	`"be applied, the product specified here is added to the sale"`
`17`	`17`	`" order to charge these fees.",`
`18`		`- default=lambda self: self.env.user.company_id.restocking_fee_product_id,`
`19`	`18`	`readonly=False,`
`20`	`19`	`)`