odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
parent 024177ebc4 c2aff4772e
commit 24bcdb75fb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/product/product.py
View File

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

7
openerp/tests/common.py
View File

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