projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db26225
)
improved Payment Advice
author
apa-tiny
<apa@tinyerp.com>
Fri, 15 Oct 2010 10:12:14 +0000
(15:42 +0530)
committer
apa-tiny
<apa@tinyerp.com>
Fri, 15 Oct 2010 10:12:14 +0000
(15:42 +0530)
bzr revid: apa@tinyerp.com-
20101015101214
-pfwmas2i383884cy
addons/hr_payroll/report/report_payroll_advice.rml
patch
|
blob
|
history
diff --git
a/addons/hr_payroll/report/report_payroll_advice.rml
b/addons/hr_payroll/report/report_payroll_advice.rml
index
8fe1877
..
18f56cc
100644
(file)
--- a/
addons/hr_payroll/report/report_payroll_advice.rml
+++ b/
addons/hr_payroll/report/report_payroll_advice.rml
@@
-1,6
+1,6
@@
<?xml version="1.0"?>
<?xml version="1.0"?>
-<document filename="test.pdf">
- <template pageSize="(595.0,842.0)" title="Payroll Advice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Payment Advice.pdf">
+ <template pageSize="(595.0,842.0)" title="Payment Advice" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
</pageTemplate>
@@
-41,6
+41,12
@@
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
<blockTableStyle id="Table5">
<blockAlignment value="LEFT"/>
<blockValign value="TOP"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
</blockTableStyle>
<blockTableStyle id="Table6">
<blockAlignment value="LEFT"/>
@@
-212,9
+218,6
@@
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<section>
<para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
<blockTable colWidths="60.0,167.0,84.0,82.0,110.0,35.0" style="Table5">
<section>
<para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
<blockTable colWidths="60.0,167.0,84.0,82.0,110.0,35.0" style="Table5">
@@
-229,10
+232,10
@@
<para style="terp_default_9">[[ line['name'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['name'] ]]</para>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
</td>
<td>
- <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['acc_no'] ]]</para>
</td>
<td>
<para style="terp_default_9">[[ line['acc_no'] ]]</para>
@@
-242,13
+245,7
@@
</td>
</tr>
</blockTable>
</td>
</tr>
</blockTable>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
</section>
</section>
- <para style="terp_default_1">
- <font color="white"> </font>
- </para>
<blockTable colWidths="60.0,167.0,84.0,82.0,145.0" style="Table6">
<tr>
<td>
<blockTable colWidths="60.0,167.0,84.0,82.0,145.0" style="Table6">
<tr>
<td>
@@
-257,13
+254,13
@@
</para>
</td>
<td>
</para>
</td>
<td>
- <para style="terp_tblheader_Details">Total([[ company.currency_id.code ]]):</para>
+ <para style="terp_tblheader_Details">Total:</para>
</td>
<td>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
</td>
<td>
- <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ company.currency_id.symbol ]]</para>
+ <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details_Right">
</td>
<td>
<para style="terp_tblheader_Details_Right">
@@
-338,4
+335,4
@@
<seqReset id="L1"/>
</para>
</story>
<seqReset id="L1"/>
</para>
</story>
-</document>
+</document>
\ No newline at end of file