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

[MERGE] Merge from trunk addons 

bzr revid: mra@mra-laptop-20101001124541-22gikupixjuay3yf
This commit is contained in:
Mustufa Rangwala 2010-10-01 18:15:41 +05:30
parent 07362d6706 a1d54ac584
commit 3a171ca733
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp/mrp_view.xml
View File

@ -283,7 +283,7 @@
<record id="mrp_routing_search_view" model="ir.ui.view">
<field name="name">mrp.routing.search</field>
<field name="model">mrp.routing</field>
<field name="type">tree</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Routing">
<field name="code"/>

8
addons/sale/report/sale_order.rml
View File

@ -312,7 +312,7 @@
<para style="terp_default_9">Net Total :</para>
</td>
<td>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
<para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
<tr>
@ -325,7 +325,7 @@
<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>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
</td>
</tr>
<tr>
@ -338,7 +338,7 @@
<para style="terp_default_Bold_9">Total :</para>
</td>
<td>
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
<para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
</td>
</tr>
</blockTable>
@ -361,4 +361,4 @@
<font color="white"> </font>
</para>
</story>
</document>
</document>

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

@ -62,11 +62,11 @@ class sale_order_1(report_sxw.rml_parse):
if entry.layout_type == 'article':
res['tax_id'] = ', '.join(map(lambda x: x.name, entry.tax_id)) or ''
res['name'] = entry.name
res['product_uom_qty'] = self.digits_fmt(entry, 'product_uos') % (entry.product_uos and entry.product_uos_qty or entry.product_uom_qty or 0.00)
res['product_uom_qty'] = entry.product_uos and entry.product_uos_qty or entry.product_uom_qty or 0.00
res['product_uom'] = entry.product_uos and entry.product_uos.name or entry.product_uom.name
res['price_unit'] = self.digits_fmt(entry, 'price_unit') % (entry.price_unit or 0.00)
res['discount'] = self.digits_fmt(entry, 'discount') % (entry.discount and entry.discount or 0.00)
res['price_subtotal'] = self.digits_fmt(entry, 'price_subtotal') % (entry.price_subtotal and entry.price_subtotal or 0.00)
res['price_unit'] = entry.price_unit or 0.00
res['discount'] = entry.discount and entry.discount or 0.00
res['price_subtotal'] = entry.price_subtotal and entry.price_subtotal or 0.00
sub_total[i] = entry.price_subtotal and entry.price_subtotal
i = i + 1
res['note'] = entry.notes or ''
@ -95,7 +95,7 @@ class sale_order_1(report_sxw.rml_parse):
sum_flag[j+1] = sum_id +1
j = j + 1
res['price_subtotal'] = self.digits_fmt(entry, 'price_subtotal') % (sum)
res['price_subtotal'] = sum
res['currency'] = sale_order.pricelist_id.currency_id.name
res['quantity'] = ''
res['price_unit'] = ''

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

@ -318,13 +318,13 @@
<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom'] ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ a['price_unit'] ]]</font></para>
<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]]</font></para>
</td>
<td>
<para style="terp_default_Centre_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['discount'] ]]</font></para>
<para style="terp_default_Centre_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]]</font></para>
</td>
<td>
<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['price_subtotal'] ]] [[ o.pricelist_id.currency_id.symbol ]]</font></para>
<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</font></para>
</td>
</tr>
</blockTable>
@ -397,7 +397,7 @@
<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>
<para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
</td>
</tr>
<tr>