[MERGE] forward port branch 8.0 up to 5ee4344

4 files changed, 20 insertions, 11 deletions

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index c3e170c6513..9ad980e011a 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -553,11 +553,12 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                 self.records.remove(record);
                 return;
             }
-            _.each(values, function (value, key) {
+            // _.each is broken if a field "length" is present
+            for (var key in values) {
                 if (fields[key] && fields[key].type === 'many2many')
                     record.set(key + '__display', false, {silent: true});
-                record.set(key, value, {silent: true});            
-            });
+                record.set(key, values[key], {silent: true});
+            }
             record.trigger('change', record);
         });
     },
diff --git a/debian/control b/debian/control
index 45c9f530631..fd8a9776573 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Depends:
  adduser,
  postgresql-client,
  python,
+ python-babel,
  python-dateutil,
  python-decorator,
  python-docutils,
@@ -31,7 +32,6 @@ Depends:
  python-passlib,
  python-psutil,
  python-psycopg2,
- python-pybabel,
  python-pychart,
  python-pydot,
  python-pyparsing,
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index adc51629365..13712030203 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -106,7 +106,7 @@ class configmanager(object):
         self.config_file = fname
 
         self._LOGLEVELS = dict([
-            (getattr(loglevels, 'LOG_%s' % x), getattr(logging, x)) 
+            (getattr(loglevels, 'LOG_%s' % x), getattr(logging, x))
             for x in ('CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG', 'NOTSET')
         ])
 
@@ -130,7 +130,7 @@ class configmanager(object):
         group.add_option("--addons-path", dest="addons_path",
                          help="specify additional addons paths (separated by commas).",
                          action="callback", callback=self._check_addons_path, nargs=1, type="string")
-        group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules default=web")
+        group.add_option("--load", dest="server_wide_modules", help="Comma-separated list of server-wide modules. Default is 'web,web_kanban'")
 
         group.add_option("-D", "--data-dir", dest="data_dir", my_default=_get_default_datadir(),
                          help="Directory where to store Odoo data")
@@ -409,6 +409,7 @@ class configmanager(object):
             'test_file', 'test_enable', 'test_commit', 'test_report_directory',
             'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
             'data_dir',
+            'server_wide_modules',
         ]
 
         posix_keys = [
@@ -473,14 +474,21 @@ class configmanager(object):
             #if self.options['db_host']:
             #    self._generate_pgpassfile()
 
+        # server_wide_modules defaults to web,web_kanban if empty or unset
+        server_wide_modules = self.options['server_wide_modules'] = (
+            self.options['server_wide_modules']
+            if self.options['server_wide_modules']
+            else 'web,web_kanban'
+        )
+
         if opt.save:
             self.save()
 
         openerp.conf.addons_paths = self.options['addons_path'].split(',')
-        if opt.server_wide_modules:
-            openerp.conf.server_wide_modules = map(lambda m: m.strip(), opt.server_wide_modules.split(','))
-        else:
-            openerp.conf.server_wide_modules = ['web','web_kanban']
+
+        openerp.conf.server_wide_modules = [
+            m.strip() for m in server_wide_modules.split(',')
+        ]
 
     def _generate_pgpassfile(self):
         """
diff --git a/setup/package.dfdebian b/setup/package.dfdebian
index 85a019d64cd..c831486c0d3 100644
--- a/setup/package.dfdebian
+++ b/setup/package.dfdebian
@@ -20,6 +20,7 @@ RUN apt-get update -qq &&  \
 		postgresql \
 		postgresql-client \
 		python \
+		python-babel \
 		python-dateutil \
 		python-decorator \
 		python-docutils \
@@ -35,7 +36,6 @@ RUN apt-get update -qq &&  \
 		python-passlib \
 		python-psutil \
 		python-psycopg2 \
-		python-pybabel \
 		python-pychart \
 		python-pydot \
 		python-pyparsing \