odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account, account_voucher: voucher report header improvement. 

bzr revid: vra@tinyerp.com-20100913054301-2ndxqmk4084y8row
This commit is contained in:
vra 2010-09-13 11:13:01 +05:30
parent e16e937d4d
commit 3203e472a4
2 changed files with 88 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
addons/account/report/voucher_print.rml
View File

@ -94,16 +94,15 @@
</initialize>
<paraStyle name="P1" fontName="Helvetica"/>
<paraStyle name="P2" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@ -162,47 +161,45 @@
<images/>
</stylesheet>
<story>
<para style="P12">
<font face="Helvetica">[[ repeatIn(objects,'voucher') ]]</font>
</para>
<para style="P11">[[ repeatIn(objects,'voucher') ]]</para>
<blockTable colWidths="63.0,200.0,52.0,210.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Type:</para>
<para style="terp_tblheader_Details">Journal:</para>
</td>
<td>
<para style="terp_default_9">[[ voucher.journal_id.name ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Name:</para>
<para style="terp_default_Bold_9">Number:</para>
</td>
<td>
<para style="P9">[[ voucher.name ]]</para>
<para style="P3">[[ voucher.name ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table5">
<tr>
<td>
<para style="terp_default_Bold_9">Date:</para>
</td>
<td>
<para style="P9">[[ formatLang(voucher.date , date=True) or '' ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">State:</para>
</td>
<td>
<para style="P8">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P8">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P8">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P8">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
<para style="P7">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P7">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P7">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P7">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Ref. :</para>
</td>
<td>
<para style="P9">[[ voucher.ref]]</para>
<para style="P7">[[ voucher.ref]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Date:</para>
</td>
<td>
<para style="P3">[[ formatLang(voucher.date , date=True) or '' ]]</para>
</td>
</tr>
</blockTable>
@ -283,7 +280,7 @@
<blockTable colWidths="313.0,106.0,105.0" style="last_info">
<tr>
<td>
<para style="P4">Through : </para>
<para style="P5">Through : </para>
</td>
<td>
<para style="P2">
@ -313,7 +310,7 @@
</tr>
<tr>
<td>
<para style="P4">On Account of : </para>
<para style="P5">On Account of : </para>
</td>
<td>
<para style="P2">
@ -328,7 +325,7 @@
</tr>
<tr>
<td>
<para style="P7">[[ voucher.line_id and voucher.line_id.name and voucher.line_id.name[1] or removeParentNode('para') ]]</para>
<para style="P9">[[ voucher.line_id and voucher.line_id.name and voucher.line_id.name[1] or removeParentNode('para') ]]</para>
</td>
<td>
<para style="P2">
@ -343,7 +340,22 @@
</tr>
<tr>
<td>
<para style="P4">Amount (in words) : </para>
<para style="P5">Amount (in words) : </para>
</td>
<td>
<para style="P5">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P5">
<font color="white"> </font>
</para>
</td>
</tr>
<tr>
<td>
<para style="P9">[[ convert(voucher.amount) ]]</para>
</td>
<td>
<para style="P4">
@ -356,21 +368,6 @@
</para>
</td>
</tr>
<tr>
<td>
<para style="P7">[[ convert(voucher.amount) ]]</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P3">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<para style="terp_default_1">
<font color="white"> </font>
@ -378,7 +375,7 @@
<blockTable colWidths="313.0,106.0,105.0" style="Table1">
<tr>
<td>
<para style="P5">
<para style="P6">
<font color="white"> </font>
</para>
</td>
@ -427,15 +424,15 @@
</tr>
<tr>
<td>
<para style="P6">Receiver's Signature</para>
<para style="P8">Receiver's Signature</para>
</td>
<td>
<para style="P6">
<para style="P8">
<font color="white"> </font>
</para>
</td>
<td>
<para style="P6">
<para style="P8">
<font color="white"> </font>
</para>
</td>

101
addons/account_voucher/report/report_voucher.rml
View File

@ -10,7 +10,7 @@
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
</blockTableStyle>
<blockTableStyle id="Table4">
<blockTableStyle id="Table7">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
@ -23,17 +23,11 @@
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="4,0" stop="4,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
<lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="5,0" stop="5,0"/>
<lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table5">
<blockTableStyle id="Table8">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
@ -95,21 +89,14 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Helvetica-Bold" fontSize="13.0" leading="16" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P1" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P3" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P5" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
<paraStyle name="Text body" fontName="Helvetica" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
@ -167,17 +154,20 @@
<images/>
</stylesheet>
<story>
<para style="P15">[[ repeatIn(objects,'voucher') ]]</para>
<para style="P8">[[ repeatIn(objects,'voucher') ]]</para>
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="52.0,123.0,50.0,92.0,83.0,124.0" style="Table4">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="63.0,200.0,52.0,210.0" style="Table7">
<tr>
<td>
<para style="terp_default_Bold_9">Journal:</para>
<para style="terp_tblheader_Details">Journal:</para>
</td>
<td>
<para style="terp_default_9">[[ voucher.journal_id.name ]]</para>
<para style="terp_default_9">[[ voucher.type ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Number:</para>
@ -185,6 +175,25 @@
<td>
<para style="terp_default_9">[[ voucher.number ]]</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table8">
<tr>
<td>
<para style="terp_default_Bold_9">State:</para>
</td>
<td>
<para style="P3">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P3">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P3">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P3">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Ref. :</para>
</td>
<td>
<para style="P1">[[ voucher.reference or '' ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Date:</para>
</td>
@ -193,35 +202,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="52.0,123.0,50.0,92.0,83.0,124.0" style="Table5">
<tr>
<td>
<para style="terp_default_Bold_9">State:</para>
</td>
<td>
<para style="P8">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P8">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P8">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P8">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Ref:</para>
</td>
<td>
<para style="P5">[[ voucher.reference or '' ]]</para>
</td>
<td>
<para style="terp_default_Bold_9">Account:</para>
</td>
<td>
<para style="terp_default_9">[[ voucher.account_id.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_9">
<font color="white"> </font>
</para>
<para style="terp_default_9">
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="277.0,124.0,124.0" style="Heading1">
@ -245,7 +226,7 @@
<blockTable colWidths="276.0,126.0,123.0" style="Table2">
<tr>
<td>
<para style="P10">[[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] </para>
<para style="P4">[[ (move_ids.partner_id and move_ids.partner_id.name) or 'Account']] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(move_ids.debit) ]]</para>
@ -256,7 +237,7 @@
</tr>
<tr>
<td>
<para style="P11">[[ move_ids.account_id.name ]] </para>
<para style="P5">[[ move_ids.account_id.name ]] </para>
</td>
<td>
<para style="terp_default_Right_9">
@ -390,7 +371,7 @@
<blockTable colWidths="276.0,127.0,122.0" style="Table1">
<tr>
<td>
<para style="P6">
<para style="P2">
<font color="white"> </font>
</para>
</td>