odoo-addon-shipment-advice 16.0.1.7.2.3__py3-none-any.whl → 18.0.1.0.0.4__py3-none-any.whl

odoo/addons/shipment_advice/tests/test_shipment_advice_async.py

@@ -15,7 +15,7 @@ class TestShipmentAdvice(Common):
         cls.shipment_advice_in.run_in_queue_job = True
         cls.shipment_advice_out.run_in_queue_job = True
         cls.product_out4 = cls.env["product.product"].create(
-            {"name": "product_out4", "type": "product"}
+            {"name": "product_out4", "is_storable": True, "type": "consu"}
         )
         cls.group1 = cls.env["procurement.group"].create({})
         cls.group2 = cls.env["procurement.group"].create({})
@@ -53,7 +53,7 @@ class TestShipmentAdvice(Common):
         self.plan_records_in_shipment(self.shipment_advice_in, picking)
         self.progress_shipment_advice(self.shipment_advice_in)
         for ml in picking.move_line_ids:
-            ml.qty_done = ml.reserved_uom_qty
+            ml.picked = True
         picking._action_done()
         with trap_jobs() as trap:
             self.shipment_advice_in.action_done()
@@ -83,7 +83,7 @@ class TestShipmentAdvice(Common):
         self.progress_shipment_advice(self.shipment_advice_in)
         # Receive it (making its related transfer partially received)
         for ml in self.move_product_in1.move_line_ids:
-            ml.qty_done = ml.reserved_uom_qty
+            ml.picked = True
         self.assertEqual(picking, self.move_product_in2.picking_id)
         # When validating the shipment, a backorder is created for unprocessed moves
         with trap_jobs() as trap:

odoo/addons/shipment_advice/tests/test_shipment_advice_load.py

@@ -150,11 +150,19 @@ class TestShipmentAdviceLoad(Common):
                 package_level,
             )
 
-    def test_load_check_package(self):
-        """load should ignore done and cancelled lines"""
+    def test_load_check_package_partial_loading(self):
+        """
+        Test that loading only part of a package fails with UserError.
+        When a package contains multiple move lines, attempting to load only
+        some of those move lines should fail with a UserError.
+        """
         move1lines = self.move_product_out1.move_line_ids
         move2lines = self.move_product_out2.move_line_ids
         picking = self.move_product_out1.picking_id
+
+        self.move_product_out2.picking_id = picking
+        picking.action_assign()
+        move2lines = self.move_product_out2.move_line_ids
         picking._put_in_pack(move1lines | move2lines)
-        self.move_product_out2._action_done()
-        move1lines._load_in_shipment(self.shipment_advice_out)
+        with self.assertRaisesRegex(UserError, "You cannot load this move line alone"):
+            move1lines._load_in_shipment(self.shipment_advice_out)

odoo/addons/shipment_advice/tests/test_shipment_advice_picking_values.py

@@ -14,7 +14,7 @@ class TestShipmentPickingValues(Common):
     def test_picking_loaded_waiting_quantity_yes(self):
         move = self.move_product_out1
         picking = move.picking_id
-        quantity = move.product_qty
-        move.move_line_ids.reserved_uom_qty = quantity - 3
+        quantity = move.product_uom_qty
+        move.quantity = quantity - 3
         self.load_records_in_shipment(self.shipment_advice_out, picking)
         self.assertEqual(picking.loaded_waiting_quantity, 3)

odoo/addons/shipment_advice/tests/test_shipment_advice_stock_user.py

@@ -18,7 +18,7 @@ class TestShipmentAdviceStockUser(Common):
     def test_shipment_advice_button_open_planned_moves(self):
         shipment_advice = self.shipment_advice_out.with_user(self.stock_user)
         action = shipment_advice.button_open_planned_moves()
-        self.assertEqual(action["name"], "Stock Moves")
+        self.assertEqual(action["name"], "Moves Analysis")
 
     def test_shipment_advice_button_open_loaded_pickings(self):
         shipment_advice = self.shipment_advice_out.with_user(self.stock_user)

odoo/addons/shipment_advice/tests/test_shipment_advice_unload.py

@@ -27,13 +27,13 @@ class TestShipmentAdviceUnload(Common):
         # Load move line
         move_line = self.move_product_out1.move_line_ids
         self.load_records_in_shipment(self.shipment_advice_out, move_line)
-        self.assertEqual(move_line.qty_done, 20)
+        self.assertTrue(move_line.picked)
         self.assertEqual(
             self.shipment_advice_out.loaded_move_line_without_package_ids, move_line
         )
         # Unload it
         self.unload_records_from_shipment(self.shipment_advice_out, move_line)
