Skip to content

Commit

Permalink
[FIX] Product_ux: Clean spaces and change barcode
Browse files Browse the repository at this point in the history 
closes #521

Signed-off-by: Virginia Bonservizi <vib@adhoc.com.ar>
  • Loading branch information
@jcadhoc
jcadhoc committed May 10, 2023
1 parent fbf5560 commit c2105e3
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 80 deletions.
2 changes: 1 addition & 1 deletion product_ux/__manifest__.py
View file
Expand Up @@ -19,7 +19,7 @@
##############################################################################
{
'name': 'Product UX',
'version': "13.0.1.5.0",
'version': "13.0.1.6.0",
'category': 'Products',
'sequence': 14,
'summary': '',
Expand Down
157 changes: 78 additions & 79 deletions product_ux/report/picking_templates.xml
View file
Expand Up @@ -12,134 +12,133 @@
<t t-set="numero" t-value="numero + 1"/>
<t t-translation="off">
^XA
<!-- Inicio encabezado -->
<t t-if="picking.book_id">
<t t-if="picking.book_id.report_partner_id">

<!-- Inicio encabezado -->
<t t-if="picking.book_id">
<t t-if="picking.book_id.report_partner_id">
^CF0,60^CI28^FO50,50^FD
<t t-esc="picking.book_id.report_partner_id.name"/>
<t t-esc="picking.book_id.report_partner_id.name"/>
^FS ^CF0,30 ^FO50,115^FD
<t t-esc="picking.book_id.report_partner_id.street"/>
<t t-esc="picking.book_id.report_partner_id.street"/>
^FS ^FO50,155^FD
( <t t-esc="picking.partner_id.zip"/>
) <t t-esc="picking.book_id.report_partner_id.city"/>
(<t t-esc="picking.partner_id.zip"/>
)<t t-esc="picking.book_id.report_partner_id.city"/>
^FS ^FO50,195^FD
<t class="oe_inline" t-esc="picking.book_id.report_partner_id.state_id.name"/>
<t class="oe_inline" t-esc="picking.book_id.report_partner_id.state_id.name"/>
,
<t class="oe_inline" t-esc="picking.book_id.report_partner_id.country_id.name"/>
<t class="oe_inline" t-esc="picking.book_id.report_partner_id.country_id.name"/>
^FS ^FO50,250^GB700,3,3^FS
</t>
<t t-else="">
</t>
<t t-else="">
^CF0,60^CI28^FO50,50^FD
<t t-esc="picking.book_id.company_id.name"/>
<t t-esc="picking.book_id.company_id.name"/>
^FS ^CF0,30 ^FO50,115^FD
<t t-esc="picking.book_id.company_id.street"/>
<t t-esc="picking.book_id.company_id.street"/>
^FS ^FO50,155^FD
( <t t-esc="picking.partner_id.zip"/>
) <t t-esc="picking.book_id.company_id.city"/>
(<t t-esc="picking.partner_id.zip"/>
)<t t-esc="picking.book_id.company_id.city"/>
^FS ^FO50,195^FD
<t class="oe_inline" t-esc="picking.book_id.company_id.state_id.name"/>
,
<t class="oe_inline" t-esc="picking.book_id.company_id.country_id.name"/>
<t class="oe_inline" t-esc="picking.book_id.company_id.state_id.name"/>
,
<t class="oe_inline" t-esc="picking.book_id.company_id.country_id.name"/>
^FS ^FO50,250^GB700,3,3^FS
</t>
</t>
<t t-else="">
</t>
</t>
<t t-else="">
^CF0,60 ^FO50,50^FD
<t t-esc="picking.company_id.name"/>
<t t-esc="picking.company_id.name"/>
^FS ^CF0,30 ^CI28 ^FO50,115^FD
<t t-esc="picking.company_id.street"/>
<t t-esc="picking.company_id.street"/>
^FS ^FO50,155^FD
( <t t-esc="picking.partner_id.zip"/>
) <t t-esc="picking.company_id.city"/>
(<t t-esc="picking.partner_id.zip"/>
)<t t-esc="picking.company_id.city"/>
^FS ^FO50,195^FD
<t class="oe_inline" t-esc="picking.company_id.state_id.name"/>
<t class="oe_inline" t-esc="picking.company_id.state_id.name"/>
,
<t class="oe_inline" t-esc="picking.company_id.country_id.name"/>
<t class="oe_inline" t-esc="picking.company_id.country_id.name"/>

^FS ^FO50,250^GB700,3,3^FS
<!-- Fin encabezado -->
</t>
<!-- Inicio destino -->
<t t-if="picking.partner_id.parent_id">
<!-- Fin encabezado -->
</t>
<!-- Inicio destino -->
<t t-if="picking.partner_id.parent_id">
^FX Second section with recipient address and permit information. ^CFJ,23 ^FO50,280^FDDestinatario^FS ^CF0,45 ^TBN,700,100
^FO50,310^FD
<t t-esc="picking.partner_id.parent_id.name"/>
<t t-esc="picking.partner_id.parent_id.name"/>
^FS
</t>
<t t-else="">
</t>
<t t-else="">
^FX Second section with recipient address and permit information. ^CFJ,23 ^FO50,280^FDDestinatario^FS ^CF0,45 ^TBN,700,100
^FO50,310^FD
<t t-esc="picking.partner_id.name"/>
<t t-esc="picking.partner_id.name"/>
^FS
</t>
</t>
^CF0,30 ^FO50,425^FD
<t t-esc="picking.partner_id.street"/>
<t t-esc="picking.partner_id.street"/>
^FS ^FO50,465^FD
<t class="oe_inline" t-esc="picking.partner_id.zip"/>
<t class="oe_inline" t-esc="picking.partner_id.zip"/>
,
<t class="oe_inline" t-esc="picking.partner_id.city"/>
<t class="oe_inline" t-esc="picking.partner_id.city"/>
^FS ^FO50,505^FD
<t class="oe_inline" t-esc="picking.partner_id.state_id.name"/>
<t class="oe_inline" t-esc="picking.partner_id.state_id.name"/>
,
<t class="oe_inline" t-esc="picking.partner_id.country_id.name"/>
<t class="oe_inline" t-esc="picking.partner_id.country_id.name"/>
^FS ^FO50,545^FDTel: ^FS
<t t-if="picking.partner_id and (picking.partner_id.phone != False or picking.partner_id.mobile != False)">
<t t-if="picking.partner_id.phone">
<t t-if="picking.partner_id and (picking.partner_id.phone != False or picking.partner_id.mobile != False)">
<t t-if="picking.partner_id.phone">
^FO100,545^FD
<t t-esc="picking.partner_id.phone"/>
<t t-esc="picking.partner_id.phone"/>
^FS
</t>
<t t-else="">
</t>
<t t-else="">
^FO100,545^FD
<t t-esc="picking.partner_id.mobile"/>
<t t-esc="picking.partner_id.mobile"/>
^FS
</t>
</t>
<t t-if="picking.partner_id.parent_id and (picking.partner_id.parent_id.phone != False or picking.partner_id.parent_id.mobile != False) and (picking.partner_id.phone == False and picking.partner_id.mobile == False)">
<t t-if="picking.partner_id.parent_id.phone">
</t>
</t>
<t t-if="picking.partner_id.parent_id and (picking.partner_id.parent_id.phone != False or picking.partner_id.parent_id.mobile != False) and (picking.partner_id.phone == False and picking.partner_id.mobile == False)">
<t t-if="picking.partner_id.parent_id.phone">
^FO100,545^FD
<t t-esc="picking.partner_id.parent_id.phone"/>
<t t-esc="picking.partner_id.parent_id.phone"/>
^FS
</t>
<t t-else="">
</t>
<t t-else="">
^FO100,545^FD
<t t-esc="picking.partner_id.parent_id.mobile"/>
<t t-esc="picking.partner_id.parent_id.mobile"/>
^FS
</t>
</t>
<t t-else="">
</t>
</t>
<t t-else="">
^FS
</t>
<!-- Fin destino -->
<t t-if="picking._fields.get('carrier_id') and picking.carrier_id">
</t>
<!-- Fin destino -->
<t t-if="picking._fields.get('carrier_id') and picking.carrier_id">
Transportista:
^FX Transportista ^CFJ,30 ^FO50,615^FDTransportista: ^FS ^FO260,615^FD
<t t-esc="picking.carrier_id.name"/>
</t>
<t t-else="">
</t>
<t t-esc="picking.carrier_id.name"/>
</t>
<t t-else="">
</t>
^FS^FS ^FO50,655^GB700,3,3^FS
^FX Referencias Odoo ^CFJ,25 ^FO50,680^FDOrden:^FS ^FO50,720^FDRemito:^FS ^CF0,28 ^FO160,680^FD
<t t-esc="picking.origin"/>
<t t-esc="picking.origin"/>
^FS ^FO160,720^FD
<t t-esc="picking.voucher_ids.name"/>
<t t-esc="picking.voucher_ids.name"/>
^FS ^BY3,2,160 ^FO100,765^BC^FD
<t t-esc="picking.name"/>
<t t-esc="picking.name"/>
^FS ^FX Fecha y nro de bultos ^FO50,980^GB700,170,3^FS ^FO400,980^GB3,170,3^FS ^CFJ,30 ^FO180,1020^FDBultos^FS
^CF0,50 ^FO160,1070^FD<t t-esc="numero"/>
de <t t-if="picking.number_of_packages == 0">1</t>
<t t-else="">
<t t-esc="picking.number_of_packages"/>
</t>^FS ^CFJ,30 ^FO520,1020^FD
<t t-else="">
<t t-esc="picking.number_of_packages"/>
</t>^FS ^CFJ,30 ^FO520,1020^FD
Fecha
^FS ^CF0,50 ^FO460,1070^FD
<t t-esc="picking.date_done" t-options="{'widget': 'date'}"/>
<t t-esc="picking.date_done" t-options="{'widget': 'date'}"/>
^FS ^XZ
</t>
</t>
</t>
</template>
</t>
</t>
</t>
</template>

<template id="product_ux.custom_label_transfer_template_view_pdf">
<t t-call="web.basic_layout">
Expand Down Expand Up @@ -266,7 +265,7 @@ Transportista:
</div>
<br/>
<div name="footer_left_column" class="col-12 text-center">
<img t-if="picking.l10n_ar_afip_barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;humanreadable=1' % ('I2of5', picking.l10n_ar_afip_barcode)" alt="Barcode" style="height:40px;"/>
<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;"/>
</div>

<div style="text-align: center;">
Expand Down

0 comments on commit c2105e3

Please sign in to comment.