[MERGE] forward port of branch 7.0 up to c2aff47
This commit is contained in:
commit
24bcdb75fb
|
@ -992,7 +992,7 @@ class product_supplierinfo(osv.osv):
|
||||||
'company_id':fields.many2one('res.company','Company',select=1),
|
'company_id':fields.many2one('res.company','Company',select=1),
|
||||||
}
|
}
|
||||||
_defaults = {
|
_defaults = {
|
||||||
'qty': lambda *a: 0.0,
|
'min_qty': lambda *a: 0.0,
|
||||||
'sequence': lambda *a: 1,
|
'sequence': lambda *a: 1,
|
||||||
'delay': 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),
|
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),
|
||||||
|
|
|
@ -94,9 +94,10 @@ class TransactionCase(BaseCase):
|
||||||
TransactionCase.cr = self.cursor()
|
TransactionCase.cr = self.cursor()
|
||||||
TransactionCase.uid = openerp.SUPERUSER_ID
|
TransactionCase.uid = openerp.SUPERUSER_ID
|
||||||
|
|
||||||
def tearDown(self):
|
@self.addCleanup
|
||||||
self.cr.rollback()
|
def close_cursor():
|
||||||
self.cr.close()
|
self.cr.rollback()
|
||||||
|
self.cr.close()
|
||||||
|
|
||||||
|
|
||||||
class SingleTransactionCase(BaseCase):
|
class SingleTransactionCase(BaseCase):
|
||||||
|
|
Loading…
Reference in New Issue