OpenERP Canada

Merge lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top into lp:openerp-canada

  1. fix_l10n_ca_check_print_top
  2. Merge into 7.0
Status: Merged
Approved by: Sandy Carter (http://www.savoirfairelinux.com)
Approved revision: 30
Merged at revision: 30
Proposed branch: lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top
Merge into: lp:openerp-canada
Diff against target: 930 lines (+474/-313)
7 files modified
l10n_ca_account_check_writing/__init__.py (+0/-1)
l10n_ca_account_check_writing/__openerp__.py (+21/-6)
l10n_ca_account_check_writing/account_voucher.py (+2/-2)
l10n_ca_account_check_writing/report/README.txt (+9/-0)
l10n_ca_account_check_writing/report/__init__.py (+0/-3)
l10n_ca_account_check_writing/report/l10n_ca_check_print.py (+32/-27)
l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml (+410/-274)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Joao Alfredo Gama Batista code review, no tests Approve
Sandy Carter (http://www.savoirfairelinux.com) code review Approve
Review via email: mp+219059@code.launchpad.net
To post a comment you must log in.
lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top updated
30. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[FIX] PEP8 issues and add external dependencies on num2words. Update the description accordingly.

Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote :

LGTM

review: Approve (code review)
Revision history for this message
Joao Alfredo Gama Batista (joao-gama) wrote :

LGTM

review: Approve (code review, no tests)
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve
lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top updated
31. By Marc Cassuto (SFL)

[FIX] fix position of the 3rd table

32. By Marc Cassuto (SFL)

[FIX] fix position of the 2nd table & force date format to be YYYY-MM-DD

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ca_account_check_writing/__init__.py'
2--- l10n_ca_account_check_writing/__init__.py 2013-04-25 21:23:42 +0000
3+++ l10n_ca_account_check_writing/__init__.py 2014-05-12 21:07:22 +0000
4@@ -18,7 +18,6 @@
5 # along with this program. If not, see <http://www.gnu.org/licenses/>.
6 #
7 ##############################################################################
8-
9 import company
10 import account_voucher
11 import report
12
13=== modified file 'l10n_ca_account_check_writing/__openerp__.py'
14--- l10n_ca_account_check_writing/__openerp__.py 2013-06-11 13:48:06 +0000
15+++ l10n_ca_account_check_writing/__openerp__.py 2014-05-12 21:07:22 +0000
16@@ -20,7 +20,7 @@
17 ##############################################################################
18 {
19 'name': 'Canada - Check Writing',
20- 'version': '1.1',
21+ 'version': '1.2',
22 'author': 'Savoir-faire Linux',
23 'website': 'http://www.savoirfairelinux.com',
24 'category': 'Generic Modules/Accounting',
25@@ -31,15 +31,27 @@
26 This module provides reports to print check using the canadian format from:
27 http://www.cdnpay.ca/imis15/pdf/pdfs_rules/standard_006_fr.pdf
28
29+Note that the amount in letter is generated when you enter/change the amount,
30+not when you print. You will need to modify it if you change the language of
31+the supplier.
32+
33 To use this module, you will need to install num2words Python library:
34 https://pypi.python.org/pypi/num2words
35
36-Note that the amount in letter is generated when you enter/change the amount,
37-not when you print. You will need to modify it if you change the language of
38-the supplier.
39-
40+Contributors
41+------------
42+* David Cormier (david.cormier@savoirfairelinux.com)
43+* Joao Alfredo Gama Batista (joao.gama@savoirfairelinux.com)
44+* Marc Cassuto (marc.cassuto@savoirfairelinux.com)
45+* Mathieu Benoit (mathieu.benoit@savoirfairelinux.com)
46+* Maxime Chambreuil (maxime.chambreuil@savoirfairelinux.com)
47+* Vincent Vinet (vincent.vinet@savoirfairelinux.com)
48+* Virgil Dupras (virgil.dupras@savoirfairelinux.com)
49 """,
50- 'depends': ['account_check_writing', 'res_currency_print_on_check'],
51+ 'depends': [
52+ 'account_check_writing',
53+ 'res_currency_print_on_check'
54+ ],
55 'data': [
56 'l10n_ca_account_check_writing_report.xml',
57 ],
58@@ -47,5 +59,8 @@
59 'test': [],
60 'installable': True,
61 'active': False,
62+ 'external_dependencies': {
63+ 'python': ['num2words'],
64+ }
65 }
66 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
67
68=== modified file 'l10n_ca_account_check_writing/account_voucher.py'
69--- l10n_ca_account_check_writing/account_voucher.py 2014-04-22 13:02:09 +0000
70+++ l10n_ca_account_check_writing/account_voucher.py 2014-05-12 21:07:22 +0000
71@@ -49,8 +49,8 @@
72 currency_name = currency.print_on_check
73 cents = int(amount * 100) % 100
74 total_length = len(amount_in_word) + len(currency_name)
75- if total_length < 87:
76- stars = '*' * (87 - total_length)
77+ if total_length < 67:
78+ stars = '*' * (67 - total_length)
79 else:
80 stars = ''
81 AND = custom_translation("and", lang)
82
83=== added file 'l10n_ca_account_check_writing/report/README.txt'
84--- l10n_ca_account_check_writing/report/README.txt 1970-01-01 00:00:00 +0000
85+++ l10n_ca_account_check_writing/report/README.txt 2014-05-12 21:07:22 +0000
86@@ -0,0 +1,9 @@
87+The third table in the report has to be on the third part of the page.
88+We can fix height of the check by adding empty rows in the SXW file,
89+but we can not fix the 2nd tables's height.
90+
91+The way to do it, after converting the SXW file to RML, is adding
92+is adding a rowHeights attribute for the second table :
93+
94+ <blockTable rowHeights="80.0mm" colWidths="591.0" style="Table2">
95+
96
97=== modified file 'l10n_ca_account_check_writing/report/__init__.py'
98--- l10n_ca_account_check_writing/report/__init__.py 2013-04-25 21:23:42 +0000
99+++ l10n_ca_account_check_writing/report/__init__.py 2014-05-12 21:07:22 +0000
100@@ -18,8 +18,5 @@
101 # along with this program. If not, see <http://www.gnu.org/licenses/>.
102 #
103 ##############################################################################
104-
105 import l10n_ca_check_print
106-
107 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
108-
109
110=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print.py'
111--- l10n_ca_account_check_writing/report/l10n_ca_check_print.py 2014-04-22 13:02:09 +0000
112+++ l10n_ca_account_check_writing/report/l10n_ca_check_print.py 2014-05-12 21:07:22 +0000
113@@ -24,7 +24,6 @@
114
115
116 class report_print_check(report_sxw.rml_parse):
117-
118 def __init__(self, cr, uid, name, context):
119 super(report_print_check, self).__init__(cr, uid, name, context)
120 self.number_lines = 0
121@@ -42,46 +41,52 @@
122 def get_lines(self, voucher_lines):
123 result = []
124 self.number_lines = len(voucher_lines)
125- for i in range(0, min(10,self.number_lines)):
126+ for i in range(0, min(10, self.number_lines)):
127 if i < self.number_lines:
128 voucher_line = voucher_lines[i]
129- # In general, the supplier invoice reference number is a much better description
130- # for writing checks than our own reference number, but if we don't have it, we
131- # might as well use our internal number
132- if voucher_line.supplier_invoice_number:
133- name = voucher_line.supplier_invoice_number
134- else:
135- name = voucher_line.name
136- res = {
137- 'date_due' : voucher_line.date_due,
138- 'name' : name,
139- 'amount_original' : voucher_line.amount_original and voucher_line.amount_original or False,
140- 'amount_unreconciled' : voucher_line.amount_unreconciled and voucher_line.amount_unreconciled or False,
141- 'amount' : voucher_line.amount and voucher_line.amount or False,
142- }
143- else :
144- res = {
145- 'date_due' : False,
146- 'name' : False,
147- 'amount_original' : False,
148- 'amount_unreconciled' : False,
149- 'amount' : False,
150- }
151- result.append(res)
152+ # Don't show lines with amount=0; this means, an invoice/credit note has not been linked to this check
153+ if voucher_line.amount != 0:
154+ # In general, the supplier invoice reference number is a much better description
155+ # for writing checks than our own reference number, but if we don't have it, we
156+ # might as well use our internal number
157+ if voucher_line.supplier_invoice_number:
158+ name = voucher_line.supplier_invoice_number
159+ else:
160+ name = voucher_line.name
161+ res = {
162+ 'date_due': voucher_line.date_due,
163+ 'name': name,
164+ 'amount_original': voucher_line.amount_original and voucher_line.amount_original or False,
165+ 'amount_unreconciled': voucher_line.amount_unreconciled and voucher_line.amount_unreconciled
166+ or False,
167+ 'amount': voucher_line.amount and voucher_line.amount or False,
168+ }
169+ result.append(res)
170+ else:
171+ res = {
172+ 'date_due': False,
173+ 'name': False,
174+ 'amount_original': False,
175+ 'amount_unreconciled': False,
176+ 'amount': False,
177+ }
178+ result.append(res)
179+
180 return result
181
182+
183 report_sxw.report_sxw(
184 'report.l10n.ca.account.print.check.top',
185 'account.voucher',
186 'addons/l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml',
187- parser=report_print_check,header=False
188+ parser=report_print_check, header=False
189 )
190
191 report_sxw.report_sxw(
192 'report.l10n.ca.account.print.check.middle',
193 'account.voucher',
194 'addons/l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml',
195- parser=report_print_check,header=False
196+ parser=report_print_check, header=False
197 )
198
199 #report_sxw.report_sxw(
200
201=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml'
202--- l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml 2014-04-22 13:02:09 +0000
203+++ l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml 2014-05-12 21:07:22 +0000
204@@ -1,8 +1,8 @@
205 <?xml version="1.0"?>
206 <document filename="test.pdf">
207- <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
208+ <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
209 <pageTemplate id="first">
210- <frame id="first" x1="13.0" y1="0.0" width="567" height="841"/>
211+ <frame id="first" x1="8.0" y1="0.0" width="596" height="791"/>
212 </pageTemplate>
213 </template>
214 <stylesheet>
215@@ -18,11 +18,7 @@
216 <blockAlignment value="LEFT"/>
217 <blockValign value="TOP"/>
218 </blockTableStyle>
219- <blockTableStyle id="Table5">
220- <blockAlignment value="LEFT"/>
221- <blockValign value="TOP"/>
222- </blockTableStyle>
223- <blockTableStyle id="Table12">
224+ <blockTableStyle id="Table13">
225 <blockAlignment value="LEFT"/>
226 <blockValign value="TOP"/>
227 </blockTableStyle>
228@@ -42,49 +38,51 @@
229 <blockAlignment value="LEFT"/>
230 <blockValign value="TOP"/>
231 </blockTableStyle>
232+ <blockTableStyle id="Table8">
233+ <blockAlignment value="LEFT"/>
234+ <blockValign value="TOP"/>
235+ </blockTableStyle>
236 <blockTableStyle id="Table3">
237 <blockAlignment value="LEFT"/>
238 <blockValign value="TOP"/>
239 </blockTableStyle>
240+ <blockTableStyle id="Table5">
241+ <blockAlignment value="LEFT"/>
242+ <blockValign value="TOP"/>
243+ </blockTableStyle>
244 <blockTableStyle id="Table7">
245 <blockAlignment value="LEFT"/>
246 <blockValign value="TOP"/>
247 </blockTableStyle>
248- <blockTableStyle id="Table8">
249- <blockAlignment value="LEFT"/>
250- <blockValign value="TOP"/>
251- </blockTableStyle>
252- <blockTableStyle id="Table9">
253- <blockAlignment value="LEFT"/>
254- <blockValign value="TOP"/>
255- </blockTableStyle>
256 <initialize>
257 <paraStyle name="all" alignment="justify"/>
258 </initialize>
259- <paraStyle name="P1" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica"/>
260- <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
261- <paraStyle name="P3" fontName="Helvetica"/>
262- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
263- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
264- <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
265- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
266- <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
267- <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13"/>
268- <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
269- <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
270- <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15"/>
271- <paraStyle name="P13" fontName="Helvetica"/>
272- <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/>
273- <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13"/>
274- <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
275- <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
276- <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
277- <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
278- <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
279- <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10"/>
280- <paraStyle name="P22" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
281- <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
282- <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
283+ <paraStyle name="P1" fontName="Helvetica"/>
284+ <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
285+ <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
286+ <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
287+ <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10"/>
288+ <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
289+ <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10"/>
290+ <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14"/>
291+ <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT"/>
292+ <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/>
293+ <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14"/>
294+ <paraStyle name="P12" fontName="Helvetica" fontSize="6.0" leading="8"/>
295+ <paraStyle name="P13" fontName="Helvetica" fontSize="11.0" leading="14" textColor="#ffffff"/>
296+ <paraStyle name="P14" rightIndent="-5.0" leftIndent="0.0" fontName="Helvetica"/>
297+ <paraStyle name="P15" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT"/>
298+ <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
299+ <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
300+ <paraStyle name="P18" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
301+ <paraStyle name="P19" fontName="Helvetica" fontSize="3.0" leading="4" spaceBefore="0.0" spaceAfter="6.0"/>
302+ <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" textColor="#ffffff"/>
303+ <paraStyle name="P21" rightIndent="22.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10"/>
304+ <paraStyle name="P22" rightIndent="-12.0" leftIndent="5.0" fontName="Helvetica" fontSize="11.0" leading="14"/>
305+ <paraStyle name="P23" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica"/>
306+ <paraStyle name="P24" fontName="Helvetica"/>
307+ <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
308+ <paraStyle name="P26" fontName="Helvetica" fontSize="8.0" leading="10"/>
309 <paraStyle name="Standard" fontName="Helvetica"/>
310 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
311 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
312@@ -96,242 +94,380 @@
313 <images/>
314 </stylesheet>
315 <story>
316- <para style="P1">[[repeatIn(objects,'voucher')]]</para>
317- <para style="P1">[[ setLang(voucher.partner_id.lang) ]]</para>
318- <blockTable colWidths="568.0" style="Table1">
319- <tr>
320- <td>
321- <blockTable colWidths="425.0,177.0" rowHeights="107.50,25.5" style="Table4">
322- <tr>
323- <td>
324- <para style="P6">
325- <font color="white"> </font>
326- </para>
327- </td>
328- <td>
329- <para style="P6">
330- <font color="white"> </font>
331- </para>
332- </td>
333- </tr>
334- <tr>
335- <td>
336- <para style="P6">
337- <font color="white"> </font>
338- </para>
339- </td>
340- <td>
341- <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
342- </td>
343- </tr>
344- </blockTable>
345- <blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4">
346- <tr>
347- <td>
348- <para style="P6">
349- <font color="white"> </font>
350- </para>
351- </td>
352- <td>
353- <para style="P9">[[ voucher.partner_id.name ]] </para>
354- </td>
355- <td>
356- <para style="P12">[[ formatLang (voucher.amount) ]]</para>
357- </td>
358- </tr>
359- </blockTable>
360- <blockTable colWidths="550.0" rowHeights="18" style="Table5">
361- <tr>
362- <td>
363- <para style="P9">[[ voucher.amount_in_word ]]</para>
364- </td>
365- </tr>
366- </blockTable>
367- <blockTable colWidths="54.0,425.0,85.0" rowHeights="45.5" style="Table4">
368- <tr>
369- <td>
370- <para style="P6"></para>
371- </td>
372- <td>
373- <para style="P9">[[ voucher.partner_id.name ]] </para>
374- <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
375- </td>
376- <td>
377- <para/>
378- </td>
379- </tr>
380- </blockTable>
381- <blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12">
382- <tr>
383- <td>
384- <para style="P3">
385- <font color="white"> </font>
386- </para>
387- </td>
388- <td>
389- <para style="P15">[[ voucher.name ]]</para>
390- </td>
391- <td>
392- <para style="P3">
393- <font color="white"> </font>
394- </para>
395- </td>
396- </tr>
397- </blockTable>
398- <para style="P3">
399- <font color="white"> </font>
400- </para>
401- </td>
402- </tr>
403- </blockTable>
404- <blockTable colWidths="568.0" style="Table2" rowHeights="255">
405- <tr>
406- <td>
407- <blockTable colWidths="445.0,117.0" style="Table6">
408- <tr>
409- <td>
410- <para style="P16">[[voucher.partner_id.name]]</para>
411- </td>
412- <td>
413- <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
414- </td>
415- </tr>
416- </blockTable>
417- <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table10">
418- <tr>
419- <td>
420- <para style="P4">Due Date</para>
421- </td>
422- <td>
423- <para style="P4">Invoice</para>
424- </td>
425- <td>
426- <para style="P4">Original Amount</para>
427- </td>
428- <td>
429- <para style="P4">Open Balance</para>
430- </td>
431- <td>
432- <para style="P4">Discount</para>
433- </td>
434- <td>
435- <para style="P4">Payment</para>
436- </td>
437- </tr>
438- <tr>
439- <td>
440- <para style="P19">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
441- </td>
442- <td>
443- <para style="P19">[[ l['name'] ]]</para>
444- </td>
445- <td>
446- <para style="P19">[[formatLang( l['amount_original']) ]]</para>
447- </td>
448- <td>
449- <para style="P19">[[ formatLang( l['amount_unreconciled']) ]]</para>
450- </td>
451- <td>
452- <para style="P19">
453- <font color="white"> </font>
454- </para>
455- </td>
456- <td>
457- <para style="P19">[[ formatLang (l['amount']) ]]</para>
458- </td>
459- </tr>
460- </blockTable>
461- <blockTable colWidths="485.0,77.0" style="Table11">
462- <tr>
463- <td>
464- <para style="P24">Check Amount</para>
465- </td>
466- <td>
467- <para style="P23">[[ formatLang (voucher.amount) ]]</para>
468- </td>
469- </tr>
470- </blockTable>
471- <para style="P3">
472- <font color="white"> </font>
473- </para>
474- </td>
475- </tr>
476- </blockTable>
477- <blockTable colWidths="568.0" style="Table3">
478- <tr>
479- <td>
480- <blockTable colWidths="446.0,116.0" style="Table7">
481- <tr>
482- <td>
483- <para style="P16">[[voucher.partner_id.name]]</para>
484- </td>
485- <td>
486- <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
487- </td>
488- </tr>
489- </blockTable>
490- <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table8">
491- <tr>
492- <td>
493- <para style="P4">Due Date</para>
494- </td>
495- <td>
496- <para style="P4">Invoice</para>
497- </td>
498- <td>
499- <para style="P4">Original Amount</para>
500- </td>
501- <td>
502- <para style="P4">Open Balance</para>
503- </td>
504- <td>
505- <para style="P4">Discount</para>
506- </td>
507- <td>
508- <para style="P4">Payment</para>
509- </td>
510- </tr>
511- <tr>
512- <td>
513- <para style="P19">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
514- </td>
515- <td>
516- <para style="P19">[[ l['name'] ]]</para>
517- </td>
518- <td>
519- <para style="P19">[[ formatLang (l['amount_original']) ]]</para>
520- </td>
521- <td>
522- <para style="P19">[[ formatLang (l['amount_unreconciled']) ]]</para>
523- </td>
524- <td>
525- <para style="P19">
526- <font color="white"> </font>
527- </para>
528- </td>
529- <td>
530- <para style="P19">[[ formatLang (l['amount']) ]]</para>
531- </td>
532- </tr>
533- </blockTable>
534- <blockTable colWidths="485.0,77.0" style="Table9">
535- <tr>
536- <td>
537- <para style="P17">Check Amount</para>
538- </td>
539- <td>
540- <para style="P16">[[ formatLang (voucher.amount) ]]</para>
541- </td>
542- </tr>
543- </blockTable>
544- <para style="P3">
545- <font color="white"> </font>
546- </para>
547- </td>
548- </tr>
549- </blockTable>
550- <para style="P2">
551+ <para style="P23">[[repeatIn(objects,'voucher')]]</para>
552+ <para style="P23">[[ setLang(voucher.partner_id.lang) ]]</para>
553+ <blockTable colWidths="591.0" style="Table1">
554+ <tr>
555+ <td>
556+ <blockTable colWidths="30.0,405.0,33.0,147.0" style="Table4">
557+ <tr>
558+ <td>
559+ <para style="P11">
560+ <font color="white"> </font>
561+ </para>
562+ </td>
563+ <td>
564+ <para style="P20">.</para>
565+ </td>
566+ <td>
567+ <para style="P20">
568+ <font color="white"> </font>
569+ </para>
570+ </td>
571+ <td>
572+ <para style="P8">
573+ <font color="white"> </font>
574+ </para>
575+ </td>
576+ </tr>
577+ <tr>
578+ <td>
579+ <para style="P11">
580+ <font color="white"> </font>
581+ </para>
582+ </td>
583+ <td>
584+ <para style="P13">.</para>
585+ </td>
586+ <td>
587+ <para style="P13">
588+ <font color="white"> </font>
589+ </para>
590+ </td>
591+ <td>
592+ <para style="P8">
593+ <font color="white"> </font>
594+ </para>
595+ </td>
596+ </tr>
597+ <tr>
598+ <td>
599+ <para style="P11">
600+ <font color="white"> </font>
601+ </para>
602+ </td>
603+ <td>
604+ <para style="P9">
605+ <font color="white"> </font>
606+ </para>
607+ </td>
608+ <td>
609+ <para style="P9">DATE</para>
610+ </td>
611+ <td>
612+ <para style="P10">[[ voucher.date or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
613+ </td>
614+ </tr>
615+ <tr>
616+ <td>
617+ <para style="P11">
618+ <font color="white"> </font>
619+ </para>
620+ </td>
621+ <td>
622+ <para style="P13">.</para>
623+ </td>
624+ <td>
625+ <para style="P13">
626+ <font color="white"> </font>
627+ </para>
628+ </td>
629+ <td>
630+ <para style="P12">Y Y Y Y – M M – D D</para>
631+ </td>
632+ </tr>
633+ <tr>
634+ <td>
635+ <para style="P22">
636+ <font color="white"> </font>
637+ </para>
638+ </td>
639+ <td>
640+ <para style="P17">[[ voucher.amount_in_word ]]</para>
641+ </td>
642+ <td>
643+ <para style="P15">
644+ <font color="white"> </font>
645+ </para>
646+ </td>
647+ <td>
648+ <para style="P18">[[ formatLang (voucher.amount) ]]</para>
649+ </td>
650+ </tr>
651+ <tr>
652+ <td>
653+ <para style="P21">
654+ <font color="white"> </font>
655+ </para>
656+ </td>
657+ <td>
658+ <para style="P16">
659+ <font color="white"> </font>
660+ </para>
661+ </td>
662+ <td>
663+ <para style="P7">
664+ <font color="white"> </font>
665+ </para>
666+ </td>
667+ </tr>
668+ <tr>
669+ <td>
670+ <para style="P5">
671+ <font color="white"> </font>
672+ </para>
673+ </td>
674+ <td>
675+ <para style="P16">[[ voucher.partner_id.name ]]</para>
676+ <para style="P16">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
677+ </td>
678+ <td>
679+ <para style="P7">
680+ <font color="white"> </font>
681+ </para>
682+ </td>
683+ </tr>
684+ </blockTable>
685+ <blockTable colWidths="32.0,360.0,199.0" style="Table13">
686+ <tr>
687+ <td>
688+ <para style="P5">
689+ <font color="white"> </font>
690+ </para>
691+ </td>
692+ <td>
693+ <para style="P5">
694+ <font color="white"> </font>
695+ </para>
696+ </td>
697+ <td>
698+ <para style="P1">
699+ <font color="white"> </font>
700+ </para>
701+ </td>
702+ </tr>
703+ <tr>
704+ <td>
705+ <para style="P5">MEMO</para>
706+ </td>
707+ <td>
708+ <para style="P5">[[ voucher.name ]]</para>
709+ </td>
710+ <td>
711+ <para style="P1">
712+ <font color="white"> </font>
713+ </para>
714+ </td>
715+ </tr>
716+ <tr>
717+ <td>
718+ <para style="P5">
719+ <font color="white"> </font>
720+ </para>
721+ </td>
722+ <td>
723+ <para style="P5">
724+ <font color="white"> </font>
725+ </para>
726+ </td>
727+ <td>
728+ <para style="P1">
729+ <font color="white"> </font>
730+ </para>
731+ </td>
732+ </tr>
733+ <tr>
734+ <td>
735+ <para style="P5">
736+ <font color="white"> </font>
737+ </para>
738+ </td>
739+ <td>
740+ <para style="P5">
741+ <font color="white"> </font>
742+ </para>
743+ </td>
744+ <td>
745+ <para style="P1">
746+ <font color="white"> </font>
747+ </para>
748+ </td>
749+ </tr>
750+ <tr>
751+ <td>
752+ <para style="P5">
753+ <font color="white"> </font>
754+ </para>
755+ </td>
756+ <td>
757+ <para style="P5">
758+ <font color="white"> </font>
759+ </para>
760+ </td>
761+ <td>
762+ <para style="P1">
763+ <font color="white"> </font>
764+ </para>
765+ </td>
766+ </tr>
767+ </blockTable>
768+ <para style="P1">
769+ <font color="white"> </font>
770+ </para>
771+ </td>
772+ </tr>
773+ </blockTable>
774+ <para style="P19"/>
775+ <blockTable rowHeights="80.0mm" colWidths="591.0" style="Table2">
776+ <tr>
777+ <td>
778+ <blockTable colWidths="464.0,122.0" style="Table6">
779+ <tr>
780+ <td>
781+ <para style="P2">[[voucher.partner_id.name]]</para>
782+ </td>
783+ <td>
784+ <para style="P2">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
785+ </td>
786+ </tr>
787+ </blockTable>
788+ <blockTable colWidths="84.0,193.0,86.0,85.0,56.0,80.0" style="Table10">
789+ <tr>
790+ <td>
791+ <para style="P4">Due Date</para>
792+ </td>
793+ <td>
794+ <para style="P4">Invoice</para>
795+ </td>
796+ <td>
797+ <para style="P4">Original Amt.</para>
798+ </td>
799+ <td>
800+ <para style="P4">Balance Due</para>
801+ </td>
802+ <td>
803+ <para style="P4">Discount</para>
804+ </td>
805+ <td>
806+ <para style="P4">Payment</para>
807+ </td>
808+ </tr>
809+ <tr>
810+ <td>
811+ <para style="P6">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
812+ </td>
813+ <td>
814+ <para style="P6">[[ l['name'] ]]</para>
815+ </td>
816+ <td>
817+ <para style="P6">[[ ( formatLang(l['amount_original'])) ]]</para>
818+ </td>
819+ <td>
820+ <para style="P6">[[ (formatLang(l['amount_unreconciled'])) ]]</para>
821+ </td>
822+ <td>
823+ <para style="P6">
824+ <font color="white"> </font>
825+ </para>
826+ </td>
827+ <td>
828+ <para style="P6">[[ ( formatLang(l['amount'])) ]]</para>
829+ </td>
830+ </tr>
831+ </blockTable>
832+ <blockTable colWidths="505.0,81.0" style="Table11">
833+ <tr>
834+ <td>
835+ <para style="P3">Check Amount</para>
836+ </td>
837+ <td>
838+ <para style="P2"><font face="Helvetica">[[ voucher.currency_id.symbol ]]</font>[[ formatLang (voucher.amount) ]]</para>
839+ </td>
840+ </tr>
841+ </blockTable>
842+ <para style="P1">
843+ <font color="white"> </font>
844+ </para>
845+ </td>
846+ </tr>
847+ </blockTable>
848+ <para style="P19"/>
849+ <blockTable colWidths="591.0" style="Table8">
850+ <tr>
851+ <td>
852+ <blockTable colWidths="464.0,121.0" style="Table3">
853+ <tr>
854+ <td>
855+ <para style="P2">[[voucher.partner_id.name]]</para>
856+ </td>
857+ <td>
858+ <para style="P2">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
859+ </td>
860+ </tr>
861+ </blockTable>
862+ <blockTable colWidths="68.0,157.0,70.0,69.0,141.0,80.0" style="Table5">
863+ <tr>
864+ <td>
865+ <para style="P4">Due Date</para>
866+ </td>
867+ <td>
868+ <para style="P4">Invoice</para>
869+ </td>
870+ <td>
871+ <para style="P4">Original Amt.</para>
872+ </td>
873+ <td>
874+ <para style="P4">Balance Due</para>
875+ </td>
876+ <td>
877+ <para style="P4">Discount</para>
878+ </td>
879+ <td>
880+ <para style="P4">Payment</para>
881+ </td>
882+ </tr>
883+ <tr>
884+ <td>
885+ <para style="P6">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
886+ </td>
887+ <td>
888+ <para style="P6">[[ l['name'] ]]</para>
889+ </td>
890+ <td>
891+ <para style="P6">[[ ( formatLang(l['amount_original'])) ]]</para>
892+ </td>
893+ <td>
894+ <para style="P6">[[ (formatLang(l['amount_unreconciled'])) ]]</para>
895+ </td>
896+ <td>
897+ <para style="P6">
898+ <font color="white"> </font>
899+ </para>
900+ </td>
901+ <td>
902+ <para style="P6">[[ ( formatLang(l['amount'])) ]]</para>
903+ </td>
904+ </tr>
905+ </blockTable>
906+ <blockTable colWidths="505.0,80.0" style="Table7">
907+ <tr>
908+ <td>
909+ <para style="P3">Check Amount</para>
910+ </td>
911+ <td>
912+ <para style="P2"><font face="Helvetica">[[ voucher.currency_id.symbol ]]</font>[[ formatLang (voucher.amount) ]]</para>
913+ </td>
914+ </tr>
915+ </blockTable>
916+ <para style="P25">
917+ <font color="white"> </font>
918+ </para>
919+ </td>
920+ </tr>
921+ </blockTable>
922+ <para style="P14">
923 <font color="white"> </font>
924 </para>
925 </story>
926 </document>
927+
928
929=== added file 'l10n_ca_account_check_writing/report/l10n_ca_check_print_top.sxw'
930Binary files l10n_ca_account_check_writing/report/l10n_ca_check_print_top.sxw 1970-01-01 00:00:00 +0000 and l10n_ca_account_check_writing/report/l10n_ca_check_print_top.sxw 2014-05-12 21:07:22 +0000 differ

Subscribers

People subscribed via source and target branches