-        self.assertFalse(move_line.qty_done)
+        self.assertFalse(move_line.picked)
         self.assertFalse(self.shipment_advice_out.loaded_move_line_without_package_ids)
 
     def test_shipment_advice_unload_package_level(self):
@@ -42,8 +42,8 @@ class TestShipmentAdviceUnload(Common):
         package_level = self.move_product_out2.move_line_ids.package_level_id
         self.load_records_in_shipment(self.shipment_advice_out, package_level)
         self.assertTrue(package_level.is_done)
-        self.assertEqual(self.move_product_out2.move_line_ids.qty_done, 10)
-        self.assertEqual(self.move_product_out3.move_line_ids.qty_done, 10)
+        self.assertTrue(self.move_product_out2.move_line_ids.picked)
+        self.assertTrue(self.move_product_out3.move_line_ids.picked)
         self.assertFalse(self.shipment_advice_out.loaded_move_line_without_package_ids)
         self.assertEqual(
             self.shipment_advice_out.loaded_package_ids, package_level.package_id
@@ -51,6 +51,6 @@ class TestShipmentAdviceUnload(Common):
         # Unload it
         package_level._unload_from_shipment()
         self.assertFalse(package_level.is_done)
-        self.assertFalse(self.move_product_out2.move_line_ids.qty_done)
-        self.assertFalse(self.move_product_out3.move_line_ids.qty_done)
+        self.assertFalse(self.move_product_out2.move_line_ids.picked)
+        self.assertFalse(self.move_product_out3.move_line_ids.picked)
         self.assertFalse(self.shipment_advice_out.loaded_package_ids)

odoo/addons/shipment_advice/views/res_config_settings.xml

@@ -8,60 +8,55 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath
-                expr="//field[@name='group_stock_adv_location']/ancestor::div[hasclass('o_setting_box')]"
-                position="after"
-            >
-                <div class="col-12 col-lg-6 o_setting_box">
-                    <div class="o_setting_left_pane">
-          </div>
+            <xpath expr="//setting[@id='use_own_routes']" position="after">
+                <setting
+                    id="shipment_advice_backorder_policy"
+                    title="Backorder Policy for Outgoing Shipments"
+                    help="Configure how outgoing shipment advice handles backorders for deliveries"
+                >
                     <div class="o_setting_right_pane">
                         <label for="shipment_advice_outgoing_backorder_policy" />
                         <div class="text-muted">
-              If you want that closing an outgoing shipment advice marks as
-              done all related deliveries and create backorder in case of
-              partial choose 'Create backorder'.
-              If you want to mark deliveries as done only when they are all
-              loaded in a shipment advice choose 'Leave open'. This last option
-              is useful when your deliveries will be shipped by several trucks.
-            </div>
+                            If you want that closing an outgoing shipment advice marks as
+                            done all related deliveries and create backorder in case of
+                            partial choose 'Create backorder'.
+                            If you want to mark deliveries as done only when they are all
+                            loaded in a shipment advice choose 'Leave open'. This last option
+                            is useful when your deliveries will be shipped by several trucks.
+                        </div>
                         <field name="shipment_advice_outgoing_backorder_policy" />
                     </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+
+                <setting
                     id="shipment_advice_run_in_queue_job"
-                    title="shipment_advice_run_in_queue_job"
+                    title="Use Queue Jobs for Shipment Advice"
+                    help="Process shipment advice validation through queued jobs to handle large shipments"
                 >
-                    <div class="o_setting_left_pane">
-                        <field name="shipment_advice_run_in_queue_job" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="shipment_advice_run_in_queue_job" />
+                    <field name="shipment_advice_run_in_queue_job" />
+                    <div class="content-group">
                         <div class="text-muted">
                             To prevent timeouts for large shipments, enable this option to execute
                             shipment advice validation through a queued job. Each picking will be
                             validated in a separate jobs.
                         </div>
                     </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+
+                <setting
                     id="shipment_advice_auto_close_incoming"
-                    title="shipment_advice_auto_close_incoming"
+                    title="Auto-close Incoming Shipments"
+                    help="Automatically close incoming shipment advice when all moves are completed"
                 >
-                    <div class="o_setting_left_pane">
-                        <field name="shipment_advice_auto_close_incoming" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="shipment_advice_auto_close_incoming" />
+                    <field name="shipment_advice_auto_close_incoming" />
+                    <div class="content-group">
                         <div class="text-muted">
                             This flag indicates if an incoming shipment advice
                             will be automatically set to done
                             if all related moves are done or canceled
                         </div>
                     </div>
-                </div>
+                </setting>
             </xpath>
         </field>
     </record>

odoo/addons/shipment_advice/views/shipment_advice.xml

@@ -12,7 +12,7 @@
                 date_stop="departure_date"
                 mode="week"
                 color="dock_id"
-                quick_add="False"
+                quick_create="0"
             >
                 <field name="name" />
                 <field name="state" />
@@ -30,35 +30,35 @@
                         type="object"
                         string="Confirm"
                         class="btn-primary"
-                        states="draft"
+                        invisible="state != 'draft'"
                     />
                     <button
                         name="action_in_progress"
                         type="object"
                         string="Start"
                         class="btn-primary"
-                        states="confirmed"
+                        invisible="state != 'confirmed'"
                     />
                     <button
                         name="action_done"
                         type="object"
                         string="Mark as done"
                         class="btn-primary"
-                        states="in_progress,error"
+                        invisible="state not in ['in_progress','error']"
                     />
                     <button
                         name="action_cancel"
                         type="object"
                         string="Cancel"
                         class="btn-secondary"
-                        states="confirmed,in_progress"
+                        invisible="state not in ['in_progress','confirmed']"
                     />
                     <button
                         name="action_draft"
                         type="object"
                         string="Back to draft"
                         class="btn-secondary"
-                        states="cancel"
+                        invisible="state != 'cancel'"
                     />
                     <field
                         name="state"
@@ -69,10 +69,10 @@
                 <div
                     class="alert alert-danger mb-0"
                     role="alert"
-                    attrs="{'invisible': [('state', '!=', 'error')]}"
+                    invisible="state != 'error'"
                 >
                     <field name="error_message" />
-                    </div>
+                </div>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
                         <button
@@ -80,8 +80,7 @@
                             type="object"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            states="draft,confirmed"
-                            attrs="{'invisible': [('planned_picking_ids', '=', [])]}"
+                            invisible="not planned_picking_ids or state not in ['draft','confirmed']"
                         >
                             <field
                                 string="Planned"
@@ -94,8 +93,7 @@
                             type="object"
                             class="oe_stat_button"
                             icon="fa-list"
-                            states="draft,confirmed"
-                            attrs="{'invisible': [('planned_move_ids', '=', [])]}"
+                            invisible="not planned_move_ids or state not in ['draft','confirmed']"
                         >
                             <field
                                 string="Planned bulk"
@@ -108,8 +106,7 @@
                             type="object"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            states="in_progress"
-                            attrs="{'invisible': ['|', ('shipment_type', '!=', 'outgoing'), ('loaded_picking_ids', '=', [])]}"
+                            invisible="shipment_type != 'outgoing' or not loaded_picking_ids or state != 'in_progress'"
                         >
                             <field
                                 string="Loaded"
@@ -122,8 +119,7 @@
                             type="object"
                             class="oe_stat_button"
                             icon="fa-list"
-                            states="in_progress"
-                            attrs="{'invisible': ['|', ('shipment_type', '!=', 'outgoing'), ('loaded_move_line_without_package_ids', '=', [])]}"
+                            invisible="shipment_type != 'outgoing' or not loaded_move_line_without_package_ids or state != 'in_progress'"
                         >
                             <field
                                 string="Loaded bulk"
@@ -136,8 +132,7 @@
                             type="object"
                             class="oe_stat_button"
                             icon="fa-cubes"
-                            states="in_progress"
-                            attrs="{'invisible': ['|', ('shipment_type', '!=', 'outgoing'), ('loaded_package_ids', '=', [])]}"
+                            invisible="shipment_type != 'outgoing' or not loaded_package_ids or state != 'in_progress'"
                         >
                             <field
                                 string="Loaded packages"
@@ -151,8 +146,7 @@
                             string="Loading Progress"
                             class="oe_stat_button"
                             icon="fa-tasks"
-                            states="in_progress"
-                            attrs="{'invisible': ['|', '|', ('shipment_type', '!=', 'outgoing'), ('loaded_picking_ids', '=', []), ('state', '!=', 'in_progress')]}"
+                            invisible="shipment_type != 'outgoing' or not loaded_picking_ids or state != 'in_progress'"
                         />
                         <button
                             name="button_open_receptions_in_progress"
@@ -160,79 +154,73 @@
                             string="Unloading Progress"
                             class="oe_stat_button"
                             icon="fa-tasks"
-                            attrs="{'invisible': ['|', '|', ('shipment_type', '!=', 'incoming'), ('planned_picking_ids', '=', []), ('state', '!=', 'in_progress')]}"
+                            invisible="shipment_type != 'incoming' or not planned_picking_ids or state != 'in_progress'"
                         />
                     </div>
                     <h1>
-                        <field name="name" attrs="{'invisible': [('name','=','/')]}" />
+                        <field name="name" invisible="name == '/'" />
                     </h1>
                     <group>
                         <group name="info1">
                             <field
                                 name="warehouse_id"
+                                readonly="state != 'draft'"
                                 groups="stock.group_stock_multi_warehouses"
                             />
-                            <field
-                                name="warehouse_id"
-                                groups="!stock.group_stock_multi_warehouses"
-                                invisible="1"
-                            />
                             <field
                                 name="company_id"
                                 groups="base.group_multi_company"
                             />
-                            <field
-                                name="company_id"
-                                groups="!base.group_multi_company"
-                                invisible="1"
-                            />
-                            <field
-                                name="shipment_type"
-                                attrs="{'readonly': [('name', '!=', '/')]}"
-                            />
+                            <field name="shipment_type" readonly="name != '/'" />
                         </group>
                         <group name="info2">
                             <field
                                 name="dock_id"
+                                readonly="state not in ('draft', 'confirmed')"
                                 domain="[('warehouse_id', '=', warehouse_id)]"
                             />
-                            <field name="arrival_date" />
-                            <field name="departure_date" />
-                            <field name="ref" />
+                            <field
+                                name="arrival_date"
+                                readonly="state not in ('draft', 'confirmed')"
+                            />
+                            <field
+                                name="departure_date"
+                                readonly="state not in ('draft', 'in_progress', 'confirmed')"
+                            />
+                            <field
+                                name="ref"
+                                readonly="state not in ('draft', 'in_progress', 'confirmed')"
+                            />
                         </group>
                     </group>
-                    <field name="planned_picking_ids" invisible="1" />
-                    <field name="planned_move_ids" invisible="1" />
-                    <field name="loaded_picking_ids" invisible="1" />
-                    <field name="loaded_package_ids" invisible="1" />
                     <notebook>
                         <page
                             string="Lading"
                             name="loaded_move_lines_without_package"
-                            attrs="{'invisible': [('state', 'in', ('draft', 'confirmed'))]}"
+                            invisible="state in ['draft','confirmed']"
                         >
                             <span class="o_horizontal_separator">Bulk content</span>
                             <field
                                 name="loaded_move_line_without_package_ids"
                                 widget="many2many"
+                                readonly="state not in ('draft', 'in_progress', 'confirmed')"
                                 context="{'search_default_incoming': True if shipment_type == 'incoming' else False,
                                 'search_default_outgoing': True if shipment_type == 'outgoing' else False}"
                             >
