From f7270112753c0b19a1e626ea1cc64c6225d0c758 Mon Sep 17 00:00:00 2001 From: gfcapalbo Date: Wed, 18 Feb 2015 16:29:31 +0100 Subject: [PATCH] [FLAKE8] plus small fix --- stock_available_immediately/product.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stock_available_immediately/product.py b/stock_available_immediately/product.py index 6ee673a9c..8e6a7dc95 100644 --- a/stock_available_immediately/product.py +++ b/stock_available_immediately/product.py @@ -23,7 +23,6 @@ from openerp.addons import decimal_precision as dp from openerp.osv import orm, fields -<<<<<<< HEAD:stock_available_immediately/product.py class ProductTemplate(orm.Model): """ Immediately usable quantity is : real stock - outgoing qty @@ -32,7 +31,7 @@ class ProductTemplate(orm.Model): def _product_available(self, cr, uid, ids, field_names=None, arg=False, context=None): - res = super(Product, self)._product_available( + res = super(ProductTemplate, self)._product_available( cr, uid, ids, field_names, arg, context) if 'immediately_usable_qty' in field_names: