[MERGE] base: raise an exception if the format of the bank account is wrong

[odoo/odoo.git] / openerp / addons / base / res / res_lang.py

diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py
index 2461635..07b220a 100644 (file)
--- a/openerp/addons/base/res/res_lang.py
+++ b/openerp/addons/base/res/res_lang.py
@@ -29,6 +29,8 @@ import tools
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
 
+_logger = logging.getLogger(__name__)
+
 class lang(osv.osv):
     _name = "res.lang"
     _description = "Languages"
@@ -56,15 +58,11 @@ class lang(osv.osv):
         default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.partner'])
         if not default_value:
             ir_values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], lang)
-        default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.users'])
-        if not default_value:
-            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], lang)
         return True
 
     def load_lang(self, cr, uid, lang, lang_name=None):
         # create the language with locale information
         fail = True
-        logger = logging.getLogger('i18n')
         iso_lang = tools.get_iso_codes(lang)
         for ln in tools.get_locales(lang):
             try:
@@ -76,7 +74,7 @@ class lang(osv.osv):
         if fail:
             lc = locale.getdefaultlocale()[0]
             msg = 'Unable to get information for locale %s. Information from the default locale (%s) have been used.'
-            logger.warning(msg, lang, lc)
+            _logger.warning(msg, lang, lc)
 
         if not lang_name:
             lang_name = tools.get_languages().get(lang, lang)
@@ -289,6 +287,8 @@ def split(l, counts):
     res = []
     saved_count = len(l) # count to use when encoutering a zero
     for count in counts:
+        if not l:
+            break
         if count == -1:
             break
         if count == 0:
@@ -350,7 +350,7 @@ def _group_examples():
         assert g("12345678", [2,0,1], '.') == ('12.34.56.78', 3)
         assert g("12345678", [2,0,0], '.') == ('12.34.56.78', 3)
         assert g("12345678", [2,0,-1], '.') == ('12.34.56.78', 3)
-
+        assert g("12345678", [3,3,3,3], '.') == ('12.345.678', 2)
 
     assert original_group("abc1234567xy", [2], '.') == ('abc1234567.xy', 1)
     assert original_group("abc1234567xy8", [2], '.') == ('abc1234567xy8', 0) # difference here...