diff --git a/addons/product/product.py b/addons/product/product.py
index 1cb54c78d6e..c1e62e86689 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -383,6 +383,7 @@ class product_product(osv.osv):
                         uom.id, product.list_price, context['uom'])
             else:
                 res[product.id] = product.list_price
+            res[product.id] =  (res[product.id] or 0.0) * product.price_margin + product.price_extra
         return res
 
     def _get_partner_code_name(self, cr, uid, ids, product_id, partner_id, context={}):
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index ef1920540e5..681b53a3088 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -116,6 +116,8 @@
                             <separator string="Base Prices" colspan="4"/>
                             <field name="standard_price"/>
                             <field name="list_price"/>
+                            <field name="price_margin" select="1"/>
+                            <field name="price_extra" select="1"/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
                             <field colspan="4" name="seller_ids" nolabel="1"/>
@@ -533,6 +535,8 @@
                             <separator string="Base Prices" colspan="4"/>
                             <field name="standard_price"/>
                             <field name="list_price"/>
+                            <field name="price_margin" select="1"/>
+                            <field name="price_extra" select="1"/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
                             <field colspan="4" name="seller_ids" nolabel="1"/>