-                                <tree create="0">
+                                <list create="0">
                                     <field name="picking_id" />
                                     <field name="product_id" />
                                     <field name="lot_id" />
-                                    <field name="reserved_uom_qty" />
-                                    <field name="qty_done" />
+                                    <field name="picked" />
                                     <field name="product_uom_id" />
                                     <field name="state" />
-                                </tree>
+                                </list>
                             </field>
                             <span class="o_horizontal_separator">Package content</span>
                             <field
                                 name="loaded_package_level_ids"
                                 nolabel="1"
-                                context="{'tree_view_ref': 'shipment_advice.stock_package_level_limited_view_tree'}"
+                                context="{'list_view_ref': 'shipment_advice.stock_package_level_limited_view_tree'}"
                             />
                         </page>
                         <page name="carriers" string="Related shipping methods">
@@ -252,11 +240,7 @@
                         </strong>
                     </group>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter />
             </form>
         </field>
     </record>
@@ -264,7 +248,7 @@
         <field name="name">shipment.advice.tree</field>
         <field name="model">shipment.advice</field>
         <field name="arch" type="xml">
-            <tree
+            <list
                 decoration-info="state == 'draft'"
                 decoration-muted="state == 'cancel'"
                 decoration-danger="state not in ('draft', 'cancel', 'done') and arrival_date &lt; current_date"
