diff --git a/openerp/addons/base/test/base_test.xml b/openerp/addons/base/test/base_test.xml
index d3c1df9bd21..27bcabfc8f9 100644
--- a/openerp/addons/base/test/base_test.xml
+++ b/openerp/addons/base/test/base_test.xml
@@ -7,7 +7,7 @@
-->
- ASUStek
+ ASUSTeK
diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index fa7a69b74e9..03c5bad9328 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -9,14 +9,14 @@
Test hierarchical search in M2M with child ID1
-
!python {model: res.partner }: |
- ids = self.search(cr, uid, [('category_id', 'child_of','Components Supplier')])
+ ids = self.search(cr, uid, [('category_id', 'child_of','Customer')])
assert len(ids) >= 1, ids
-
Test hierarchical search in M2M with child ID2
-
!python {model: res.partner }: |
- ids = self.search(cr, uid, [('category_id', 'child_of','Miscellaneous Suppliers')])
- assert len(ids) >= 1, ids
+ ids = self.search(cr, uid, [('category_id', 'child_of','Manufacturer')])
+ assert len(ids) == 2, ids
-
"1.0 Setup test partner categories: parent root"
@@ -464,8 +464,8 @@
!python {model: res.partner }: |
all_ids = self.search(cr, uid, [('name', '=like', 'A_e_or')])
assert len(all_ids) == 1, "Must match one partner (Axelor), got %r"%all_ids
- all_ids = self.search(cr, uid, [('name', '=ilike', 'm_____')])
- assert len(all_ids) == 1, "Must match *only* one partner (Maxtor), got %r"%all_ids
+ all_ids = self.search(cr, uid, [('name', '=ilike', 'v%')])
+ assert len(all_ids) >= 1, "Must match one partner (Vicking Direct), got %r"%all_ids
-
Check that =like/=ilike expressions (no wildcard variants of like/ilike) are working on translated field.
-
@@ -512,7 +512,7 @@
Testing for Many2Many field with category supplier and active=False
-
!python {model: res.partner }: |
- vals = {'category_id': [(6, 0, [ref("base.res_partner_category_8")])],
+ vals = {'category_id': [(6, 0, [ref("base.res_partner_category_1")])],
'name': 'OpenERP Test',
'active': False,
'child_ids': [(0, 0, {'name': 'address of OpenERP Test', 'country_id': ref("base.be")})]
diff --git a/openerp/modules/registry.py b/openerp/modules/registry.py
index 7c7a5c96f8d..ae9772b661a 100644
--- a/openerp/modules/registry.py
+++ b/openerp/modules/registry.py
@@ -22,6 +22,7 @@
""" Models registries.
"""
+from contextlib import contextmanager
import logging
import threading
@@ -43,12 +44,12 @@ class Registry(object):
"""
def __init__(self, db_name):
- self.models = {} # model name/model instance mapping
+ self.models = {} # model name/model instance mapping
self._sql_error = {}
self._store_function = {}
self._init = True
self._init_parent = {}
-
+
# modules fully loaded (maintained during init phase by `loading` module)
self._init_modules = set()
@@ -119,6 +120,17 @@ class Registry(object):
for model in self.models.itervalues():
model.clear_caches()
+ @contextmanager
+ def cursor(self, auto_commit=True):
+ cr = self.db.cursor()
+ try:
+ yield cr
+ if auto_commit:
+ cr.commit()
+ finally:
+ cr.close()
+
+
class RegistryManager(object):
""" Model registries manager.
@@ -196,7 +208,6 @@ class RegistryManager(object):
del cls.registries[db_name]
openerp.cron.cancel(db_name)
-
@classmethod
def delete_all(cls):
"""Delete all the registries. """
diff --git a/openerp/release.py b/openerp/release.py
index f0f1f049cb6..a151e939d20 100644
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -30,9 +30,9 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA,
# properly comparable using normal operarors, for example:
# (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
# (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
-version_info = (6,2,0,ALPHA,0)
-version = '.'.join(map(str,version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
-major_version = '.'.join(map(str,version_info[:2]))
+version_info = (7, 0, 0, ALPHA, 0)
+version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
+serie = major_version = '.'.join(map(str, version_info[:2]))
description = 'OpenERP Server'
long_desc = '''OpenERP is a complete ERP and CRM. The main features are accounting (analytic