diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f3af62a583f..15d06f2d3af 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1431,6 +1431,7 @@ class stock_picking(models.Model):
             'name': _('Extra Move: ') + name,
             'state': 'draft',
             'restrict_partner_id': op.owner_id,
+            'group_id': picking.group_id.id,
             }
         return res
 
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 1067576ad15..5b6b6d593e9 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -192,6 +192,8 @@ eventHandler.popover.button.update = function ($container, oStyle) {
 
     fn_boutton_update.call(this, $container, oStyle);
 
+    $container.find('.note-color').removeClass("hidden");
+
     if (oStyle.image) {
         $container.find('[data-event]').parent().removeClass("active");
 
@@ -212,8 +214,6 @@ eventHandler.popover.button.update = function ($container, oStyle) {
             $container.find('button[data-event="resizefa"][data-value="1"]').toggleClass("active", !$container.find('.active[data-event="resizefa"]').length);
 
             $container.find('button[data-event="imageShape"][data-value="fa-spin"]').toggleClass("active", $(oStyle.image).hasClass("fa-spin"));
-            
-            $container.find('.note-color').removeClass("hidden");
 
         } else {
 
@@ -228,7 +228,7 @@ eventHandler.popover.button.update = function ($container, oStyle) {
             $container.find('button[data-event="resize"][data-value="0.25"]').toggleClass("active", width === "25%");
 
             $container.find('button[data-event="imageShape"][data-value="shadow"]').toggleClass("active", $(oStyle.image).hasClass("shadow"));
-            
+
             if (!$(oStyle.image).is("img")) {
                 $container.find('.btn-group:has(button[data-event="imageShape"])').addClass("hidden");
             }
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
index d61d47c9847..51dfb721263 100644
--- a/openerp/tests/phantomtest.js
+++ b/openerp/tests/phantomtest.js
@@ -93,8 +93,8 @@ function PhantomTest() {
                            "\nreferrer: " + document.referrer +
                            "\n\n" + (document.body && document.body.innerHTML)).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
             console.log('<phantomLog>error ' + message + '</phantomLog>');
-            phantom.exit(1);
         });
+        phantom.exit(1);
     }, self.timeout);
 
     // ----------------------------------------------------