[MERGE] forward port of branch 7.0 up to c2aff47

addons/product/product.py

@@ -992,7 +992,7 @@ class product_supplierinfo(osv.osv):
         'company_id':fields.many2one('res.company','Company',select=1),
     }
     _defaults = {
-        'qty': lambda *a: 0.0,
+        'min_qty': lambda *a: 0.0,
         'sequence': lambda *a: 1,
         'delay': lambda *a: 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),

openerp/tests/common.py

@@ -94,9 +94,10 @@ class TransactionCase(BaseCase):
         TransactionCase.cr = self.cursor()
         TransactionCase.uid = openerp.SUPERUSER_ID
 
-    def tearDown(self):
-        self.cr.rollback()
-        self.cr.close()
+        @self.addCleanup
+        def close_cursor():
+            self.cr.rollback()
+            self.cr.close()
 
 
 class SingleTransactionCase(BaseCase):