@@ -282,13 +266,8 @@
                 />
                 <!-- pylint: disable=duplicate-xml-fields -->
                 <field name="company_id" groups="base.group_multi_company" />
-                <field
-                    name="company_id"
-                    groups="!base.group_multi_company"
-                    invisible="1"
-                />
                 <field name="state" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="shipment_advice_view_search" model="ir.ui.view">
@@ -344,9 +323,8 @@
     </record>
     <record id="shipment_advice_action" model="ir.actions.act_window">
         <field name="name">Shipment Advices</field>
-        <field name="type">ir.actions.act_window</field>
         <field name="res_model">shipment.advice</field>
-        <field name="view_mode">calendar,tree,form</field>
+        <field name="view_mode">calendar,list,form</field>
         <field name="context">{'default_name': '/'}</field>
     </record>
     <record
@@ -360,7 +338,7 @@
     </record>
     <record id="shipment_advice_action_view_tree" model="ir.actions.act_window.view">
         <field name="sequence" eval="2" />
-        <field name="view_mode">tree</field>
+        <field name="view_mode">list</field>
         <field name="view_id" ref="shipment_advice_view_tree" />
         <field name="act_window_id" ref="shipment_advice_action" />
     </record>

odoo/addons/shipment_advice/views/stock_move.xml

