[MERGE] forward port of branch 7.0 up to c2aff47

This commit is contained in:
Christophe Simonis 2015-09-22 15:30:22 +02:00
commit 24bcdb75fb
2 changed files with 5 additions and 4 deletions

View File

@ -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),

View File

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