diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4dc0b00bc50..bc5947a8d66 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -471,7 +471,11 @@
form
tree,form
-
+
@@ -593,17 +597,17 @@
-
-
+
+
-
-
+
+
-
+
@@ -616,7 +620,7 @@
-
+
diff --git a/addons/mrp/mrp_security.xml b/addons/mrp/mrp_security.xml
index 563f8f730b5..c72cdb5a33f 100644
--- a/addons/mrp/mrp_security.xml
+++ b/addons/mrp/mrp_security.xml
@@ -282,9 +282,9 @@
-
-
-
+
+
+
diff --git a/addons/product/product.py b/addons/product/product.py
index c381814ae1c..76e26cf52bd 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -490,15 +490,6 @@ class product_product(osv.osv):
res[product.id] = product_uom_obj._compute_price(cr, uid,
uom.id, res[product.id], context['uom'])
return res
-# result = self.read(cr, uid, ids, [ptype, 'price_extra','price_margin'])
-# result2 = {}
-# for res in result:
-# result2[res['id']] = res[ptype] or 0.0
-# if ptype=='list_price':
-# result2[res['id']] = result2[res['id']] * res['price_margin'] + res['price_extra']
-# if 'uom' in context:
-# result2[res['id']] = self.pool.get('product.uom')._compute_price(cr, uid, context['uom'], result2[res['id']])
-# return result2
def copy(self, cr, uid, id, default=None, context=None):
if not context:
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1ce93d62ec4..db52038486b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -36,20 +36,20 @@
-
-
+
+
-
+
-
-
+
+
-
+
@@ -61,10 +61,11 @@
-
+
+
@@ -126,7 +127,9 @@
+
+
@@ -240,7 +243,7 @@
product.ul
form
-
@@ -251,7 +254,7 @@
product.ul
tree
-
+
@@ -263,7 +266,8 @@
form
tree,form
-
+
product.packaging.tree.view
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3b9d91a0dac..0aad099b9ea 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -33,7 +33,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -313,13 +313,13 @@
-
+
-
+
@@ -333,7 +333,7 @@
-
+
@@ -400,6 +400,11 @@
tree,form
[('state','=','done'), ('billable','=',True), ('invoice_id','=',False)]
+
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c622182a29f..7bf15788b52 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -181,7 +181,7 @@
-
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5437df85139..84990db67d4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -94,6 +94,7 @@