Merge lp:~sandi-dirntis/openerpsl/openerpsl_20140120_1 into lp:openerpsl/7.0

[Aleksander Dirntiš]

[FIX] Fixed deadlock on certain products

[lp:~sandi-dirntis/openerpsl/openerpsl_20140120_1]

285. By Aleksander Dirntiš on 2014-01-20

[FIX] Fixed deadlock on certain products

=== modified file 'inovatim_addons/sale_order_line.py'
--- inovatim_addons/sale_order_line.py	2014-01-07 13:39:04 +0000
+++ inovatim_addons/sale_order_line.py	2014-01-20 16:55:22 +0000
@@ -52,6 +52,8 @@
             _product = self.pool.get('product.product').browse(cr, uid, product_id)
             product_uos_qty = rounding(product_uos_qty, _product.uos_id.rounding)
             _product_uom_qty = rounding(product_uos_qty / _product.uos_coeff, _product.uom_id.rounding)
+            product_uos_qty = round(product_uos_qty, 3) 
+            _product_uom_qty = round(_product_uom_qty, 3) 
             result['product_uos_qty'] = product_uos_qty
             result['product_uom_qty'] = _product_uom_qty
              
 
=== modified file 'inovatim_addons/sale_order_view.xml'
--- inovatim_addons/sale_order_view.xml	2014-01-07 13:39:04 +0000
+++ inovatim_addons/sale_order_view.xml	2014-01-20 16:55:22 +0000
@@ -4,7 +4,7 @@
         <record id="view_order_inovatim_form" model="ir.ui.view">
             <field name="name">sale.order.inovatim.form</field>
             <field name="model">sale.order</field>
-            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="inherit_id" ref="sale_stock.view_order_form_inherit"/>
             <field name="arch" type="xml">
             	<data>
 	                <field name="product_uos_qty" position="replace">