Mentis

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

Proposed by Aleksander Dirntiš on 2014-01-20

Status:	Merged
Merged at revision:	285
Proposed branch:	lp:~sandi-dirntis/openerpsl/openerpsl_20140120_1
Merge into:	lp:openerpsl/7.0
Diff against target:	25 lines (+3/-1) 2 files modified inovatim_addons/sale_order_line.py (+2/-0) inovatim_addons/sale_order_view.xml (+1/-1)
To merge this branch:	bzr merge lp:~sandi-dirntis/openerpsl/openerpsl_20140120_1
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mentis		2014-01-20	Pending
Review via email: mp+202342@code.launchpad.net

[FIX] Fixed deadlock on certain products

285. By Aleksander Dirntiš on 2014-01-20: [FIX] Fixed deadlock on certain products

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

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