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