Merge lp:~vauxoo/addons-vauxoo/gbw-report-CFDI-3.2-dev-yzk into lp:~vauxoo/addons-vauxoo/gbw

[Isaac López Zúñiga]

[lp:~vauxoo/addons-vauxoo/gbw-report-CFDI-3.2-dev-yzk]

35. By Isaac López Zúñiga on 2012-06-22

[REF][l10n_mx_invoice_discount] word "CFDI" duplicated deleted

=== modified file 'l10n_mx_invoice_discount/report/Factura_CFDI_2012_GBW.sxw'
 Binary files l10n_mx_invoice_discount/report/Factura_CFDI_2012_GBW.sxw	2012-05-17 20:33:51 +0000 and l10n_mx_invoice_discount/report/Factura_CFDI_2012_GBW.sxw	2012-06-22 15:12:40 +0000 differ
=== modified file 'l10n_mx_invoice_discount/report/invoice_facturae_pac_sf_disc_pdf.rml'
--- l10n_mx_invoice_discount/report/invoice_facturae_pac_sf_disc_pdf.rml	2012-05-17 20:33:51 +0000
+++ l10n_mx_invoice_discount/report/invoice_facturae_pac_sf_disc_pdf.rml	2012-06-22 15:12:40 +0000
@@ -474,26 +474,22 @@
         <tr>
           <td>
             <para style="P10">Regimen Fiscal </para>
-            <para style="P11">“ Titulo II de las personas morales”</para>
+            <para style="P11">[[o.company_id.partner_id.regimen_fiscal_id.name]]</para>
           </td>
           <td>
             <para style="P10">Forma de pago: </para>
-            <para style="P13">
-              <font color="white"> </font>
-            </para>
+            <para style="P11">[[o.pay_method_id.name or 'No identificado']]</para>
           </td>
           <td>
             <para style="P10">últimos 4 dígitos de la cuenta bancaria:</para>
-            <para style="P11">
-              <font color="white"> </font>
-            </para>
+            <para style="P11">[[o.acc_payment.acc_number or 'No identificado']]</para>
           </td>
         </tr>
       </blockTable>
       <para style="P29">
         <font color="white"> </font>
       </para>
-      <para style="P29">“Este documento es una representación impresa de un CFDI” CFDI, Comprobante Fiscal Digital por Internet</para>
+      <para style="P29">“Este documento es una representación impresa de un CFDI”, Comprobante Fiscal Digital por Internet</para>
       <blockTable colWidths="100.0,267.0,132.0" style="Tabla6">
         <tr>
           <td>