savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #01325
[Merge] lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top into lp:openerp-canada
Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top into lp:openerp-canada.
Requested reviews:
OpenERP Community Reviewer/Maintainer (openerp-community-reviewer)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top/+merge/219059
--
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top/+merge/219059
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openerp-canada/fix_l10n_ca_check_print_top.
=== modified file 'l10n_ca_account_check_writing/__openerp__.py'
--- l10n_ca_account_check_writing/__openerp__.py 2013-06-11 13:48:06 +0000
+++ l10n_ca_account_check_writing/__openerp__.py 2014-05-09 19:31:44 +0000
@@ -38,6 +38,15 @@
not when you print. You will need to modify it if you change the language of
the supplier.
+Contributors
+------------
+* David Cormier (david.cormier@xxxxxxxxxxxxxxxxxxxx)
+* Joao Alfredo Gama Batista (joao.gama@xxxxxxxxxxxxxxxxxxxx)
+* Marc Cassuto (marc.cassuto@xxxxxxxxxxxxxxxxxxxx)
+* Mathieu Benoit (mathieu.benoit@xxxxxxxxxxxxxxxxxxxx)
+* Maxime Chambreuil (mchambreuil@xxxxxxxxxxxxxxxxxxxx)
+* Vincent Vinet (vincent.vinet@xxxxxxxxxxxxxxxxxxxx)
+* Virgil Dupras (virgil.dupras@xxxxxxxxxxxxxxxxxxxx)
""",
'depends': ['account_check_writing', 'res_currency_print_on_check'],
'data': [
=== modified file 'l10n_ca_account_check_writing/account_voucher.py'
--- l10n_ca_account_check_writing/account_voucher.py 2014-04-22 13:02:09 +0000
+++ l10n_ca_account_check_writing/account_voucher.py 2014-05-09 19:31:44 +0000
@@ -49,8 +49,8 @@
currency_name = currency.print_on_check
cents = int(amount * 100) % 100
total_length = len(amount_in_word) + len(currency_name)
- if total_length < 87:
- stars = '*' * (87 - total_length)
+ if total_length < 67:
+ stars = '*' * (67 - total_length)
else:
stars = ''
AND = custom_translation("and", lang)
=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print.py'
--- l10n_ca_account_check_writing/report/l10n_ca_check_print.py 2014-04-22 13:02:09 +0000
+++ l10n_ca_account_check_writing/report/l10n_ca_check_print.py 2014-05-09 19:31:44 +0000
@@ -24,7 +24,6 @@
class report_print_check(report_sxw.rml_parse):
-
def __init__(self, cr, uid, name, context):
super(report_print_check, self).__init__(cr, uid, name, context)
self.number_lines = 0
@@ -42,46 +41,52 @@
def get_lines(self, voucher_lines):
result = []
self.number_lines = len(voucher_lines)
- for i in range(0, min(10,self.number_lines)):
+ for i in range(0, min(10, self.number_lines)):
if i < self.number_lines:
voucher_line = voucher_lines[i]
- # In general, the supplier invoice reference number is a much better description
- # for writing checks than our own reference number, but if we don't have it, we
- # might as well use our internal number
- if voucher_line.supplier_invoice_number:
- name = voucher_line.supplier_invoice_number
- else:
- name = voucher_line.name
- res = {
- 'date_due' : voucher_line.date_due,
- 'name' : name,
- 'amount_original' : voucher_line.amount_original and voucher_line.amount_original or False,
- 'amount_unreconciled' : voucher_line.amount_unreconciled and voucher_line.amount_unreconciled or False,
- 'amount' : voucher_line.amount and voucher_line.amount or False,
- }
- else :
- res = {
- 'date_due' : False,
- 'name' : False,
- 'amount_original' : False,
- 'amount_unreconciled' : False,
- 'amount' : False,
- }
- result.append(res)
+ # Don't show lines with amount=0; this means, an invoice/credit note has not been linked to this check
+ if voucher_line.amount != 0:
+ # In general, the supplier invoice reference number is a much better description
+ # for writing checks than our own reference number, but if we don't have it, we
+ # might as well use our internal number
+ if voucher_line.supplier_invoice_number:
+ name = voucher_line.supplier_invoice_number
+ else:
+ name = voucher_line.name
+ res = {
+ 'date_due': voucher_line.date_due,
+ 'name': name,
+ 'amount_original': voucher_line.amount_original and voucher_line.amount_original or False,
+ 'amount_unreconciled': voucher_line.amount_unreconciled and voucher_line.amount_unreconciled
+ or False,
+ 'amount': voucher_line.amount and voucher_line.amount or False,
+ }
+ result.append(res)
+ else:
+ res = {
+ 'date_due': False,
+ 'name': False,
+ 'amount_original': False,
+ 'amount_unreconciled': False,
+ 'amount': False,
+ }
+ result.append(res)
+
return result
+
report_sxw.report_sxw(
'report.l10n.ca.account.print.check.top',
'account.voucher',
'addons/l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml',
- parser=report_print_check,header=False
+ parser=report_print_check, header=False
)
report_sxw.report_sxw(
'report.l10n.ca.account.print.check.middle',
'account.voucher',
'addons/l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml',
- parser=report_print_check,header=False
+ parser=report_print_check, header=False
)
#report_sxw.report_sxw(
=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml'
--- l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml 2014-04-22 13:02:09 +0000
+++ l10n_ca_account_check_writing/report/l10n_ca_check_print_top.rml 2014-05-09 19:31:44 +0000
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<document filename="test.pdf">
- <template pageSize="(595, 842)" title="Test" author="Martin Simon" allowSplitting="20">
+ <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
<pageTemplate id="first">
- <frame id="first" x1="13.0" y1="0.0" width="567" height="841"/>
+ <frame id="first" x1="8.0" y1="0.0" width="579" height="841"/>
</pageTemplate>
</template>
<stylesheet>
@@ -18,11 +18,7 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
- <blockTableStyle id="Table5">
- <blockAlignment value="LEFT"/>
- <blockValign value="TOP"/>
- </blockTableStyle>
- <blockTableStyle id="Table12">
+ <blockTableStyle id="Table13">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
@@ -61,30 +57,34 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
- <paraStyle name="P1" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica"/>
- <paraStyle name="P2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica"/>
- <paraStyle name="P3" fontName="Helvetica"/>
- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
- <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
- <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
- <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13"/>
- <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT"/>
- <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
- <paraStyle name="P12" fontName="Helvetica" fontSize="12.0" leading="15"/>
- <paraStyle name="P13" fontName="Helvetica"/>
- <paraStyle name="P14" fontName="Helvetica" fontSize="10.0" leading="13"/>
- <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13"/>
- <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
- <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
- <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
- <paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
- <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
- <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10"/>
- <paraStyle name="P22" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
- <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
- <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+ <paraStyle name="P1" fontName="Helvetica"/>
+ <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+ <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+ <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10"/>
+ <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10"/>
+ <paraStyle name="P8" fontName="Helvetica" fontSize="11.0" leading="14"/>
+ <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT"/>
+ <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14"/>
+ <paraStyle name="P11" fontName="Helvetica" fontSize="6.0" leading="8"/>
+ <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14" textColor="#ffffff"/>
+ <paraStyle name="P13" rightIndent="-5.0" leftIndent="0.0" fontName="Helvetica"/>
+ <paraStyle name="P14" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/>
+ <paraStyle name="P15" fontName="Helvetica" fontSize="11.0" leading="14" alignment="RIGHT"/>
+ <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/>
+ <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+ <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
+ <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" textColor="#ffffff"/>
+ <paraStyle name="P21" rightIndent="22.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10"/>
+ <paraStyle name="P22" rightIndent="-12.0" leftIndent="5.0" fontName="Helvetica" fontSize="11.0" leading="14"/>
+ <paraStyle name="P23" rightIndent="-1.0" leftIndent="0.0" fontName="Helvetica"/>
+ <paraStyle name="P24" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/>
+ <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+ <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <paraStyle name="P27" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+ <paraStyle name="P28" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -96,242 +96,407 @@
<images/>
</stylesheet>
<story>
- <para style="P1">[[repeatIn(objects,'voucher')]]</para>
- <para style="P1">[[ setLang(voucher.partner_id.lang) ]]</para>
- <blockTable colWidths="568.0" style="Table1">
- <tr>
- <td>
- <blockTable colWidths="425.0,177.0" rowHeights="107.50,25.5" style="Table4">
- <tr>
- <td>
- <para style="P6">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P6">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P6">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P9">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="54.0,425.0,85.0" rowHeights="21.5" style="Table4">
- <tr>
- <td>
- <para style="P6">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P9">[[ voucher.partner_id.name ]] </para>
- </td>
- <td>
- <para style="P12">[[ formatLang (voucher.amount) ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="550.0" rowHeights="18" style="Table5">
- <tr>
- <td>
- <para style="P9">[[ voucher.amount_in_word ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="54.0,425.0,85.0" rowHeights="45.5" style="Table4">
- <tr>
- <td>
- <para style="P6"></para>
- </td>
- <td>
- <para style="P9">[[ voucher.partner_id.name ]] </para>
- <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
- </td>
- <td>
- <para/>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="25.0,350,150" rowHeights="10.5" style="Table12">
- <tr>
- <td>
- <para style="P3">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P15">[[ voucher.name ]]</para>
- </td>
- <td>
- <para style="P3">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <para style="P3">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="568.0" style="Table2" rowHeights="255">
- <tr>
- <td>
- <blockTable colWidths="445.0,117.0" style="Table6">
- <tr>
- <td>
- <para style="P16">[[voucher.partner_id.name]]</para>
- </td>
- <td>
- <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table10">
- <tr>
- <td>
- <para style="P4">Due Date</para>
- </td>
- <td>
- <para style="P4">Invoice</para>
- </td>
- <td>
- <para style="P4">Original Amount</para>
- </td>
- <td>
- <para style="P4">Open Balance</para>
- </td>
- <td>
- <para style="P4">Discount</para>
- </td>
- <td>
- <para style="P4">Payment</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P19">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
- </td>
- <td>
- <para style="P19">[[ l['name'] ]]</para>
- </td>
- <td>
- <para style="P19">[[formatLang( l['amount_original']) ]]</para>
- </td>
- <td>
- <para style="P19">[[ formatLang( l['amount_unreconciled']) ]]</para>
- </td>
- <td>
- <para style="P19">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P19">[[ formatLang (l['amount']) ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="485.0,77.0" style="Table11">
- <tr>
- <td>
- <para style="P24">Check Amount</para>
- </td>
- <td>
- <para style="P23">[[ formatLang (voucher.amount) ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="P3">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="568.0" style="Table3">
- <tr>
- <td>
- <blockTable colWidths="446.0,116.0" style="Table7">
- <tr>
- <td>
- <para style="P16">[[voucher.partner_id.name]]</para>
- </td>
- <td>
- <para style="P16">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="82.0,185.0,89.0,76.0,52.0,78.0" style="Table8">
- <tr>
- <td>
- <para style="P4">Due Date</para>
- </td>
- <td>
- <para style="P4">Invoice</para>
- </td>
- <td>
- <para style="P4">Original Amount</para>
- </td>
- <td>
- <para style="P4">Open Balance</para>
- </td>
- <td>
- <para style="P4">Discount</para>
- </td>
- <td>
- <para style="P4">Payment</para>
- </td>
- </tr>
- <tr>
- <td>
- <para style="P19">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
- </td>
- <td>
- <para style="P19">[[ l['name'] ]]</para>
- </td>
- <td>
- <para style="P19">[[ formatLang (l['amount_original']) ]]</para>
- </td>
- <td>
- <para style="P19">[[ formatLang (l['amount_unreconciled']) ]]</para>
- </td>
- <td>
- <para style="P19">
- <font color="white"> </font>
- </para>
- </td>
- <td>
- <para style="P19">[[ formatLang (l['amount']) ]]</para>
- </td>
- </tr>
- </blockTable>
- <blockTable colWidths="485.0,77.0" style="Table9">
- <tr>
- <td>
- <para style="P17">Check Amount</para>
- </td>
- <td>
- <para style="P16">[[ formatLang (voucher.amount) ]]</para>
- </td>
- </tr>
- </blockTable>
- <para style="P3">
- <font color="white"> </font>
- </para>
- </td>
- </tr>
- </blockTable>
- <para style="P2">
+ <para style="P23">[[repeatIn(objects,'voucher')]]</para>
+ <para style="P23">[[ setLang(voucher.partner_id.lang) ]]</para>
+ <blockTable colWidths="579.0" style="Table1">
+ <tr>
+ <td>
+ <blockTable colWidths="29.0,397.0,33.0,144.0" style="Table4">
+ <tr>
+ <td>
+ <para style="P10">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P20">.</para>
+ </td>
+ <td>
+ <para style="P20">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P10">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P12">.</para>
+ </td>
+ <td>
+ <para style="P12">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P8">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P10">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P9">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P9">DATE</para>
+ </td>
+ <td>
+ <para style="P24">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P10">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P12">.</para>
+ </td>
+ <td>
+ <para style="P12">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P11">Y Y Y Y – M M – D D</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P22">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P14">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P15">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P16">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P22">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P18">[[ voucher.amount_in_word ]]</para>
+ </td>
+ <td>
+ <para style="P15">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P28">[[ formatLang (voucher.amount) ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P21">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P17">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P7">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P5">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P17">[[ voucher.partner_id.name ]]</para>
+ <para style="P17">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
+ </td>
+ <td>
+ <para style="P7">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="32.0,353.0,195.0" style="Table13">
+ <tr>
+ <td>
+ <para style="P5">MEMO</para>
+ </td>
+ <td>
+ <para style="P5">[[ voucher.name ]]</para>
+ </td>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="574.0" style="Table2">
+ <tr>
+ <td>
+ <blockTable colWidths="450.0,118.0" style="Table6">
+ <tr>
+ <td>
+ <para style="P2">[[voucher.partner_id.name]]</para>
+ </td>
+ <td>
+ <para style="P25">[[ formatLang(voucher.date , date=True) or '' ]] [[ voucher.journal_id.use_preprint_check and voucher.chk_seq or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="82.0,188.0,84.0,82.0,54.0,78.0" style="Table10">
+ <tr>
+ <td>
+ <para style="P4">Due Date</para>
+ </td>
+ <td>
+ <para style="P26">Invoice</para>
+ </td>
+ <td>
+ <para style="P4">Original Amt.</para>
+ </td>
+ <td>
+ <para style="P4">Balance Due</para>
+ </td>
+ <td>
+ <para style="P4">Discount</para>
+ </td>
+ <td>
+ <para style="P4">Payment</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P27">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ l['name'] ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ ( formatLang(l['amount_original'])) ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ (formatLang(l['amount_unreconciled'])) ]]</para>
+ </td>
+ <td>
+ <para style="P6">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P6">[[ ( formatLang(l['amount'])) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="490.0,78.0" style="Table11">
+ <tr>
+ <td>
+ <para style="P3">Check Amount</para>
+ </td>
+ <td>
+ <para style="P2"><font face="Helvetica">[[ voucher.currency_id.symbol ]]</font>[[ formatLang (voucher.amount) ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P19">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P2">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="580.0" style="Table3">
+ <tr>
+ <td>
+ <blockTable colWidths="456.0,119.0" style="Table7">
+ <tr>
+ <td>
+ <para style="P2">[[voucher.partner_id.name]]</para>
+ </td>
+ <td>
+ <para style="P2">[[ formatLang(voucher.date , date=True) or '' ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="84.0,189.0,91.0,78.0,53.0,79.0" style="Table8">
+ <tr>
+ <td>
+ <para style="P4">Due Date</para>
+ </td>
+ <td>
+ <para style="P26">Invoice</para>
+ </td>
+ <td>
+ <para style="P4">Original Amt.</para>
+ </td>
+ <td>
+ <para style="P4">Balance Due</para>
+ </td>
+ <td>
+ <para style="P4">Discount</para>
+ </td>
+ <td>
+ <para style="P4">Payment</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P27">[[ repeatIn(get_all_lines(voucher),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ l['name'] ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ ( formatLang(l['amount_original'])) ]]</para>
+ </td>
+ <td>
+ <para style="P6">[[ ( formatLang(l['amount_unreconciled'])) ]]</para>
+ </td>
+ <td>
+ <para style="P6">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P6">[[ ( formatLang(l['amount'])) ]]</para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="496.0,78.0" style="Table9">
+ <tr>
+ <td>
+ <para style="P3">Check Amount</para>
+ </td>
+ <td>
+ <para style="P2"><font face="Helvetica">[[ voucher.currency_id.symbol ]]</font>[[ formatLang (voucher.amount) ]]</para>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <para style="P3">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P2">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="P1">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <para style="P13">
<font color="white"> </font>
</para>
</story>
</document>
+
=== added file 'l10n_ca_account_check_writing/report/l10n_ca_check_print_top.sxw'
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-09 19:31:44 +0000 differ
Follow ups
