temp rebasing PR 400 (7b19e6f)

ingadhoc · Sep 7, 2023 · c4aac7a · c4aac7a
2 parents 42cf160 + 7b19e6f
commit c4aac7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/stock_ux/report/ir.action.reports.xml b/stock_ux/report/ir.action.reports.xml
@@ -39,7 +39,7 @@
     </record>
 
     <record id="action_custom_barcode_transfer_template_view_pdf" model="ir.actions.report">
-    <field name="name">Codigo de barras de paquete (zpl)</field>
+    <field name="name">Etiquetas de Productos del picking (ZPL)</field>
     <field name="model">stock.picking</field>
     <field name="binding_model_id" ref="stock.model_stock_picking"/>
     <field name="report_type">qweb-text</field>

diff --git a/stock_ux/views/report_deliveryslip.xml b/stock_ux/views/report_deliveryslip.xml
@@ -31,6 +31,12 @@
         <xpath expr="//td[@name='move_line_aggregated_qty_ordered']" position="replace"/>
     </template>
 
+    <template id="custom_stock_report_delivery_aggregated_move_lines" inherit_id="stock.stock_report_delivery_aggregated_move_lines">
+        <xpath expr="//tr" position="attributes">
+            <attribute name="t-if">aggregated_lines[line]['qty_done']</attribute>
+        </xpath>
+    </template>
+
     <template id="stock_report_delivery_has_serial_move_line" inherit_id="stock.stock_report_delivery_has_serial_move_line">
         <xpath expr="//td[1]" position="attributes">
             <attribute name="t-if">o.env['ir.config_parameter'].sudo().get_param('stock_ux.delivery_slip_use_origin', 'False') == 'False' or not move_line.origin_description</attribute>