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

[FIX] Acccount,Account_invoice_layout : Minor necessary changes. 

lp bug: https://launchpad.net/bugs/397100 fixed

bzr revid: jvo@tinyerp.com-20090811131922-010i3bk2un4g4ic9
This commit is contained in:
Jay (Open ERP) 2009-08-11 18:49:22 +05:30
parent 500cfa0463
commit 587b335718
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account/report/invoice.rml
View File

@ -233,7 +233,8 @@
<images/>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<para style="terp_default_8">JJJJJ [[ o.partner_id.name ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]] </para>
<blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
<tr>
<td><para style="P8"><font color="white"> </font></para></td>
@ -300,7 +301,7 @@
<td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
</tr>
<tr>
<td><para style="terp_default_Note">[[ format(l.note or removeParentNode('tr')) ]]</para></td>
<td><para style="terp_default_Note">[[ format(l.note) or removeParentNode('tr') ]]</para></td>
<td><para style="terp_default_Note"><font color="white"> </font></para></td>
<td><para style="terp_default_Note"><font color="white"> </font></para></td>
<td><para style="terp_default_Note"><font color="white"> </font></para></td>

14
addons/account_invoice_layout/report/report_account_invoice_layout.rml
View File

@ -126,7 +126,7 @@
<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
@ -163,7 +163,7 @@
</tr>
<tr>
<td><para style="P8"><font color="white"></font></para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para style="P7"><font color="white"></font></para></td>
@ -173,8 +173,8 @@
</blockTable>
<blockTable colWidths="453.0,74.0" style="Tableau8">
<tr>
<td><para style="Table Contents">[[ a['type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' or removeParentNode('blockTable') ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
</tr>
</blockTable>
<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
@ -232,7 +232,7 @@
<td><para style="P8">Amount</para></td>
</tr>
<tr>
<td><para style="P11a"><font>[[ repeatIn(o.tax_line,'t') ]]</font>[[ t.name ]]</para></td>
<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
</tr>
@ -257,7 +257,7 @@
<para style="P8b">
<font color="white"></font>
</para>
<para style="P19">[[ format(o.comment) or '' ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or '' ]]</para>
<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
</story>
</document>

16
addons/account_invoice_layout/report/special_message_invoice.rml
View File

@ -130,7 +130,7 @@
<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
@ -165,7 +165,7 @@
</tr>
<tr>
<td><para style="P8"><font color="white"></font></para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para style="P7"><font color="white"></font></para></td>
@ -175,8 +175,8 @@
</blockTable>
<blockTable colWidths="453.0,74.0" style="Tableau8">
<tr>
<td><para style="Table Contents">[[ a['type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' or removeParentNode('blockTable') ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
</tr>
</blockTable>
<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
@ -234,7 +234,7 @@
<td><para style="P8">Amount</para></td>
</tr>
<tr>
<td><para style="P11a"><font>[[ repeatIn(o.tax_line,'t') ]]</font>[[ t.name ]]</para></td>
<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
</tr>
@ -259,14 +259,14 @@
<para style="P8b">
<font color="white"> </font>
</para>
<para style="P19">[[ format(o.comment) or '' ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or '' ]]</para>
<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
<para style="P8b">
<font color="white"> </font>
</para>
<section>
<para style="P19">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
<para style="P19">[[ note or removeParentNode('para') ]]</para>
<para style="P19">[[ format(note) or removeParentNode('para') ]]</para>
</section>
</story>
</document>