[IMP] purchase_manual_delivery: refactor out context key on confirmation

Author: StefanRijnhart

purchase_manual_delivery/README.rst

@@ -78,6 +78,10 @@ only PO lines from same PO can be selected) and create the manual
 delivery. Follow the same steps as above to manually generate the
 incoming shipment.
 
+If, as a developer, you need to override the behaviour you can call
+``purchase.order``'s ``button_confirm`` with context key
+``ignore_manual_delivery=True``.
+
 .. |image1| image:: https://raw.githubusercontent.com/OCA/purchase-workflow/18.0/purchase_manual_delivery/static/description/create_incoming_shipment_button.png
 .. |image2| image:: https://raw.githubusercontent.com/OCA/purchase-workflow/18.0/purchase_manual_delivery/static/description/create_incoming_shipment_wizard.png
 

purchase_manual_delivery/models/purchase_order.py

@@ -31,19 +31,9 @@ def _compute_pending_to_receive(self):
                 order.order_line.mapped("pending_to_receive")
             )
 
-    def button_confirm_manual(self):
-        return super(
-            PurchaseOrder, self.with_context(manual_delivery=True)
-        ).button_confirm()
-
-    def button_approve(self, force=False):
-        if self.manual_delivery:
-            self = self.with_context(manual_delivery=True)
-        return super().button_approve(force=force)
-
     def _create_picking(self):
-        if self.env.context.get("manual_delivery", False) and self.manual_delivery:
-            # We do not want to create the picking when confirming the order
-            # if it comes from manual confirmation
-            return
-        return super()._create_picking()
+        if self.env.context.get("ignore_manual_delivery"):
+            orders = self
+        else:
+            orders = self.filtered(lambda po: not po.manual_delivery)
+        return super(PurchaseOrder, orders)._create_picking()

purchase_manual_delivery/readme/USAGE.md

@@ -23,3 +23,6 @@ Menu). From there you can select multiple PO lines (in this base module
 only PO lines from same PO can be selected) and create the manual
 delivery. Follow the same steps as above to manually generate the
 incoming shipment.
+
+If, as a developer, you need to override the behaviour you can call
+`purchase.order`'s `button_confirm` with context key `ignore_manual_delivery=True`.

purchase_manual_delivery/static/description/index.html

@@ -422,6 +422,9 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 only PO lines from same PO can be selected) and create the manual
 delivery. Follow the same steps as above to manually generate the
 incoming shipment.</p>
+<p>If, as a developer, you need to override the behaviour you can call
+<tt class="docutils literal">purchase.order</tt>’s <tt class="docutils literal">button_confirm</tt> with context key
+<tt class="docutils literal">ignore_manual_delivery=True</tt>.</p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>

purchase_manual_delivery/tests/test_purchase_manual_delivery.py

@@ -87,7 +87,7 @@ def test_01_purchase_order_manual_delivery(self):
         add second PO line to same picking afterwards)
         """
         # confirm RFQ
-        self.po1.button_confirm_manual()
+        self.po1.button_confirm()
         self.assertTrue(self.po1_line1.pending_to_receive)
         self.assertTrue(self.po1_line2.pending_to_receive)
         self.assertEqual(self.po1_line1.qty_in_receipt, 0)
@@ -225,8 +225,8 @@ def test_02_purchase_order_line_manual_delivery(self):
         for two PO lines from same PO twice.
         """
         # confirm RFQ
-        self.po1.button_confirm_manual()
-        self.po2.button_confirm_manual()
+        self.po1.button_confirm()
+        self.po2.button_confirm()
         self.assertTrue(self.po1_line1.pending_to_receive)
         self.assertTrue(self.po1_line2.pending_to_receive)
         self.assertTrue(self.po2_line1.pending_to_receive)
@@ -279,7 +279,7 @@ def test_03_purchase_order_line_location(self):
         grp_multi_loc = self.env.ref("stock.group_stock_multi_locations")
         self.env.user.write({"groups_id": [(4, grp_multi_loc.id, 0)]})
         # confirm RFQ
-        self.po1.button_confirm_manual()
+        self.po1.button_confirm()
         self.assertTrue(self.po1_line1.pending_to_receive)
         self.assertTrue(self.po1_line2.pending_to_receive)
         self.assertEqual(self.po1_line1.qty_in_receipt, 0)
