[ADD] stock_ux: zpl and pdf report, change of repository

ingadhoc · Aug 11, 2023 · ea6d4a8 · ea6d4a8
1 parent cfa5346
commit ea6d4a8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 27 deletions.
diff --git a/stock_ux/__manifest__.py b/stock_ux/__manifest__.py
@@ -19,7 +19,7 @@
 ##############################################################################
 {
     'name': 'Stock UX',
-    'version': "15.0.1.5.0",
+    'version': "15.0.1.6.0",
     'category': 'Warehouse Management',
     'sequence': 14,
     'summary': '',
@@ -50,8 +50,9 @@
         'views/res_config_settings_views.xml',
         'wizards/stock_operation_wizard_views.xml',
         'report/stock_ux_report.xml',
+        'report/report_stock_forecasted.xml',
         'report/ir.action.reports.xml',
-        'report/picking_templates.xml',
+        'report/picking_templates.xml'
     ],
     'assets': {
         'web.assets_backend': [

diff --git a/stock_ux/report/ir.action.reports.xml b/stock_ux/report/ir.action.reports.xml
@@ -18,23 +18,24 @@
     </record>
 
     <record id="action_custom_label_transfer_template_zpl" model="ir.actions.report">
-    <field name="name">Etiqueta de despacho (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>
-    <field name="report_name">stock_ux.custom_label_transfer_template_view_zpl</field>
-    <field name="report_file">stock_ux.custom_label_transfer_template_view_zpl</field>
-    <field name="binding_type">report</field>
+        <field name="name">Etiqueta de despacho (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>
+        <field name="report_name">stock_ux.custom_label_transfer_template_view_zpl</field>
+        <field name="report_file">stock_ux.custom_label_transfer_template_view_zpl</field>
+        <field name="binding_type">report</field>
     </record>
 
     <record id="action_custom_label_transfer_template_view_pdf" model="ir.actions.report">
-    <field name="name">Etiqueta de despacho (PDF)</field>
-    <field name="model">stock.picking</field>
-    <field name="binding_model_id" ref="stock.model_stock_picking"/>
-    <field name="report_type">qweb-pdf</field>
-    <field name="report_name">stock_ux.custom_label_transfer_template_view_pdf</field>
-    <field name="report_file">stock_ux.custom_label_transfer_template_view_pdf</field>
-    <field name="binding_type">report</field>
-    <field name="paperformat_id" ref="stock_ux.label_10x15"/>
+        <field name="name">Etiqueta de despacho (PDF)</field>
+        <field name="model">stock.picking</field>
+        <field name="binding_model_id" ref="stock.model_stock_picking"/>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">stock_ux.custom_label_transfer_template_view_pdf</field>
+        <field name="report_file">stock_ux.custom_label_transfer_template_view_pdf</field>
+        <field name="binding_type">report</field>
+        <field name="paperformat_id" ref="stock_ux.label_10x15"/>
     </record>
 </odoo>
+
diff --git a/stock_ux/report/picking_templates.xml b/stock_ux/report/picking_templates.xml
@@ -2,17 +2,17 @@
 <odoo>
     <data>
         <template id="stock_ux.custom_label_transfer_template_view_zpl">
-                <t t-foreach="docs" t-as="picking">
-                        <t t-set="numero" t-value="0"/>
-                        <t t-set="qty" t-value="picking.number_of_packages"/>
-                        <t t-if="qty == 0">
-                            <t t-set="qty" t-value="1"/>
-                        </t>
-                        <t t-foreach="range(qty)" t-as="item">
-                            <t t-set="numero" t-value="numero + 1"/>
-                            <t t-translation="off">
+            <t t-foreach="docs" t-as="picking">
+                <t t-set="numero" t-value="0"/>
+                <t t-set="qty" t-value="picking.number_of_packages"/>
+                <t t-if="qty == 0">
+                    <t t-set="qty" t-value="1"/>
+                </t>
+                <t t-foreach="range(qty)" t-as="item">
+                    <t t-set="numero" t-value="numero + 1"/>
+                    <t t-translation="off">
 ^XA
-                                                        <!-- Inicio encabezado -->
+<!-- Inicio encabezado -->
 <t t-if="picking.book_id">
 <t t-if="picking.book_id.report_partner_id">
 ^CF0,60^CI28^FO50,50^FD
@@ -138,7 +138,12 @@ Fecha
 </t>
 </t>
 </t>
+<<<<<<< HEAD
     </template>
+=======
+</template>
+
+>>>>>>> [ADD] stock_ux: zpl and pdf report, change of repository
     <template id="stock_ux.custom_label_transfer_template_view_pdf">
         <t t-call="web.basic_layout">
             <t t-foreach="docs" t-as="picking">
@@ -263,8 +268,13 @@ Transportista:
                                 <t t-esc="picking.voucher_ids.name"/>
                             </div>
                             <br/>
+<<<<<<< HEAD
                             <div name="footer_left_column" position="inside">
                                 <img t-if="picking.name" t-att-src="'/report/barcode/?barcode_type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', picking.name, 400, 40)" alt="barcode" style="height:40"/>
+=======
+                            <div name="footer_left_column" class="col-12 text-center">
+                                <img t-if="picking.name" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;humanreadable=1' % ('I2of5', picking.name)" alt="Barcode" style="height:40px;"/>
+>>>>>>> [ADD] stock_ux: zpl and pdf report, change of repository
                             </div>
 
                             <div style="text-align: center;">