@@ -8,7 +8,10 @@
         <field name="inherit_id" ref="stock.view_move_tree" />
         <field name="arch" type="xml">
             <field name="state" position="before">
-                <field name="shipment_advice_id" />
+                <field
+                    name="shipment_advice_id"
+                    readonly="state not in ('draft', 'in_progress', 'confirmed')"
+                />
             </field>
         </field>
     </record>

odoo/addons/shipment_advice/views/stock_move_line.xml

@@ -8,7 +8,10 @@
         <field name="inherit_id" ref="stock.view_move_line_tree" />
         <field name="arch" type="xml">
             <field name="location_dest_id" position="after">
-                <field name="shipment_advice_id" />
+                <field
+                    name="shipment_advice_id"
+                    readonly="shipment_advice_id.state not in ('draft', 'in_progress', 'confirmed')"
+                />
             </field>
         </field>
     </record>
@@ -41,18 +44,17 @@
             <field name="result_package_id" position="after">
                 <field
                     name="shipment_advice_id"
+                    column_invisible="parent.picking_type_code != 'outgoing'"
                     optional="show"
-                    attrs="{'column_invisible': [('parent.picking_type_code', '!=', 'outgoing')]}"
                 />
             </field>
             <field name="product_uom_id" position="after">
-                <field name="picking_code" invisible="1" />
                 <button
                     name="button_load_in_shipment"
                     type="object"
                     icon="fa-truck"
                     title="Load in shipment"
-                    attrs="{'invisible': ['|', ('shipment_advice_id', '!=', False), ('picking_code', '!=', 'outgoing')]}"
+                    invisible="shipment_advice_id or picking_code != 'outgoing'"
                     context="{'open_shipment': False}"
                 />
             </field>
@@ -64,14 +66,13 @@
         <field name="priority" eval="100" />
         <field name="arch" type="xml">
             <!-- string="Products" -->
-            <tree create="0">
+            <list create="0">
                 <field name="picking_id" />
                 <field name="product_id" />
                 <field name="lot_id" />
-                <field name="reserved_uom_qty" />
-                <field name="qty_done" />
+                <field name="picked" />
                 <field name="product_uom_id" />
-            </tree>
+            </list>
         </field>
     </record>
 </odoo>

odoo/addons/shipment_advice/views/stock_package_level.xml

@@ -10,7 +10,7 @@
             <field name="location_dest_id" position="after">
                 <field
                     name="shipment_advice_id"
-                    attrs="{'column_invisible': [('parent.picking_type_code', '!=', 'outgoing')]}"
+                    column_invisible="parent.picking_type_code != 'outgoing'"
                 />
             </field>
             <field name="is_done" position="after">
@@ -19,7 +19,7 @@
                     type="object"
                     icon="fa-truck"
                     title="Load in shipment"
-                    attrs="{'invisible': ['|', ('shipment_advice_id', '!=', False), ('parent.picking_type_code', '!=', 'outgoing')]}"
+                    invisible="shipment_advice_id or parent.picking_type_code != 'outgoing'"
                     context="{'open_shipment': False}"
                 />
             </field>
@@ -30,7 +30,7 @@
         <field name="model">stock.package_level</field>
         <field name="priority">2000</field>
         <field name="arch" type="xml">
-            <tree decoration-muted="state == 'done'" create="0">
+            <list decoration-muted="state == 'done'" create="0">
                 <field name="picking_id" />
                 <field name="package_id" />
                 <field name="location_id" groups="stock.group_stock_multi_locations" />
@@ -41,8 +41,8 @@
                 <field name="state" />
                 <field name="is_done" />
                 <field name="package_shipping_weight" />
-                <field name="package_weight_uom_name" string=" " />
-            </tree>
+                <field name="package_shipping_weight_uom_name" string=" " />
+            </list>
         </field>
     </record>
 </odoo>