[MERGE] merge with main branch

bzr revid: mra@mra-laptop-20100713052714-t821t7r1esinfg1m
This commit is contained in:
Mustufa Rangwala
2010-07-13 10:57:14 +05:30
+2 -2
View File
@@ -402,7 +402,7 @@
<blockTable colWidths="62.0,62.0,22.0" style="Table_eclu_Taxes_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Net Total:</para>
<para style="terp_default_9">Net Total:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
@@ -418,7 +418,7 @@
<blockTable colWidths="63.0,61.0,23.0" style="Table_Taxes_Total">
<tr>
<td>
<para style="terp_default_Bold_9">Taxes:</para>
<para style="terp_default_9">Taxes:</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>