pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1

Browse Source 
bzr revid: sbh@tinyerp.com-20101228095220-w5rgakhgsduv9t7u
This commit is contained in:
Sbh (OpenERP)
2010-12-28 15:22:20 +05:30
parent b20b28f547 b9510324b4
commit bfd2cce0b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp_repair/report/order.rml
+2 -2
View File
@@ -306,7 +306,7 @@
<para style="P29">Operation Line(s)</para>
<section>
<para style="P30"><font color="white">[[ repeatIn(o.operations,'line') ]] </font></para>
<para style="P30"><font color="white">[[ line or removeParentNode('section')]]</font></para>
<para style="P29">[[ (not line) and removeParentNode('section') ]]</para>
<blockTable colWidths="254.0,100.0,60.0,60.0,60.0" style="Table5">[[ (line.to_invoice==True) or removeParentNode('blockTable') ]]
<tr>
<td>
@@ -332,7 +332,7 @@
<para style="P29">Fees Line(s) [[ (o.fees_lines ==[] and removeParentNode('para') ) ]]</para>
<section>
<para style="P30"><font color="white">[[ repeatIn(o.fees_lines,'fees') ]]</font></para>
<para style="P30"><font color="white">[[ fees or removeParentNode('section')]]</font></para>
<para style="P29">[[ (not fees) and removeParentNode('section') ]]</para>
<blockTable colWidths="254.0,100.0,60.0,60.0,60.0" style="Table6">[[ (fees.to_invoice==True) or removeParentNode('blockTable') ]]
<tr>