[MERGE] Forward-port 7.0 up to 9411a2da

[odoo/odoo.git] / addons / product_visible_discount / product_visible_discount.py

diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 275bfcd..cdc858d 100644 (file)
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -33,7 +33,6 @@ class product_pricelist(osv.osv):
          'visible_discount': True,
     }
 
-product_pricelist()
 
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
@@ -49,12 +48,6 @@ class sale_order_line(osv.osv):
             product_obj = self.pool.get('product.product')
             field_name = 'list_price'
 
-            if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
-                item = res_dict['item_id'].get(pricelist,False)
-                item_base = item_obj.read(cr, uid, [item], ['base'])[0]['base']
-                if item_base > 0:
-                    field_name = price_type_obj.browse(cr, uid, item_base).field
-
             product = product_obj.browse(cr, uid, product_id, context)
             product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)