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

[MERGE] merged the report team branch

Browse Source 
bzr revid: qdp-launchpad@tinyerp.com-20100927143725-w6lc1n8w01pba50y
This commit is contained in:
qdp-launchpad@tinyerp.com
2010-09-27 16:37:25 +02:00
parent 36d14e1784 7e079eadb6
commit 2c125a25aa
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_followup/report/report_followp_print.rml
+1 -1
View File
@@ -203,7 +203,7 @@
<para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['debit'], getLines(o), 0.00)) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]]/para>
<para style="terp_default_Right_9">[[formatLang(reduce(lambda x,y: x+y['credit'], getLines(o), 0.00)) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(reduce(lambda x,y: x+(y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)) ]] [[ company.currency_id.symbol ]]</para>
addons/point_of_sale/report/pos_lines.rml
+7 -6
View File
@@ -73,6 +73,7 @@
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="P1" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="Standard" fontName="Helvetica"/>
<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
<paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -183,10 +184,10 @@
<para style="terp_default_Right_9">[[taxes(l)]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.qty) ]]</para>
<para style="terp_default_Right_9">[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]][[o.pricelist_id.currency_id. symbol ]]</para>
<para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(l.discount) ]]</para>
@@ -220,7 +221,7 @@
</para>
</td>
<td>
<para style="terp_default_9">Net Total </para>
<para style="terp_default_9">Net Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
@@ -248,7 +249,7 @@
</para>
</td>
<td>
<para style="terp_default_9">Taxes</para>
<para style="terp_default_9">Taxes :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
@@ -276,7 +277,7 @@
</para>
</td>
<td>
<para style="terp_default_9">Total</para>
<para style="P1">Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
@@ -287,4 +288,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>