Merge branch 'T8310' into 'master'

[IMP][T8404] Delivery carrier fields mods

See merge request !64

report/stock_picking_report_qweb.xml

@@ -217,8 +217,8 @@
 
                             <div style="position: relative; top: 30mm;">
                                 <span>Cantidad de bultos: </span><span style="font-weight: normal;"><t t-out="o.packages_quant" /></span>
-                                <span style="margin-left: 50mm">Peso: </span><span style="font-weight: normal;"><t t-out="o.weight" /></span>
-                                <span style="margin-left: 50mm">Valor declarado: </span><span style="font-weight: normal;"><t t-out="o.declared_value" /></span>
+                                <span style="margin-left: 50mm">Peso: </span><span style="font-weight: normal;"><t t-out="o.packages_kgs" /> kg</span>
+                                <span style="margin-left: 50mm">Valor declarado: </span><span style="font-weight: normal;">$ <t t-out="o.declared_value" /></span>
                             </div>
 
                             <div style="position: relative; top: 45mm;">