Merge PR #4527 into 16.0

Signed-off-by MarcoCalcagni
OCA · Jan 31, 2025 · 90ae8a5 · 90ae8a5
2 parents 8f0e9a1 + 36790bb
commit 90ae8a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/l10n_it_delivery_note/views/stock_delivery_note.xml b/l10n_it_delivery_note/views/stock_delivery_note.xml
@@ -396,7 +396,7 @@
                                             ('picking_type_code', '=', type_code),
                                             '|', '|',
                                                     '&amp;', ('picking_type_code', '=', 'incoming'), ('partner_id', '=', partner_sender_id),
-                                                    '&amp;', ('picking_type_code', '=', 'outgoing'), ('partner_id', '=', partner_id),
+                                                    '&amp;', ('picking_type_code', '=', 'outgoing'), '|', ('partner_id', '=', partner_id), ('sale_id.partner_id', '=', partner_id),
                                                  ('picking_type_code', '=', 'internal'),
                                             ]"
                             >

diff --git a/l10n_it_delivery_note/wizard/delivery_note_select.py b/l10n_it_delivery_note/wizard/delivery_note_select.py
@@ -37,6 +37,12 @@ def _compute_fields(self):
             self.picking_ids += self.selected_picking_ids
         else:
             self.picking_ids = self.picking_ids
+
+        self.partner_id = (
+            self.picking_ids.mapped("sale_id.partner_id")
+            if self.picking_ids.mapped("sale_id.partner_id")
+            else self.partner_id
+        ).id
         self.warning_message = self._get_warning_message()
 
         return True