openerp-mexico-localization

Merge lp:~vauxoo/openerp-mexico-localization/facturae_cbb-dev-fernando into lp:openerp-mexico-localization/6.1

  1. facturae_cbb-dev-fernando
  2. Merge into 6.1
Proposed by Isaac López Zúñiga
Status: Merged
Merged at revision: 208
Proposed branch: lp:~vauxoo/openerp-mexico-localization/facturae_cbb-dev-fernando
Merge into: lp:openerp-mexico-localization/6.1
Diff against target: 433 lines (+157/-121)
2 files modified
l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py (+6/-0)
l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml (+151/-121)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/facturae_cbb-dev-fernando
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
OpenERP Mexico Maintainer Pending
Review via email: mp+134761@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py'
2--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py 2012-04-06 23:21:07 +0000
3+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py 2012-11-17 00:11:21 +0000
4@@ -24,10 +24,16 @@
5 # along with this program. If not, see <http://www.gnu.org/licenses/>.
6 #
7 ##############################################################################
8+# Leyendas tomadas el dia 16 de noviembre de 2012 del sitio:
9+# http://www.sat.gob.mx/sitio_internet/asistencia_contribuyente/principiantes/comprobantes_fiscales/66_19207.html
10+# La leyenda “La reproducción apócrifa de este comprobante constituye un delito en los términos de las disposiciones fiscales”, con letra no menor de 5 puntos.
11+# La leyenda "Este comprobante tendrá una vigencia de dos años contados a partir de la fecha de aprobación de la asignación de folios, la cual es dd/mm/aaaa", misma que deberá ser impresa con letra no menor de 5 puntos.
12+##############################################################################
13
14 from report import report_sxw
15 import pooler
16 import tools
17+import time
18 #from amount_to_text_es import amount_to_text as amount_to_text_class
19
20 #amount_to_text_obj = amount_to_text_class()
21
22=== modified file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml'
23--- l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml 2012-04-06 23:21:07 +0000
24+++ l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml 2012-11-17 00:11:21 +0000
25@@ -28,6 +28,20 @@
26 <blockAlignment value="LEFT"/>
27 <blockValign value="TOP"/>
28 </blockTableStyle>
29+ <blockTableStyle id="Table1">
30+ <blockAlignment value="LEFT"/>
31+ <blockValign value="TOP"/>
32+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
33+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
34+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
35+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
36+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
37+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
38+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
39+ <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
40+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
41+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
42+ </blockTableStyle>
43 <blockTableStyle id="Tabla4">
44 <blockAlignment value="LEFT"/>
45 <blockValign value="TOP"/>
46@@ -46,35 +60,31 @@
47 <paraStyle name="P1" fontName="Helvetica" alignment="RIGHT"/>
48 <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10"/>
49 <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10"/>
50- <paraStyle name="P4" fontName="Helvetica" textColor="#280099"/>
51- <paraStyle name="P5" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
52- <paraStyle name="P6" fontName="Helvetica" textColor="#ff3333"/>
53- <paraStyle name="P7" fontName="Helvetica" fontSize="12.0" leading="15" textColor="#800000"/>
54- <paraStyle name="P8" fontName="Helvetica" fontSize="2.0" leading="3" textColor="#800000"/>
55- <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
56- <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
57- <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
58- <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
59- <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
60+ <paraStyle name="P4" fontName="Helvetica" fontSize="10.0" leading="13"/>
61+ <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="CENTER"/>
62+ <paraStyle name="P6" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
63+ <paraStyle name="P7" fontName="Helvetica" textColor="#280099"/>
64+ <paraStyle name="P8" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
65+ <paraStyle name="P9" fontName="Helvetica" textColor="#ff3333"/>
66+ <paraStyle name="P10" fontName="Helvetica" fontSize="12.0" leading="15" textColor="#800000"/>
67+ <paraStyle name="P11" fontName="Helvetica" fontSize="2.0" leading="3" textColor="#800000"/>
68+ <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
69+ <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
70 <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
71- <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
72- <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
73- <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
74+ <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
75+ <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
76+ <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
77 <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
78- <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
79- <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
80+ <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="18.0" leading="22" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
81+ <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
82 <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
83- <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
84+ <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
85 <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#000000"/>
86- <paraStyle name="P24" fontName="Helvetica" textColor="#280099"/>
87- <paraStyle name="P25" fontName="Helvetica" alignment="RIGHT" textColor="#280099"/>
88- <paraStyle name="P26" fontName="Helvetica" fontSize="8.0" leading="10"/>
89- <paraStyle name="P27" fontName="Helvetica" fontSize="10.0" leading="13"/>
90- <paraStyle name="P28" fontName="Helvetica" alignment="RIGHT"/>
91- <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#280099"/>
92- <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
93- <paraStyle name="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
94- <paraStyle name="P32" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
95+ <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
96+ <paraStyle name="P25" fontName="Helvetica" fontSize="8.0" leading="10" textColor="#280099"/>
97+ <paraStyle name="P26" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" textColor="#280099"/>
98+ <paraStyle name="P27" fontName="Helvetica" fontSize="8.0" leading="10"/>
99+ <paraStyle name="P28" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
100 <paraStyle name="Standard" fontName="Helvetica"/>
101 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
102 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
103@@ -91,56 +101,56 @@
104 </stylesheet>
105 <story>
106 <section>
107- <para style="P10">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
108- <para style="P13">[[ o.company_id.parent_id and o.company_id.parent_id.partner_id.name or o.company_id.partner_id.name ]]</para>
109+ <para style="P16">[[ repeatIn(objects,'o') ]] <font face="Helvetica" size="9.0">[[ set_global_data(o) ]]</font></para>
110+ <para style="P19">[[ o.company_id.parent_id and o.company_id.parent_id.partner_id.name or o.company_id.partner_id.name ]]</para>
111 <blockTable colWidths="125.0,207.0,166.0" style="Tabla1">
112 <tr>
113 <td>
114- <para style="P17">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
115- </td>
116- <td>
117- <para style="P12">[[ company_address()['name'] or o.company_id.partner_id.name ]]</para>
118- <para style="P15">
119- <font color="white"> </font>
120- </para>
121- <para style="P12">Calle: [[ company_address()['street'] or '' ]] Nro. Ext: [[ company_address()['street3'] or '' ]] Int: [[ company_address()['street4'] or '' ]]</para>
122- <para style="P15">
123- <font color="white"> </font>
124- </para>
125- <para style="P12">Colonia: [[ company_address()['street2'] or '' ]]</para>
126- <para style="P15">
127- <font color="white"> </font>
128- </para>
129- <para style="P12">Ciudad: [[ company_address()['city'] or '' ]] Estado: [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]]</para>
130- <para style="P21">
131- <font color="white"> </font>
132- </para>
133- <para style="P12">Localidad: [[ company_address()['city2'] or '' ]]</para>
134- <para style="P15">
135- <font color="white"> </font>
136- </para>
137- <para style="P12">CP: [[ company_address()['zip'] or '' ]]</para>
138- <para style="P15">
139- <font color="white"> </font>
140- </para>
141- <para style="P12">RFC: [[ o.company_id.partner_id._columns.has_key('vat_split') and o.company_id.partner_id.vat_split or o.company_id.partner_id.vat ]]</para>
142- <para style="P15">
143- <font color="white"> </font>
144- </para>
145- <para style="P14">Teléfono(s): </para>
146- <para style="P14">[[ company_address()['phone'] or removeParentNode('para') ]]</para>
147- <para style="P14">[[ company_address()['fax'] or removeParentNode('para') ]]</para>
148- <para style="P14">[[ company_address()['mobile'] or removeParentNode('para') ]]</para>
149- </td>
150- <td>
151- <para style="P6">
152+ <para style="P24">[[ o.company_id.logo and setTag('para','image',{'width':'120.0','height':'80.0'}) ]] [[ o.company_id.logo ]]</para>
153+ </td>
154+ <td>
155+ <para style="P18">[[ company_address()['name'] or o.company_id.partner_id.name ]]</para>
156+ <para style="P21">
157+ <font color="white"> </font>
158+ </para>
159+ <para style="P18">Calle: [[ company_address()['street'] or '' ]] Nro. Ext: [[ company_address()['street3'] or '' ]] Int: [[ company_address()['street4'] or '' ]]</para>
160+ <para style="P21">
161+ <font color="white"> </font>
162+ </para>
163+ <para style="P18">Colonia: [[ company_address()['street2'] or '' ]]</para>
164+ <para style="P21">
165+ <font color="white"> </font>
166+ </para>
167+ <para style="P18">Ciudad: [[ company_address()['city'] or '' ]] Estado: [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]]</para>
168+ <para style="P22">
169+ <font color="white"> </font>
170+ </para>
171+ <para style="P18">Localidad: [[ company_address()['city2'] or '' ]]</para>
172+ <para style="P21">
173+ <font color="white"> </font>
174+ </para>
175+ <para style="P18">CP: [[ company_address()['zip'] or '' ]]</para>
176+ <para style="P21">
177+ <font color="white"> </font>
178+ </para>
179+ <para style="P18">RFC: [[ o.company_id.partner_id._columns.has_key('vat_split') and o.company_id.partner_id.vat_split or o.company_id.partner_id.vat ]]</para>
180+ <para style="P21">
181+ <font color="white"> </font>
182+ </para>
183+ <para style="P20">Teléfono(s): </para>
184+ <para style="P20">[[ company_address()['phone'] or removeParentNode('para') ]]</para>
185+ <para style="P20">[[ company_address()['fax'] or removeParentNode('para') ]]</para>
186+ <para style="P20">[[ company_address()['mobile'] or removeParentNode('para') ]]</para>
187+ </td>
188+ <td>
189+ <para style="P9">
190 <font face="Helvetica" size="18.0">Folio: [[ get_approval() and get_approval().serie or '' ]] [[ ( o.type in ['out_invoice', 'out_refund'] ) and ( o.state in ['open', 'paid', 'cancel'] ) and o.number or 'SIN FOLIO O ESTATUS NO VALIDO' ]]</font>
191 </para>
192- <para style="P8">
193+ <para style="P11">
194 <font color="white"> </font>
195 </para>
196- <para style="P7">[[ o.state == 'cancel' and 'FACTURA CANCELADA' ]]</para>
197- <para style="P8">
198+ <para style="P10">[[ o.state == 'cancel' and 'FACTURA CANCELADA' ]]</para>
199+ <para style="P11">
200 <font color="white"> </font>
201 </para>
202 <para style="Table Contents">[[ company_address()['city'] or '' ]], [[ company_address()['state_id'] and company_address()['state_id']['name'] or '' ]] a</para>
203@@ -151,7 +161,7 @@
204 <blockTable colWidths="249.0,249.0" style="Tabla2">
205 <tr>
206 <td>
207- <para style="P4">Receptor</para>
208+ <para style="P7">Receptor</para>
209 <para style="Table Contents"><font face="Helvetica">Nombre: </font>[[ o.partner_id.name ]]</para>
210 <para style="terp_default_8"><font face="Helvetica">Dirección:</font> [[ o.address_invoice_id.street ]] No. Ext: [[ o.address_invoice_id.street3 ]] Int: [[ o.address_invoice_id.street4 ]]</para>
211 <para style="terp_default_8"><font face="Helvetica">Colonia:</font> [[ o.address_invoice_id.street2 or '' ]]</para>
212@@ -159,10 +169,10 @@
213 <para style="terp_default_8"><font face="Helvetica">Localidad: </font>[[ o.address_invoice_id.city2 or '' ]]</para>
214 <para style="terp_default_8"><font face="Helvetica">C.P.:</font> [[ o.address_invoice_id.zip or '' ]] </para>
215 <para style="terp_default_8"><font face="Helvetica">R. F. C. :</font> [[ o.partner_id._columns.has_key('vat_split') and o.partner_id.vat_split or o.partner_id.vat ]]</para>
216- <para style="P16">Teléfono(s): </para>
217- <para style="P11">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
218- <para style="P11">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
219- <para style="P11">[[ o.address_invoice_id.mobile or removeParentNode('para') ]]</para>
220+ <para style="P23">Teléfono(s): </para>
221+ <para style="P17">[[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
222+ <para style="P17">[[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
223+ <para style="P17">[[ o.address_invoice_id.mobile or removeParentNode('para') ]]</para>
224 </td>
225 <td>
226 <para style="Table Contents">Condición de pago: [[ format(o.payment_term and (o.payment_term.note or o.payment_term.name) or removeParentNode('para') ) ]]</para>
227@@ -178,64 +188,66 @@
228 </td>
229 </tr>
230 </blockTable>
231- <blockTable colWidths="47.0,38.0,174.0,89.0,67.0,85.0" style="Tabla3">
232+ <blockTable colWidths="47.0,88.0,160.0,54.0,65.0,85.0" style="Tabla3">
233 <tr>
234 <td>
235- <para style="P4">Cantidad</para>
236- </td>
237- <td>
238- <para style="P4">Unidad</para>
239- </td>
240- <td>
241- <para style="P4">Descripción</para>
242- </td>
243- <td>
244- <para style="P4">Clave</para>
245- </td>
246- <td>
247- <para style="P5">P.Unitario</para>
248- </td>
249- <td>
250- <para style="P5">Importe</para>
251+ <para style="P25">Cantidad</para>
252+ </td>
253+ <td>
254+ <para style="P25">Unidad de medida</para>
255+ </td>
256+ <td>
257+ <para style="P25">Descripción</para>
258+ </td>
259+ <td>
260+ <para style="P25">Clave</para>
261+ </td>
262+ <td>
263+ <para style="P26">P.Unitario</para>
264+ </td>
265+ <td>
266+ <para style="P26">Importe</para>
267 </td>
268 </tr>
269 <tr>
270 <td>
271- <para style="Table Contents"><font face="Helvetica" size="8.0">[[ repeatIn(o.invoice_line,'l') ]] </font>[[ formatLang(l.quantity) ]]</para>
272- </td>
273- <td>
274- <para style="Table Contents">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
275- </td>
276- <td>
277- <para style="Table Contents">[[ l.name ]]</para>
278- <para style="P27">
279+ <para style="Table Contents">
280+ <font face="Helvetica" size="8.0">[[ repeatIn(o.invoice_line,'l') ]] [[ formatLang(l.quantity) ]]</font>
281+ </para>
282+ </td>
283+ <td>
284+ <para style="P2">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
285+ </td>
286+ <td>
287+ <para style="P2">[[ l.name ]]</para>
288+ <para style="P4">
289 <font face="Helvetica" size="7.0">Notas:</font>
290 <font face="Helvetica" size="7.0">[[l.note or removeParentNode('para')]]</font>
291 </para>
292 </td>
293 <td>
294- <para style="Table Contents">[[ l.product_id and l.product_id.default_code ]]</para>
295- </td>
296- <td>
297- <para style="P1">[[ formatLang(l.price_unit) ]]</para>
298- </td>
299- <td>
300- <para style="P1">[[ exists_key('global_discount_percent') and (formatLang(l.quantity * l.price_unit, digits=get_digits(dp='Account'))) or formatLang(l.price_subtotal) ]]</para>
301+ <para style="P2">[[ l.product_id and l.product_id.default_code ]]</para>
302+ </td>
303+ <td>
304+ <para style="P28">[[ formatLang(l.price_unit) ]]</para>
305+ </td>
306+ <td>
307+ <para style="P28">[[ exists_key('global_discount_percent') and (formatLang(l.quantity * l.price_unit)) or formatLang(l.price_subtotal) ]]</para>
308 </td>
309 </tr>
310 </blockTable>
311 <blockTable colWidths="427.0,71.0" style="Tabla7">
312 <tr>
313 <td>
314- <para style="P5">Suma $</para>
315+ <para style="P8">Suma $</para>
316 </td>
317 <td>
318- <para style="P1">[[formatLang( ( exists_key('global_discount_percent') and o.global_discount_amount or 0.0 ) + (o.amount_untaxed or 0.0), digits=get_digits(dp='Account') )]]</para>
319+ <para style="P1">[[formatLang( ( exists_key('global_discount_percent') and o.global_discount_amount or 0.0 ) + (o.amount_untaxed or 0.0) )]]</para>
320 </td>
321 </tr>
322 <tr>
323 <td>
324- <para style="P5">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
325+ <para style="P8">Descuento: [[ exists_key('global_discount_percent') and o.global_discount_percent or removeParentNode('tr')]] %</para>
326 </td>
327 <td>
328 <para style="P1">[[o.global_discount_amount and formatLang( o.global_discount_amount) or '']]</para>
329@@ -243,7 +255,7 @@
330 </tr>
331 <tr>
332 <td>
333- <para style="P5">Sub Total $</para>
334+ <para style="P8">Sub Total $</para>
335 </td>
336 <td>
337 <para style="P1">[[ formatLang(o.amount_untaxed) ]]</para>
338@@ -251,7 +263,7 @@
339 </tr>
340 <tr>
341 <td>
342- <para style="P5">
343+ <para style="P8">
344 <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes(), 'tax' ) ]]</font>
345 <font face="Helvetica">[[ tax['name2'] ]] ([[ round( float( tax['tax_percent'] ) ) ]]%) $</font>
346 </para>
347@@ -262,7 +274,7 @@
348 </tr>
349 <tr>
350 <td>
351- <para style="P5">
352+ <para style="P8">
353 <font face="Helvetica" size="6.0">[[ repeatIn( get_taxes_ret(), 'tax_ret' ) ]]</font>
354 <font face="Helvetica">[[ tax_ret['name2'] ]] Ret ([[ round( float( tax_ret['tax_percent'] ),2 )*-1 ]]%) $</font>
355 </para>
356@@ -273,7 +285,7 @@
357 </tr>
358 <tr>
359 <td>
360- <para style="P5">Total $</para>
361+ <para style="P8">Total $</para>
362 </td>
363 <td>
364 <para style="P1">[[ formatLang(o.amount_total) ]]</para>
365@@ -281,8 +293,8 @@
366 </tr>
367 <tr>
368 <td>
369- <para style="P29">IMPORTE CON LETRA:</para>
370- <para style="P31">[[ o.amount_to_text ]]</para>
371+ <para style="P14">IMPORTE CON LETRA:</para>
372+ <para style="P13">[[ o.amount_to_text ]]</para>
373 </td>
374 <td>
375 <para style="P1">
376@@ -291,8 +303,29 @@
377 </td>
378 </tr>
379 </blockTable>
380- <para style="P9"/>
381- <para style="P9">
382+ <para style="P12">
383+ <font color="white"> </font>
384+ </para>
385+ <para style="P12">
386+ <font color="white"> </font>
387+ </para>
388+ <blockTable colWidths="166.0,166.0,166.0" style="Table1">
389+ <tr>
390+ <td>
391+ <para style="P5">Régimen Fiscal:</para>
392+ <para style="P6">[[o.company_id.partner_id.regimen_fiscal_id and o.company_id.partner_id.regimen_fiscal_id.name or 'No identificado']]</para>
393+ </td>
394+ <td>
395+ <para style="P5">Método de Pago:</para>
396+ <para style="P6">[[o.pay_method_id.name or 'No identificado']]</para>
397+ </td>
398+ <td>
399+ <para style="P5">Últimos 4 dígitos de la cuenta bancaria:</para>
400+ <para style="P6">[[o.acc_payment.last_acc_number or 'No identificado']]</para>
401+ </td>
402+ </tr>
403+ </blockTable>
404+ <para style="P12">
405 <font color="white"> </font>
406 </para>
407 <blockTable colWidths="106.0,257.0,135.0" style="Tabla4">
408@@ -317,7 +350,7 @@
409 <para style="P2">
410 <font color="white"> </font>
411 </para>
412- <para style="P2">Este comprobante tendrá una vigencia de dos años contados a partir de la fecha aprobación de la asignación de folios, la cual es: [[ get_approval() and get_approval().date_start or '' ]]</para>
413+ <para style="P2">Este comprobante tendrá una vigencia de dos años contados a partir de la fecha de aprobación de la asignación de folios, la cual es: [[ get_approval() and time.strftime('%d-%m-%Y',time.strptime(get_approval().date_start,'%Y-%m-%d')) or '' ]]</para>
414 </td>
415 <td>
416 <para style="P2">[[ o.company_id.cif_file and setTag('para','image',{'width':'98.0','height':'161.0'}) ]] [[ o.company_id.cif_file ]]</para>
417@@ -327,12 +360,9 @@
418 <para style="terp_default_9">
419 <font color="white"> </font>
420 </para>
421- <para style="P32">Vendedor: [[o.user_id.name]]</para>
422+ <para style="P15">Vendedor: [[o.user_id.name]]</para>
423 <para style="terp_default_9">[[ format(o.comment or '') ]]</para>
424 </section>
425- <para style="Standard">
426- <font color="white"> </font>
427- </para>
428 </story>
429 </document>
430
431
432=== modified file 'l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw'
433Binary files l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw 2012-04-06 23:21:07 +0000 and l10n_mx_facturae_cbb/report/invoice_facturae_pdf.sxw 2012-11-17 00:11:21 +0000 differ