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

[FIX]-the format seems to be correct. but all amounts don t have all the same format. check the total, total net 

and taxes, price unit. all these needs to be changed

bzr revid: apa@tinyerp.com-20090121071958-m717mglcgkddl6ip
This commit is contained in:
Apa (Open ERP) 2009-01-21 12:49:58 +05:30
parent 35ae2e2d46
commit 353d45a1cc
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/purchase/report/order.rml
View File

@ -273,22 +273,22 @@
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) or '0.00' ]]</para>
<para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_9">[[ formatLang( line.date_planned, date=True) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.product_qty or '0.00' ]] </para>
<para style="terp_default_Right_9">[[ line.product_qty or formatLang(0.00) ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.product_uom.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.price_unit or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ line.price_unit or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.price_subtotal or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ line.price_subtotal or formatLang(0.00) ]]</para>
</td>
</tr>
<tr>
@ -339,7 +339,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.amount_untaxed or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ o.amount_untaxed or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
@ -355,7 +355,7 @@
<para style="P1">Taxes :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.amount_tax or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ o.amount_tax or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para>
@ -371,7 +371,7 @@
<para style="P3">Total :</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ o.amount_total or '0.00' ]]</para>
<para style="terp_default_Bold_9_Right">[[ o.amount_total or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_Bold_9_Right">[[ o.pricelist_id.currency_id.name ]]</para>

2
addons/purchase/report/request_quotation.rml
View File

@ -137,7 +137,7 @@
<para style="terp_default_Centre_9">[[ formatLang(order_line.date_planned, date = True) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ order_line.product_qty or '' ]]</para>
<para style="terp_default_Right_9">[[ order_line.product_qty or formatLang(0.00)]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>

22
addons/sale/report/order.rml
View File

@ -98,12 +98,6 @@
<paraStyle name="P5" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P6" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P7" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P8" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P10" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P11" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Times-Roman"/>
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@ -256,22 +250,22 @@
<para style="terp_default_9">[[ line.name ]]</para>
</td>
<td>
<para style="terp_default_Centre_9">[[formatLang( ', '.join(map(lambda x: x.name, line.tax_id))) or '0.00' ]]</para>
<para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) or '0.00']] </para>
<para style="terp_default_Right_9">[[ line.product_uos and line.product_uos_qty or line.product_uom_qty or formatLang(0.00) ]] </para>
</td>
<td>
<para style="terp_default_Right_9">[[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.price_unit) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ line.price_unit or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.discount) and str(line.discount) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ line.discount and str(line.discount) or formatLang(0.00) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(line.price_subtotal) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ line.price_subtotal or formatLang(0.00) ]]</para>
</td>
</tr>
<tr>
@ -322,7 +316,7 @@
<para style="P5">Net Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ o.amount_untaxed or formatLang(0.00) ]]</para>
</td>
<td>
<para style="P1">[[ o.pricelist_id.currency_id.name ]]</para>
@ -338,7 +332,7 @@
<para style="P4">Taxes :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) or '0.00' ]]</para>
<para style="terp_default_Right_9">[[ o.amount_tax or formatLang(0.00) ]]</para>
</td>
<td>
<para style="P1">[[ o.pricelist_id.currency_id.name ]]</para>
@ -354,7 +348,7 @@
<para style="P3">Total :</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) or '0.00' ]] </para>
<para style="terp_default_Right_9_Bold">[[ o.amount_total or formatLang(0.00) ]] </para>
</td>
<td>
<para style="P2">[[ o.pricelist_id.currency_id.name ]]</para>