[FIX]sale_blanket_order: adapt to v16.0

OCA · Mar 7, 2024 · a95b866 · a95b866
1 parent fd343ab
commit a95b866
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 25 deletions.
diff --git a/l10n_it_delivery_note/demo/delivery_carrier_demo.xml b/l10n_it_delivery_note/demo/delivery_carrier_demo.xml
@@ -7,8 +7,4 @@
     <record id="delivery.free_delivery_carrier" model="delivery.carrier">
         <field name="partner_id" ref="l10n_it_delivery_note.partner_carrier_1" />
     </record>
-
-    <record id="delivery.normal_delivery_carrier" model="delivery.carrier">
-        <field name="partner_id" ref="l10n_it_delivery_note.partner_carrier_2" />
-    </record>
 </odoo>
diff --git a/l10n_it_delivery_note/tests/delivery_note_common.py b/l10n_it_delivery_note/tests/delivery_note_common.py
@@ -64,7 +64,7 @@ def create_picking(self, **kwargs):
             "picking_type_id": self.env.ref("stock.picking_type_out").id,
             "location_id": self.env.ref("stock.stock_location_stock").id,
             "location_dest_id": self.env.ref("stock.stock_location_customers").id,
-            "move_lines": [
+            "move_ids": [
                 (
                     0,
                     0,

diff --git a/l10n_it_delivery_note/tests/test_stock_delivery_note.py b/l10n_it_delivery_note/tests/test_stock_delivery_note.py
@@ -114,7 +114,7 @@ def test_delivery_action_confirm(self):
         picking = self.create_picking(
             carrier_id=self.env.ref("delivery.delivery_carrier").id
         )
-        picking.move_lines.quantity_done = 1
+        picking.move_ids.quantity_done = 1
         picking.button_validate()
 
         dn_form = Form(
@@ -126,11 +126,19 @@ def test_delivery_action_confirm(self):
         dn.confirm()
 
         delivery_note_id = picking.delivery_note_id
-
-        new_picking = self.create_picking(
-            carrier_id=self.env.ref("delivery.normal_delivery_carrier").id
+        normal_delivery_carrier = self.env[""].create(
+            {
+                "name": "Normal Delivery Charges",
+                "fixed_price": 10.0,
+                "sequence": 3,
+                "delivery_type": "fixed",
+                "product_id": self.env.ref(
+                    "delivery.product_product_delivery_normal"
+                ).id,
+            }
         )
-        new_picking.move_lines.quantity_done = 1
+        new_picking = self.create_picking(carrier_id=normal_delivery_carrier.id)
+        new_picking.move_ids.quantity_done = 1
         new_picking.button_validate()
 
         delivery_note_id.write({"picking_ids": [(4, new_picking.id)]})
@@ -199,12 +207,12 @@ def test_delivery_action_confirm_without_ref(self):
             picking_type_id=self.env.ref("stock.picking_type_in").id,
             carrier_id=self.env.ref("delivery.delivery_carrier").id,
         )
-        picking.move_lines.quantity_done = 1
+        picking.move_ids.quantity_done = 1
         picking.button_validate()
 
         dn_form = Form(
             self.env["stock.delivery.note.create.wizard"].with_context(
-                {"active_id": picking.id, "active_ids": picking.ids}
+                **{"active_id": picking.id, "active_ids": picking.ids}
             )
         )
         dn = dn_form.save()

diff --git a/l10n_it_delivery_note/tests/test_stock_delivery_note_portal.py b/l10n_it_delivery_note/tests/test_stock_delivery_note_portal.py
@@ -33,10 +33,10 @@ def setUp(self):
         self.sales_order_mr.action_confirm()
         self.assertEqual(len(self.sales_order_mr.picking_ids), 1)
         self.picking_mr = self.sales_order_mr.picking_ids
-        self.assertEqual(len(self.picking_mr.move_lines), 2)
+        self.assertEqual(len(self.picking_mr.move_ids), 2)
 
-        self.picking_mr.move_lines[0].quantity_done = 1
-        self.picking_mr.move_lines[1].quantity_done = 1
+        self.picking_mr.move_ids[0].quantity_done = 1
+        self.picking_mr.move_ids[1].quantity_done = 1
 
         self.picking_mr.button_validate()
         self.delivery_note_mr = self.picking_mr.delivery_note_id
@@ -57,10 +57,10 @@ def setUp(self):
         self.sales_order_ab.action_confirm()
         self.assertEqual(len(self.sales_order_ab.picking_ids), 1)
         self.picking_ab = self.sales_order_ab.picking_ids
-        self.assertEqual(len(self.picking_ab.move_lines), 2)
+        self.assertEqual(len(self.picking_ab.move_ids), 2)
 
-        self.picking_ab.move_lines[0].quantity_done = 1
-        self.picking_ab.move_lines[1].quantity_done = 1
+        self.picking_ab.move_ids[0].quantity_done = 1
+        self.picking_ab.move_ids[1].quantity_done = 1
 
         self.picking_ab.button_validate()
         self.delivery_note_ab = self.picking_ab.delivery_note_id
@@ -77,10 +77,10 @@ def setUp(self):
         self.sales_order_ab_mr.action_confirm()
         self.assertEqual(len(self.sales_order_ab_mr.picking_ids), 1)
         self.picking_ab_mr = self.sales_order_ab_mr.picking_ids
-        self.assertEqual(len(self.picking_ab_mr.move_lines), 1)
+        self.assertEqual(len(self.picking_ab_mr.move_ids), 1)
         self.picking_ab_mr.partner_id = self.user_mr.partner_id
 
-        self.picking_ab_mr.move_lines[0].quantity_done = 1
+        self.picking_ab_mr.move_ids[0].quantity_done = 1
 
         self.picking_ab_mr.button_validate()
         self.delivery_note_ab_mr = self.picking_ab_mr.delivery_note_id
@@ -98,9 +98,9 @@ def setUp(self):
         self.sales_order_azr.action_confirm()
         self.assertEqual(len(self.sales_order_azr.picking_ids), 1)
         self.picking_azr = self.sales_order_azr.picking_ids
-        self.assertEqual(len(self.picking_azr.move_lines), 1)
+        self.assertEqual(len(self.picking_azr.move_ids), 1)
 
-        self.picking_azr.move_lines[0].quantity_done = 1
+        self.picking_azr.move_ids[0].quantity_done = 1
 
         self.picking_azr.button_validate()
         self.delivery_note_azr = self.picking_azr.delivery_note_id

diff --git a/l10n_it_delivery_note/tests/test_stock_delivery_note_sequence.py b/l10n_it_delivery_note/tests/test_stock_delivery_note_sequence.py
@@ -176,9 +176,9 @@ def test_complete_invoicing_sequence(self):
         sale_order.action_confirm()
         picking = sale_order.picking_ids
         self.assertEqual(len(picking), 1)
-        self.assertEqual(len(picking.move_lines), 1)
+        self.assertEqual(len(picking.move_ids), 1)
 
-        picking.move_lines[0].quantity_done = 1
+        picking.move_ids[0].quantity_done = 1
         result = picking.button_validate()
         self.assertTrue(result)
 

diff --git a/l10n_it_delivery_note/views/stock_picking.xml b/l10n_it_delivery_note/views/stock_picking.xml
@@ -210,7 +210,6 @@
                                         <field
                                             name="delivery_note_carrier_id"
                                             attrs="{'readonly': [('delivery_note_readonly', '=', True)]}"
-                                            domain="[('is_carrier','=', True)]"
                                             string="Carrier"
                                         />
                                         <field