← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/6.0-opw-5998-skh into lp:openobject-addons/6.0

 

Somesh Khare(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-5998-skh into lp:openobject-addons/6.0.

Requested reviews:
  Priyesh (Open ERP) (pso-openerp)
  Jay Vora (OpenERP) (jvo-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5998-skh/+merge/62958

Hello Sir,

[Fix]: I have update the dependency for the module product_variable_discount in __openerp__.py and also change in the code of product_variable_discount.py.

Thanks 
skh
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5998-skh/+merge/62958
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5998-skh.
=== modified file 'product_visible_discount/__openerp__.py'
--- product_visible_discount/__openerp__.py	2011-01-17 10:26:16 +0000
+++ product_visible_discount/__openerp__.py	2011-05-31 09:37:40 +0000
@@ -30,7 +30,7 @@
         If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225
         If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225
     """,
-    "depends": ["sale"],
+    "depends": ["sale","purchase"],
     "demo_xml": [],
     "update_xml": ['product_visible_discount_view.xml'],
     "active": False,

=== modified file 'product_visible_discount/product_visible_discount.py'
--- product_visible_discount/product_visible_discount.py	2011-01-25 07:29:03 +0000
+++ product_visible_discount/product_visible_discount.py	2011-05-31 09:37:40 +0000
@@ -114,11 +114,10 @@
             product_obj = self.pool.get('product.product')
             template_obj = self.pool.get('product.template')
             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:
+                item_base = item_obj.read(cr, uid, [item], ['base'])
+                if item_base and item_base[0]['base'] > 0:
                     field_name = price_type_obj.browse(cr, uid, item_base).field
 
             product = product_obj.browse(cr, uid, product_id, context)