[MERGE]Merged with trunk-dev-addons2

bzr revid: ron@tinyerp.com-20101229042855-uz5bkqstqtgo8ct6
This commit is contained in:
ron@tinyerp.com
2010-12-29 09:58:55 +05:30
+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>