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

[IMP] Report Order with layout aborted if lines type Note or Page break 

bzr revid: ara@tinyerp.com-20110718064421-j3n73azrncj9buey
This commit is contained in:
ARA (OpenERP) 2011-07-18 12:14:21 +05:30
parent feaae64ba2
commit d6c416787b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/sale_layout/report/report_sale_layout.py
View File

@ -67,7 +67,7 @@ class sale_order_1(report_sxw.rml_parse):
sub_total[i] = entry.price_subtotal and entry.price_subtotal
i = i + 1
res['note'] = entry.notes or ''
res['currency'] = sale_order.pricelist_id.currency_id.name
res['currency'] = sale_order.pricelist_id.currency_id.symbol
res['layout_type'] = entry.layout_type
else:
res['product_uom_qty'] = ''

4
addons/sale_layout/report/report_sale_layout.rml
View File

@ -250,7 +250,7 @@
<blockTable colWidths="6.0,193.0,85.0,71.0,57.0,57.0,71.0" style="Table1">
<tr>
<td>
<para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
<para style="terp_default_9">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</para>
</td>
<td>
<para style="terp_default_9"><font face="Helvetica" size="8.0">[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
@ -268,7 +268,7 @@
<para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['discount']) ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['layout_type']=='break' and removeParentNode('blockTable')]]<font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
<para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ a['currency'] ]]</para>
</td>
</tr>
<tr>