@@ -332,7 +332,7 @@ def test_04_pending_to_receive(self):
                 "product_qty": 5.0,
             }
         )
-        po_existing_bigger.button_confirm_manual()
+        po_existing_bigger.button_confirm()
         # create a manual delivery for line in po_existing_bigger
         wizard = (
             self.env["create.stock.picking.wizard"]
@@ -391,7 +391,7 @@ def test_05_purchase_order_in_progress(self):
                 "product_qty": 5.0,
             }
         )
-        po_in_progress.button_confirm_manual()
+        po_in_progress.button_confirm()
         location = self.env["stock.location"].browse(
             po_in_progress.picking_type_id.default_location_dest_id.id
         )
@@ -470,7 +470,7 @@ def test_06_purchase_order_manual_delivery_double_validation(self):
         )
 
         # confirm RFQ
-        self.po.button_confirm_manual()
+        self.po.button_confirm()
         self.assertTrue(self.po.order_line.pending_to_receive)
         self.assertEqual(self.po.order_line.qty_in_receipt, 0)
         self.assertFalse(
@@ -489,3 +489,20 @@ def test_06_purchase_order_manual_delivery_double_validation(self):
             "Purchase Manual Delivery: no picking should had been created",
         )
         self.assertEqual(self.po.state, "purchase")
+
+    def test_07_purchase_order_ignore_manual_delivery(self):
+        """Manual delivery can be overridden with a context key during confirmation"""
+        self.po1.with_context(ignore_manual_delivery=True).button_confirm()
+        self.assertTrue(
+            self.po1.picking_ids,
+            "Context key failed to trigger picking creation",
+        )
+        self.assertTrue(
+            self.po1.picking_ids.move_ids,
+            "Context key failed to trigger stock move creation",
+        )
+        for line in self.po1.order_line:
+            self.assertFalse(
+                line.pending_to_receive,
+                "Context key did not create stock moves for all quantities",
+            )

purchase_manual_delivery/tests/test_report_forecast.py

@@ -28,7 +28,7 @@ def setUpClass(cls):
 
     def test_report_forecast(self):
         """PO quantities without deliveries are mentioned on the forecast report"""
-        self.po1.button_confirm_manual()
+        self.po1.button_confirm()
         # Create delivery for a part of the ordered quantity
         wizard = (
             self.env["create.stock.picking.wizard"]

purchase_manual_delivery/views/purchase_order_line_views.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="purchase_order_line_tree" model="ir.ui.view">
         <field name="model">purchase.order.line</field>
         <field name="inherit_id" ref="purchase.purchase_order_line_tree" />
@@ -40,5 +39,4 @@
             </group>
         </field>
     </record>
-
 </odoo>

purchase_manual_delivery/views/purchase_order_views.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="purchase_order_view_form_inherit" model="ir.ui.view">
         <field name="name">purchase.order.form</field>
         <field name="model">purchase.order</field>
@@ -16,31 +15,6 @@
                     invisible="state != 'purchase' or not pending_to_receive or not manual_delivery"
                 />
             </xpath>
-            <button id="draft_confirm" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </button>
-            <button id="draft_confirm" position="after">
-                <button
-                    name="button_confirm_manual"
-                    type="object"
-                    invisible="state != 'draft'"
-                    string="Confirm Order"
-                    id="draft_confirm_manual"
-                />
-            </button>
-            <button id="bid_confirm" position="attributes">
-                <attribute name="invisible">1</attribute>
-            </button>
-            <button id="bid_confirm" position="after">
-                <button
-                    name="button_confirm_manual"
-                    type="object"
-                    invisible="state != 'sent'"
-                    string="Confirm Order"
-                    class="oe_highlight"
-                    id="bid_confirm_manual"
-                />
-            </button>
             <field name="qty_received" position="before">
                 <field name="pending_to_receive" column_invisible="1" />
                 <field
@@ -62,5 +36,4 @@
             </group>
         </field>
     </record>
-
 </odoo>

purchase_manual_delivery/wizard/create_manual_stock_picking.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="view_create_stock_picking" model="ir.ui.view">
         <field name="name">Create Stock Picking</field>
         <field name="model">create.stock.picking.wizard</field>
@@ -59,5 +58,4 @@
         <field name="target">new</field>
         <field name="binding_model_id" ref="purchase.model_purchase_order_line" />
     </record>
-
 </odoo>