03.02.26

modules/purchase_trade/stock.py

@@ -471,10 +471,14 @@ class ShipmentIn(metaclass=PoolMeta):
         lines = [
             "<p>Hi,</p>",
             "<p>Please find details below for the requested control</p>",
-            f"<p><strong>BL number:</strong> {self.bl_number}</p>",
-            f"<p><strong>ETA:</strong> {self.eta}</p>",
-            f"<p><strong>Vessel:</strong> {vessel}</p>",
         ]
+        lines.append(
+                "<p>"
+                f"<strong>BL number:</strong> {self.bl_number} | "
+                f"<strong>Vessel:</strong> {vessel} | "
+                f"<strong>ETA:</strong> {self.eta}"
+                "</p>"
+            )
 
         if self.incoming_moves:
             tot_net = sum([m.lot.get_current_quantity() for m in self.incoming_moves])
@@ -483,14 +487,8 @@ class ShipmentIn(metaclass=PoolMeta):
             customer = self.incoming_moves[0].lot.sale_line.sale.party.name if self.incoming_moves[0].lot.sale_line else ""
             unit = self.incoming_moves[0].lot.lot_unit_line.symbol
             lines.append("<p>"
-                f"<strong>Customer:</strong> {customer}"
-                "</p>"
-            )
-            lines.append("<p>"
-                f"<strong>Invoice Nb:</strong> {inv_nb}"
-                "</p>"
-            )
-            lines.append("<p>"
+                f"<strong>Customer:</strong> {customer} | "
+                f"<strong>Invoice Nb:</strong> {inv_nb} | "
                 f"<strong>Invoice Date:</strong> {inv_date}"
                 "</p>"
             )
@@ -715,8 +713,7 @@ class ShipmentIn(metaclass=PoolMeta):
             attachment = None
             if sh.add_bl:
                 attachments = Attachment.search([
-                    ('res_model', '=', 'stock.shipment.in'),
-                    ('res_id', '=', sh.id),
+                    ('resource', '=', 'stock.shipment.in,' + str(sh.id)),
                 ])
                 if attachments:
                     attachment = attachments[0]