From 2569e07191422bbd3535ded11825425de4247dd1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 12:39:46 +0100
Subject: [PATCH 01/56] [IMP] website: snippet don't use snipet id

bzr revid: chm@openerp.com-20140303113946-d70yd8nmew1k3z37
---
 .../src/js/website.snippets.animation.js      |  11 +-
 .../static/src/js/website.snippets.editor.js  | 899 +++++++++---------
 .../website/static/src/xml/website.editor.xml |   2 +-
 addons/website/views/snippets.xml             | 178 ++--
 4 files changed, 553 insertions(+), 537 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index bc2ea064731..01e4c5239cb 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -5,13 +5,18 @@
     if (!website.snippet) website.snippet = {};
     website.snippet.readyAnimation = [];
 
-    website.snippet.start_animation = function () {
+    website.snippet.start_animation = function ($target) {
         for (var k in website.snippet.animationRegistry) {
             var Animation = website.snippet.animationRegistry[k];
             var selector = "[data-snippet-id='"+k+"']";
             if (Animation.prototype.selector) {
                 selector += ", " + Animation.prototype.selector;
             }
+            if ($target) {
+                if ($target.is(selector)) selector = $target;
+                else continue;
+            }
+
             $(selector).each(function() {
                 var $snipped_id = $(this);
                 if (    !$snipped_id.parents("#oe_snippets").length &&
@@ -32,7 +37,7 @@
             }
         });
     };
-    $(document).ready(website.snippet.start_animation);
+    $(document).ready(function () {website.snippet.start_animation();});
 
 
     website.snippet.animationRegistry = {};
@@ -67,7 +72,7 @@
     });
 
     website.snippet.animationRegistry.parallax = website.snippet.Animation.extend({
-        parallax: ".parallax",
+        selector: ".parallax",
         start: function () {
             var self = this;
             setTimeout(function () {self.set_values();});
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 23c5956ebf4..addd610e47b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -167,6 +167,9 @@
                             'snippet-style-id' : style_id,
                             'selector': $style.data('selector'),
                             '$el': $style,
+                            'selector-siblings': $style.data('selector-siblings'),
+                            'selector-children': $style.data('selector-children'),
+                            'selector-vertical-children': $style.data('selector-vertical-children')
                         };
                     });
                     $styles.addClass("hidden");
@@ -219,12 +222,19 @@
                     return;
                 }
                 snipped_event_flag = true;
+                var selector = [];
+                for (var k in website.snippet.styles) {
+                    selector.push(website.snippet.styles[k].selector);
+                }
+                selector = selector.join(",");
+
                 setTimeout(function () {snipped_event_flag = false;}, 0);
                 var $target = $(event.srcElement);
-                if (!$target.attr("data-snippet-id")) {
-                    $target = $target.parents("[data-snippet-id]:first");
+
+                if (!$target.is(selector)) {
+                    $target = $target.parents(selector).first();
                 }
-                if (!$target.attr("data-oe-model") && !$target.parents("[data-oe-model]:first").length) {
+                if (!self.dom_filter($target).length) {
                     $target = false;
                 }
                 if (self.$active_snipped_id && self.$active_snipped_id.is($target)) {
@@ -281,8 +291,7 @@
             if (typeof $snippet.data("snippet-editor") === 'undefined') {
                 var $targets = this.activate_overlay_zones($snippet);
                 if (!$targets.length) return;
-                var editor = website.snippet.editorRegistry[$snippet.data("snippet-id")] || website.snippet.editorRegistry.resize;
-                $snippet.data("snippet-editor", new editor(this, $snippet));
+                $snippet.data("snippet-editor", new website.snippet.Editor(this, $snippet));
             }
             this.cover_target($snippet.data('overlay'), $snippet);
         },
@@ -318,36 +327,50 @@
                 start: function(){
                     self.hide();
                     dropped = false;
+                    // snippet_selectors => to get selector-siblings, selector-children, selector-vertical-children
                     $snippet = $(this);
-                    snipped_id = $snippet.data('snippet-id');
+                    $toInsert = $snippet.find('.oe_snippet_body').clone();
+                    $toInsert.removeClass('oe_snippet_body');
+
+                    var selector = [];
+                    var selector_siblings = [];
+                    var selector_children = [];
+                    var selector_vertical_children = [];
+                    for (var k in website.snippet.styles) {
+                        if ($toInsert.is(website.snippet.styles[k].selector)) {
+                            selector.push(website.snippet.styles[k].selector);
+                            if (website.snippet.styles[k]['selector-siblings'])
+                                selector_siblings.push(website.snippet.styles[k]['selector-siblings']);
+                            if (website.snippet.styles[k]['selector-children'])
+                                selector_children.push(website.snippet.styles[k]['selector-children']);
+                            if (website.snippet.styles[k]['selector-vertical-children'])
+                                selector_vertical_children.push(website.snippet.styles[k]['selector-vertical-children']);
+                        }
+                    }
+
                     action = $snippet.find('.oe_snippet_body').size() ? 'insert' : 'mutate';
+
                     if( action === 'insert'){
-                        if (!$snippet.data('selector-siblings') && !$snippet.data('selector-children') && !$snippet.data('selector-vertical-children')) {
+                        if (!selector_siblings.length && !selector_children.length && !selector_vertical_children.length) {
                             console.debug($snippet.data("snippet-id") + " have oe_snippet_body class and have not for insert action"+
                                 "data-selector-siblings, data-selector-children or data-selector-vertical-children tag for mutate action");
                             return;
                         }
+                        console.log(selector_siblings);
+                        console.log(selector_children);
+                        console.log(selector_vertical_children);
                         self.activate_insertion_zones({
-                            siblings: $snippet.data('selector-siblings'),
-                            children:   $snippet.data('selector-children'),
-                            vertical_children:   $snippet.data('selector-vertical-children')
+                            siblings: selector_siblings.join(","),
+                            children: selector_children.join(","),
+                            vertical_children: selector_vertical_children.join(","),
                         });
 
-                        $toInsert = $snippet.find('.oe_snippet_body').clone();
-                        $toInsert.removeClass('oe_snippet_body');
-                        $toInsert.data('src-snippet-id', snipped_id);
-                        if (!$toInsert.data('snippet-id')) {
-                            $toInsert.attr('data-snippet-id', snipped_id);
-                        } else {
-                            snipped_id = $toInsert.data('snippet-id');
-                        }
-
                     } else if( action === 'mutate' ){
                         if (!$snippet.data('selector')) {
                             console.debug($snippet.data("snippet-id") + " have not oe_snippet_body class and have not data-selector tag");
                             return;
                         }
-                        var $targets = self.activate_overlay_zones($snippet.data('selector'));
+                        var $targets = self.activate_overlay_zones(selector_children.join(","));
                         $targets.each(function(){
                             var $clone = $(this).data('overlay').clone();
                              $clone.addClass("oe_drop_zone").data('target', $(this));
@@ -382,56 +405,31 @@
                     }
 
                     $('.oe_drop_zone').droppable('destroy').remove();
+                    
                     if (dropped) {
                         var $target = false;
-                        if(action === 'insert'){
-                            $target = $toInsert;
+                        $target = $toInsert;
 
-                            website.snippet.start_animation();
+                        setTimeout(function () {
+                            $("#oe_snippets").trigger('snippet-dropped', $target);
+
+                            // after rte
+                            website.snippet.start_animation($target);
 
                             self.create_overlay($target);
                             if ($target.data("snippet-editor")) {
                                 $target.data("snippet-editor").drop_and_build_snippet($target);
                             }
 
-                            $target.find("[data-snippet-id]").each(function () {
-                                var $snippet = $(this);
-                                var snippet_id = $snippet.data("data-snippet-id");
-                                self.create_overlay($snippet);
-                                if ($snippet.data("snippet-editor")) {
-                                    $snippet.data("snippet-editor").drop_and_build_snippet($snippet);
-                                }
-                            });
-
-                        } else {
-                            $target = $(this).data('target');
-
-                            self.create_overlay($target);
-                            if (website.snippet.editorRegistry[snipped_id]) {
-                                var snippet = new website.snippet.editorRegistry[snipped_id](self, $target);
-                                snippet.drop_and_build_snippet($target);
+                            for (var k in website.snippet.styles) {
+                                $target.find(website.snippet.styles[k].selector).each(function () {
+                                    var $snippet = $(this);
+                                    self.create_overlay($snippet);
+                                    if ($snippet.data("snippet-editor")) {
+                                        $snippet.data("snippet-editor").drop_and_build_snippet($snippet);
+                                    }
+                                });
                             }
-                        }
-                        setTimeout(function () {
-                            $("#oe_snippets").trigger('snippet-dropped', $target);
-
-                            // reset snippet for rte
-                            $target.removeData("snippet-editor");
-                            if ($target.data("overlay")) {
-                                $target.data("overlay").remove();
-                                $target.removeData("overlay");
-                            }
-                            self.create_overlay($target);
-                            $target.find("[data-snippet-id]").each(function () {
-                                var $snippet = $(this);
-                                $snippet.removeData("snippet-editor");
-                                if ($snippet.data("overlay")) {
-                                    $snippet.data("overlay").remove();
-                                    $snippet.removeData("overlay");
-                                }
-                                self.create_overlay($snippet);
-                            });
-                            // end
 
                             self.make_active($target);
                         },0);
@@ -598,8 +596,8 @@
     website.snippet.styleRegistry = {};
     website.snippet.StyleEditor = openerp.Class.extend({
         // initialisation (don't overwrite)
-        init: function (parent, $target, snippet_id) {
-            this.parent = parent;
+        init: function (BuildingBlock, $target, snippet_id) {
+            this.BuildingBlock = BuildingBlock;
             this.$target = $target;
             var styles = this.$target.data("snippet-style-ids") || {};
             styles[snippet_id] = this;
@@ -664,6 +662,13 @@
         // start is call just after the init
         start: function () {
         },
+        /*
+        *  drop_and_build_snippet
+        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
+        *  (after the insertion of this.$body, if this.$body exists)
+        */
+        drop_and_build_snippet: function ($target) {
+        },
         /* select
         *  called when a user select an item
         *  variables: np = {$next, $prev}
@@ -715,7 +720,6 @@
         }
     });
 
-
     website.snippet.styleRegistry.background = website.snippet.StyleEditor.extend({
         _get_bg: function () {
             return this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
@@ -781,217 +785,171 @@
             this.$el.find('li:has(li[data-class].active)').addClass("active");
         }
     });
+    website.snippet.styleRegistry.slider = website.snippet.StyleEditor.extend({
+        drop_and_build_snippet: function() {
+            var id = $(".carousel").length;
+            this.id = "myCarousel" + id;
+            this.$target.attr("id", this.id);
+            this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
+            this.$target.find("[data-target]").attr("data-target", "#myCarousel" + id);
 
-
-    website.snippet.editorRegistry = {};
-    website.snippet.Editor = openerp.Class.extend({
-        init: function (parent, dom) {
-            this.parent = parent;
-            this.$target = $(dom);
-            this.$overlay = this.$target.data('overlay');
-            this.snippet_id = this.$target.data("snippet-id");
-            this._readXMLData();
-            this.load_style_options();
-            this.get_parent_block();
-            this.start();
+            this.rebind_event();
         },
-
-        /*
-        *  _readXMLData
-        *  Read data XML and set value into:
-        *  this.$el :
-        *       all xml data
-        *  this.$overlay :
-        *       Dom hover the $target who content options
-        *  this.$editor :
-        *       content of .oe_snippet_options
-        *       Displayed into the overlay options on focus
-        */
-        _readXMLData: function() {
+        // rebind event to active carousel on edit mode
+        rebind_event: function () {
             var self = this;
-            this.$el = this.parent.$snippets.filter(function () { return $(this).data("snippet-id") == self.snippet_id; }).clone();
-            this.$editor = this.$el.find(".oe_snippet_options");
-            var $options = this.$overlay.find(".oe_overlay_options");
-            this.$editor.prependTo($options.find(".oe_options ul"));
-            if ($options.find(".oe_options ul li").length) {
-                $options.find(".oe_options").removeClass("hidden");
-            }
+            this.$target.find('.carousel-indicators [data-target]').off('click').on('click', function () {
+                self.$target.carousel(+$(this).data('slide-to')); });
+
+            this.$target.attr('contentEditable', 'false');
+            this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
         },
-
-
-        // activate drag and drop for the snippets in the snippet toolbar
-        _drag_and_drop: function(){
-            var self = this;
-            this.dropped = false;
-            this.$overlay.draggable({
-                greedy: true,
-                appendTo: 'body',
-                cursor: "move",
-                handle: ".oe_snippet_move",
-                cursorAt: {
-                    left: 18,
-                    top: 14
-                },
-                helper: function() {
-                    var $clone = $(this).clone().css({width: "24px", height: "24px", border: 0});
-                    $clone.find(".oe_overlay_options >:not(:contains(.oe_snippet_move)), .oe_handle").remove();
-                    $clone.find(":not(.glyphicon)").css({position: 'absolute', top: 0, left: 0});
-                    $clone.appendTo("body").removeClass("hidden");
-                    return $clone;
-                },
-                start: _.bind(self._drag_and_drop_start, self),
-                stop: _.bind(self._drag_and_drop_stop, self)
-            });
-        },
-        _drag_and_drop_after_insert_dropzone: function (){},
-        _drag_and_drop_active_drop_zone: function ($zones){
-            var self = this;
-            $zones.droppable({
-                over:   function(){
-                    $(".oe_drop_zone.hide").removeClass("hide");
-                    $(this).addClass("hide").first().after(self.$target);
-                    self.dropped = true;
-                },
-                out:    function(){
-                    $(this).removeClass("hide");
-                    self.$target.detach();
-                    self.dropped = false;
-                },
-            });
-        },
-        _drag_and_drop_start: function (){
-            var self = this;
-            self.parent.hide();
-            self.parent.editor_busy = true;
-            self.size = {
-                width: self.$target.width(),
-                height: self.$target.height()
-            };
-            self.$target.after("<div class='oe_drop_clone' style='display: none;'/>");
-            self.$target.detach();
-            self.$overlay.addClass("hidden");
-
-            self.parent.activate_insertion_zones({
-                siblings: self.$el ? self.$el.data('selector-siblings') : false,
-                children:   self.$el ? self.$el.data('selector-children') : false,
-                vertical_children: self.$el ? self.$el.data('selector-vertical-children') : false,
-            });
-
-            $("body").addClass('move-important');
-
-            self._drag_and_drop_after_insert_dropzone();
-            self._drag_and_drop_active_drop_zone($('.oe_drop_zone'));
-        },
-        _drag_and_drop_stop: function (){
-            var self = this;
-            if (!self.dropped) {
-                $(".oe_drop_clone").after(self.$target);
-            }
-            self.$overlay.removeClass("hidden");
-            $("body").removeClass('move-important');
-            $('.oe_drop_zone').droppable('destroy').remove();
-            $(".oe_drop_clone, .oe_drop_to_remove").remove();
-            self.parent.editor_busy = false;
-            self.get_parent_block();
-            setTimeout(function () {self.parent.create_overlay(self.$target);},0);
-        },
-
-        load_style_options: function () {
-            var self = this;
-            var $styles = this.$overlay.find('.oe_options');
-            var $ul = $styles.find('ul:first');
-            _.each(website.snippet.styles, function (val) {
-                if (!self.parent.dom_filter(val.selector).is(self.$target)) {
-                    return;
-                }
-                var Editor = website.snippet.styleRegistry[val['snippet-style-id']] || website.snippet.StyleEditor;
-                var editor = new Editor(self, self.$target, val['snippet-style-id']);
-                $ul.prepend(editor.$el.addClass("snippet-style-" + val['snippet-style-id']));
-            });
-
-            if ($ul.find("li").length) {
-                $styles.removeClass("hidden");
-            }
-        },
-
-        get_parent_block: function () {
-            var self = this;
-            var $button = this.$overlay.find('.oe_snippet_parent');
-            var $parent = this.$target.parents("[data-snippet-id]:first");
-            if ($parent.length) {
-                $button.removeClass("hidden");
-                $button.off("click").on('click', function (event) {
-                    event.preventDefault();
-                    setTimeout(function () {
-                        self.parent.make_active($parent);
-                    }, 0);
-                });
-            } else {
-                $button.addClass("hidden");
-            }
-        },
-
-        /*
-        *  start
-        *  This method is called after init and _readXMLData
-        */
-        start: function () {
-            var self = this;
-            this.$overlay.on('click', '.oe_snippet_clone', _.bind(this.on_clone, this));
-            this.$overlay.on('click', '.oe_snippet_remove', _.bind(this.on_remove, this));
-            this._drag_and_drop();
-        },
-
-        on_clone: function () {
-            var $clone = this.$target.clone(false);
-            this.$target.after($clone);
-            return false;
-        },
-
-        on_remove: function () {
-            this.onBlur();
-            var index = _.indexOf(this.parent.snippets, this.$target.get(0));
-            delete this.parent.snippets[index];
-            this.$target.remove();
-            this.$overlay.remove();
-            return false;
-        },
-
-        /*
-        *  drop_and_build_snippet
-        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
-        *  (after the insertion of this.$body, if this.$body exists)
-        */
-        drop_and_build_snippet: function ($target) {
-        },
-
-        /* onFocus
-        *  This method is called when the user click inside the snippet in the dom
-        */
-        onFocus : function () {
-            this.$overlay.addClass('oe_active');
-        },
-
-        /* onFocus
-        *  This method is called when the user click outside the snippet in the dom, after a focus
-        */
-        onBlur : function () {
-            this.$overlay.removeClass('oe_active');
-        },
-
-        /* clean_for_save
-        *  function called just before save vue
-        */
         clean_for_save: function () {
-            this.$target.removeAttr('contentEditable')
-                .find('*').removeAttr('contentEditable');
-            this.$target.removeAttr('attributeEditable')
-                .find('*').removeAttr('attributeEditable');
+            this._super();
+            this.$target.find(".item").removeClass("next prev left right");
+            if(!this.$target.find(".item.active").length) {
+                this.$target.find(".item:first").addClass("active");
+            }
+        },
+        start : function () {
+            var self = this;
+            this._super();
+            this.id = this.$target.attr("id");
+            this.$inner = this.$target.find('.carousel-inner');
+            this.$indicators = this.$target.find('.carousel-indicators');
+
+            this.$el.find(".js_add").on('click', function () {self.on_add_slide(); return false;});
+            this.$el.find(".js_remove").on('click', function () {self.on_remove_slide(); return false;});
+
+            this.$target.carousel('pause');
+            this.rebind_event();
+        },
+        on_add_slide: function () {
+            var self = this;
+            var cycle = this.$inner.find('.item').length;
+            var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
+            var index = $active.index();
+            this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
+            this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
+
+            var $clone = this.$target.find(".item.active").clone();
+
+            // insert
+            $clone.removeClass('active').insertAfter($active);
+            setTimeout(function() {
+                self.$target.carousel().carousel(++index);
+                self.rebind_event();
+            },0);
+            return $clone;
+        },
+        on_remove_slide: function () {
+            if (this.remove_process) {
+                return;
+            }
+            var self = this;
+            var new_index = 0;
+            var cycle = this.$inner.find('.item').length - 1;
+            var index = this.$inner.find('.item.active').index();
+
+            if (cycle > 0) {
+                this.remove_process = true;
+                var $el = this.$inner.find('.item.active');
+                self.$target.on('slid.bs.carousel', function (event) {
+                    $el.remove();
+                    self.$indicators.find("li:last").remove();
+                    self.$target.off('slid.bs.carousel');
+                    self.rebind_event();
+                    self.remove_process = false;
+                    if (cycle == 1) {
+                        self.on_remove_slide(event);
+                    }
+                });
+                setTimeout(function () {
+                    self.$target.carousel( index > 0 ? --index : cycle );
+                }, 500);
+            } else {
+                this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
+            }
+        },
+    });
+    website.snippet.styleRegistry.carousel = website.snippet.styleRegistry.slider.extend({
+        getSize: function () {
+            this.grid = this._super();
+            this.grid.size = 8;
+            return this.grid;
+        },
+        clean_for_save: function () {
+            this._super();
+            this.$target.css("background-image", "");
+            this.$target.removeClass(this._class);
+        },
+        load_style_options : function () {
+            this._super();
+            $(".snippet-style-size li[data-class='']").remove();
+        },
+        start : function () {
+            var self = this;
+            this._super();
+
+            // set background and prepare to clean for save
+            var add_class = function (c){
+                if (c) self._class = (self._class || "").replace(new RegExp("[ ]+" + c.replace(" ", "|[ ]+")), '') + ' ' + c;
+                return self._class || "";
+            };
+            this.$target.on('snippet-style-change snippet-style-preview', function (event, style, np) {
+                var $active = self.$target.find(".item.active");
+                if (style['snippet-style-id'] === "size") return;
+                if (style['snippet-style-id'] === "background") {
+                    $active.css("background-image", self.$target.css("background-image"));
+                }
+                if (np.$prev) {
+                    $active.removeClass(np.$prev.data("class"));
+                }
+                if (np.$next) {
+                    $active.addClass(np.$next.data("class"));
+                    add_class(np.$next.data("class"));
+                }
+            });
+            this.$target.on('slid', function () { // slide.bs.carousel
+                var $active = self.$target.find(".item.active");
+                self.$target
+                    .css("background-image", $active.css("background-image"))
+                    .removeClass(add_class($active.attr("class")))
+                    .addClass($active.attr("class"))
+                    .trigger("snippet-style-reset");
+
+                self.$target.carousel("pause");
+            });
+            this.$target.trigger('slid');
+        },
+        on_add_slide: function () {
+            var $clone = this._super();
+
+            // choose an other background
+            var bg = this.$target.data("snippet-style-ids").background;
+            if (!bg) return $clone;
+
+            var $styles = bg.$el.find("li[data-class]:not(.oe_custom_bg)");
+            var styles_index = $styles.index($styles.filter(".active")[0]);
+            var $select = $($styles[styles_index >= $styles.length-1 ? 0 : styles_index+1]);
+            $clone.css("background-image", $select.data("src") ? "url('"+ $select.data("src") +"')" : "");
+            $clone.addClass($select.data("class") || "");
+
+            return $clone;
+        },
+        // rebind event to active carousel on edit mode
+        rebind_event: function () {
+            var self = this;
+            this.$target.find('.carousel-control').off('click').on('click', function () {
+                self.$target.carousel( $(this).data('slide')); });
+
+            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
+            this.$target.find('.carousel-image').attr('attributeEditable', 'true');
+            this._super();
         },
     });
 
-
-    website.snippet.editorRegistry.resize = website.snippet.Editor.extend({
+    website.snippet.styleRegistry.resize = website.snippet.StyleEditor.extend({
         start: function () {
             var self = this;
             this._super();
@@ -1057,7 +1015,7 @@
                     var regClass = new RegExp("\\s*" + resize[0][begin].replace(/[-]*[0-9]+/, '[-]*[0-9]+'), 'g');
                 }
 
-                self.parent.editor_busy = true;
+                self.BuildingBlock.editor_busy = true;
 
                 var cursor = $handle.css("cursor")+'-important';
                 var $body = $(document.body);
@@ -1071,7 +1029,7 @@
                         if (dy <= 0) dy = resize;
                         self.$target.css("height", dy+"px");
                         self.on_resize(compass, null, dy);
-                        self.parent.cover_target(self.$overlay, self.$target);
+                        self.BuildingBlock.cover_target(self.$overlay, self.$target);
                         return;
                     }
                     var dd = event['page'+XY] - xy + resize[1][begin];
@@ -1094,7 +1052,7 @@
 
                     if (change) {
                         self.on_resize(compass, beginClass, current);
-                        self.parent.cover_target(self.$overlay, self.$target);
+                        self.BuildingBlock.cover_target(self.$overlay, self.$target);
                     }
                 };
 
@@ -1102,7 +1060,7 @@
                     $body.unbind('mousemove', body_mousemove);
                     $body.unbind('mouseup', body_mouseup);
                     $body.removeClass(cursor);
-                    self.parent.editor_busy = false;
+                    self.BuildingBlock.editor_busy = false;
                     self.$target.removeClass("resize_editor_busy");
                 };
                 $body.mousemove(body_mousemove);
@@ -1110,14 +1068,7 @@
             });
         },
         getSize: function () {
-            var grid = [0,4,8,16,32,48,64,92,128];
-            this.grid = {
-                // list of class (Array), grid (Array), default value (INT)
-                n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
-                s: [_.map(grid, function (v) {return 'mb'+v;}), grid],
-                // INT if the user can resize the snippet (resizing per INT px)
-                size: null
-            };
+            this.grid = {};
             return this.grid;
         },
 
@@ -1163,8 +1114,21 @@
             this.change_cursor();
         }
     });
-
-    website.snippet.editorRegistry.colmd = website.snippet.editorRegistry.resize.extend({
+    website.snippet.styleRegistry["margin-y"] = website.snippet.styleRegistry.resize.extend({
+        getSize: function () {
+            this.grid = this._super();
+            var grid = [0,4,8,16,32,48,64,92,128];
+            this.grid = {
+                // list of class (Array), grid (Array), default value (INT)
+                n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
+                s: [_.map(grid, function (v) {return 'mb'+v;}), grid],
+                // INT if the user can resize the snippet (resizing per INT px)
+                size: null
+            };
+            return this.grid;
+        },
+    });
+    website.snippet.styleRegistry["margin-x"] = website.snippet.styleRegistry.resize.extend({
         getSize: function () {
             this.grid = this._super();
             var width = this.$target.parents(".row:first").first().outerWidth();
@@ -1229,7 +1193,7 @@
                     return false;
                 } else {
                     if (!$parent.data("snippet-editor")) {
-                        this.parent.create_overlay($parent);
+                        this.BuildingBlock.create_overlay($parent);
                     }
                     $parent.data("snippet-editor").on_remove();
                 }
@@ -1262,170 +1226,15 @@
             this._super(compass, beginClass, current);
         },
     });
-
-    website.snippet.editorRegistry.slider = website.snippet.editorRegistry.resize.extend({
-        drop_and_build_snippet: function() {
-            var id = $(".carousel").length;
-            this.id = "myCarousel" + id;
-            this.$target.attr("id", this.id);
-            this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
-            this.$target.find("[data-target]").attr("data-target", "#myCarousel" + id);
-
-            this.rebind_event();
-        },
-        // rebind event to active carousel on edit mode
-        rebind_event: function () {
-            var self = this;
-            this.$target.find('.carousel-indicators [data-target]').off('click').on('click', function () {
-                self.$target.carousel(+$(this).data('slide-to')); });
-
-            this.$target.attr('contentEditable', 'false');
-            this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
-        },
-        clean_for_save: function () {
-            this._super();
-            this.$target.find(".item").removeClass("next prev left right");
-            if(!this.$target.find(".item.active").length) {
-                this.$target.find(".item:first").addClass("active");
-            }
-        },
-        start : function () {
-            var self = this;
-            this._super();
-            this.id = this.$target.attr("id");
-            this.$inner = this.$target.find('.carousel-inner');
-            this.$indicators = this.$target.find('.carousel-indicators');
-
-            this.$editor.find(".js_add").on('click', function () {self.on_add_slide(); return false;});
-            this.$editor.find(".js_remove").on('click', function () {self.on_remove_slide(); return false;});
-
-            this.$target.carousel('pause');
-            this.rebind_event();
-        },
-        on_add_slide: function () {
-            var self = this;
-            var cycle = this.$inner.find('.item').length;
-            var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
-            var index = $active.index();
-            this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
-            this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
-
-            var $clone = this.$el.find(".item.active").clone();
-
-            // insert
-            $clone.removeClass('active').insertAfter($active);
-            setTimeout(function() {
-                self.$target.carousel().carousel(++index);
-                self.rebind_event();
-            },0);
-            return $clone;
-        },
-        on_remove_slide: function () {
-            if (this.remove_process) {
-                return;
-            }
-            var self = this;
-            var new_index = 0;
-            var cycle = this.$inner.find('.item').length - 1;
-            var index = this.$inner.find('.item.active').index();
-
-            if (cycle > 0) {
-                this.remove_process = true;
-                var $el = this.$inner.find('.item.active');
-                self.$target.on('slid.bs.carousel', function (event) {
-                    $el.remove();
-                    self.$indicators.find("li:last").remove();
-                    self.$target.off('slid.bs.carousel');
-                    self.rebind_event();
-                    self.remove_process = false;
-                    if (cycle == 1) {
-                        self.on_remove_slide(event);
-                    }
-                });
-                setTimeout(function () {
-                    self.$target.carousel( index > 0 ? --index : cycle );
-                }, 500);
-            } else {
-                this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
-            }
-        },
-    });
-
-    website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.slider.extend({
+    website.snippet.styleRegistry["resize"] = website.snippet.styleRegistry.resize.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
             return this.grid;
         },
-        clean_for_save: function () {
-            this._super();
-            this.$target.css("background-image", "");
-            this.$target.removeClass(this._class);
-        },
-        load_style_options : function () {
-            this._super();
-            $(".snippet-style-size li[data-class='']").remove();
-        },
-        start : function () {
-            var self = this;
-            this._super();
-
-            // set background and prepare to clean for save
-            var add_class = function (c){
-                if (c) self._class = (self._class || "").replace(new RegExp("[ ]+" + c.replace(" ", "|[ ]+")), '') + ' ' + c;
-                return self._class || "";
-            };
-            this.$target.on('snippet-style-change snippet-style-preview', function (event, style, np) {
-                var $active = self.$target.find(".item.active");
-                if (style['snippet-style-id'] === "size") return;
-                if (style['snippet-style-id'] === "background") {
-                    $active.css("background-image", self.$target.css("background-image"));
-                }
-                if (np.$prev) {
-                    $active.removeClass(np.$prev.data("class"));
-                }
-                if (np.$next) {
-                    $active.addClass(np.$next.data("class"));
-                    add_class(np.$next.data("class"));
-                }
-            });
-            this.$target.on('slid', function () { // slide.bs.carousel
-                var $active = self.$target.find(".item.active");
-                self.$target
-                    .css("background-image", $active.css("background-image"))
-                    .removeClass(add_class($active.attr("class")))
-                    .addClass($active.attr("class"))
-                    .trigger("snippet-style-reset");
-
-                self.$target.carousel();
-            });
-            this.$target.trigger('slid');
-        },
-        on_add_slide: function () {
-            var $clone = this._super();
-
-            // choose an other background
-            var $styles = this.$target.data("snippet-style-ids").background.$el.find("li[data-class]:not(.oe_custom_bg)");
-            var styles_index = $styles.index($styles.filter(".active")[0]);
-            var $select = $($styles[styles_index >= $styles.length-1 ? 0 : styles_index+1]);
-            $clone.css("background-image", $select.data("src") ? "url('"+ $select.data("src") +"')" : "");
-            $clone.addClass($select.data("class") || "");
-
-            return $clone;
-        },
-        // rebind event to active carousel on edit mode
-        rebind_event: function () {
-            var self = this;
-            this.$target.find('.carousel-control').off('click').on('click', function () {
-                self.$target.carousel( $(this).data('slide')); });
-
-            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
-            this.$target.find('.carousel-image').attr('attributeEditable', 'true');
-            this._super();
-        },
     });
 
-    website.snippet.editorRegistry.parallax = website.snippet.editorRegistry.resize.extend({
+    website.snippet.styleRegistry.parallax = website.snippet.StyleEditor.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
@@ -1446,7 +1255,7 @@
         },
         scroll: function () {
             var self = this;
-            var $ul = this.$editor.find('ul[name="parallax-scroll"]');
+            var $ul = this.$el.find('ul[name="parallax-scroll"]');
             var $li = $ul.find("li");
             var speed = this.$target.data('scroll-background-ratio') || 0.6 ;
             $ul.find('[data-value="' + speed + '"]').addClass('active');
@@ -1468,13 +1277,211 @@
         }
     });
 
-    /*
-    * data-snippet-id automatically setted
-    * Don't need to add data-snippet-id="..." into the views
-    */
 
-    website.snippet.selector.push([".row > [class*='col-md-']", 'colmd']);
-    website.snippet.selector.push(['hr', 'hr']);
-    website.snippet.selector.push(['blockquote', 'quote']);
+    website.snippet.Editor = openerp.Class.extend({
+        init: function (BuildingBlock, dom) {
+            this.BuildingBlock = BuildingBlock;
+            this.$target = $(dom);
+            this.$overlay = this.$target.data('overlay');
+            this.snippet_id = this.$target.data("snippet-id");
+            this._readXMLData();
+            this.load_style_options();
+            this.get_parent_block();
+            this.start();
+        },
+
+        /*
+        *  _readXMLData
+        *  Read data XML and set value into:
+        *  this.$el :
+        *       all xml data
+        *  this.$overlay :
+        *       Dom hover the $target who content options
+        */
+        _readXMLData: function() {
+            var self = this;
+            this.$el = this.BuildingBlock.$snippets.filter(function () { return $(this).data("snippet-id") == self.snippet_id; }).clone();
+            var $options = this.$overlay.find(".oe_overlay_options");
+            if ($options.find(".oe_options ul li").length) {
+                $options.find(".oe_options").removeClass("hidden");
+            }
+        },
+
+
+        // activate drag and drop for the snippets in the snippet toolbar
+        _drag_and_drop: function(){
+            var self = this;
+            this.dropped = false;
+            this.$overlay.draggable({
+                greedy: true,
+                appendTo: 'body',
+                cursor: "move",
+                handle: ".oe_snippet_move",
+                cursorAt: {
+                    left: 18,
+                    top: 14
+                },
+                helper: function() {
+                    var $clone = $(this).clone().css({width: "24px", height: "24px", border: 0});
+                    $clone.find(".oe_overlay_options >:not(:contains(.oe_snippet_move)), .oe_handle").remove();
+                    $clone.find(":not(.glyphicon)").css({position: 'absolute', top: 0, left: 0});
+                    $clone.appendTo("body").removeClass("hidden");
+                    return $clone;
+                },
+                start: _.bind(self._drag_and_drop_start, self),
+                stop: _.bind(self._drag_and_drop_stop, self)
+            });
+        },
+        _drag_and_drop_after_insert_dropzone: function (){},
+        _drag_and_drop_active_drop_zone: function ($zones){
+            var self = this;
+            $zones.droppable({
+                over:   function(){
+                    $(".oe_drop_zone.hide").removeClass("hide");
+                    $(this).addClass("hide").first().after(self.$target);
+                    self.dropped = true;
+                },
+                out:    function(){
+                    $(this).removeClass("hide");
+                    self.$target.detach();
+                    self.dropped = false;
+                },
+            });
+        },
+        _drag_and_drop_start: function (){
+            var self = this;
+            self.BuildingBlock.hide();
+            self.BuildingBlock.editor_busy = true;
+            self.size = {
+                width: self.$target.width(),
+                height: self.$target.height()
+            };
+            self.$target.after("<div class='oe_drop_clone' style='display: none;'/>");
+            self.$target.detach();
+            self.$overlay.addClass("hidden");
+
+            self.BuildingBlock.activate_insertion_zones({
+                siblings: self.$el ? self.$el.data('selector-siblings') : false,
+                children:   self.$el ? self.$el.data('selector-children') : false,
+                vertical_children: self.$el ? self.$el.data('selector-vertical-children') : false,
+            });
+
+            $("body").addClass('move-important');
+
+            self._drag_and_drop_after_insert_dropzone();
+            self._drag_and_drop_active_drop_zone($('.oe_drop_zone'));
+        },
+        _drag_and_drop_stop: function (){
+            var self = this;
+            if (!self.dropped) {
+                $(".oe_drop_clone").after(self.$target);
+            }
+            self.$overlay.removeClass("hidden");
+            $("body").removeClass('move-important');
+            $('.oe_drop_zone').droppable('destroy').remove();
+            $(".oe_drop_clone, .oe_drop_to_remove").remove();
+            self.BuildingBlock.editor_busy = false;
+            self.get_parent_block();
+            setTimeout(function () {self.BuildingBlock.create_overlay(self.$target);},0);
+        },
+
+        load_style_options: function () {
+            var self = this;
+            var $styles = this.$overlay.find('.oe_options');
+            var $ul = $styles.find('ul:first');
+            this.styles = {};
+            _.each(website.snippet.styles, function (val) {
+                if (!self.$target.is(val.selector)) {
+                    return;
+                }
+                var style = val['snippet-style-id'];
+                var Editor = website.snippet.styleRegistry[style] || website.snippet.StyleEditor;
+                var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
+                $ul.append(editor.$el.addClass("snippet-style-" + style));
+            });
+
+            if ($ul.find("li").length) {
+                $styles.removeClass("hidden");
+            }
+        },
+
+        get_parent_block: function () {
+            var self = this;
+            var $button = this.$overlay.find('.oe_snippet_parent');
+            var $parent = this.$target.parents("[data-snippet-id]:first");
+            if ($parent.length) {
+                $button.removeClass("hidden");
+                $button.off("click").on('click', function (event) {
+                    event.preventDefault();
+                    setTimeout(function () {
+                        self.BuildingBlock.make_active($parent);
+                    }, 0);
+                });
+            } else {
+                $button.addClass("hidden");
+            }
+        },
+
+        /*
+        *  start
+        *  This method is called after init and _readXMLData
+        */
+        start: function () {
+            var self = this;
+            this.$overlay.on('click', '.oe_snippet_clone', _.bind(this.on_clone, this));
+            this.$overlay.on('click', '.oe_snippet_remove', _.bind(this.on_remove, this));
+            this._drag_and_drop();
+        },
+
+        on_clone: function () {
+            var $clone = this.$target.clone(false);
+            this.$target.after($clone);
+            return false;
+        },
+
+        on_remove: function () {
+            this.onBlur();
+            var index = _.indexOf(this.BuildingBlock.snippets, this.$target.get(0));
+            delete this.BuildingBlock.snippets[index];
+            this.$target.remove();
+            this.$overlay.remove();
+            return false;
+        },
+
+        /*
+        *  drop_and_build_snippet
+        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
+        *  (after the insertion of this.$body, if this.$body exists)
+        */
+        drop_and_build_snippet: function ($target) {
+            for (var i in this.styles){
+                this.styles[i].drop_and_build_snippet($target);
+            }
+        },
+
+        /* onFocus
+        *  This method is called when the user click inside the snippet in the dom
+        */
+        onFocus : function () {
+            this.$overlay.addClass('oe_active');
+        },
+
+        /* onFocus
+        *  This method is called when the user click outside the snippet in the dom, after a focus
+        */
+        onBlur : function () {
+            this.$overlay.removeClass('oe_active');
+        },
+
+        /* clean_for_save
+        *  function called just before save vue
+        */
+        clean_for_save: function () {
+            this.$target.removeAttr('contentEditable')
+                .find('*').removeAttr('contentEditable');
+            this.$target.removeAttr('attributeEditable')
+                .find('*').removeAttr('attributeEditable');
+        },
+    });
 
 })();
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 6c1e387c958..8caac7c6683 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -97,7 +97,7 @@
                       target="fileframe"
                       class="col-sm-8">
                     <div class="text-center">
-                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
                         <button type="button" class="btn btn-primary btn-lg filepicker">
                             Upload an image from your computer
                         </button>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index f43c1c1bb80..08520bb2397 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -13,14 +13,7 @@
 
 <div id="snippet_structure" class="tab-pane fade in active">
 
-    <div data-snippet-id="carousel" data-selector-children=".oe_structure, [data-oe-type=html]">
-        <li class="oe_snippet_options divider"></li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_banner.png"/>
             <span class="oe_snippet_thumbnail_title">Banner</span>
@@ -51,7 +44,7 @@
         </div>
     </div>
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_image.png"/>
             <span class="oe_snippet_thumbnail_title">Text-Image</span>
@@ -79,7 +72,7 @@
     </div>
 
 
-    <div data-snippet-id="image-text" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_text.png"/>
             <span class="oe_snippet_thumbnail_title">Image-Text</span>
@@ -107,7 +100,7 @@
     </div>
 
 
-    <div data-snippet-id="jumbotron" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_jumbotron.png"/>
             <span class="oe_snippet_thumbnail_title">Big Message</span>
@@ -128,7 +121,7 @@
     </div>
 
 
-    <div data-snippet-id="text-block" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_block.png"/>
             <span class="oe_snippet_thumbnail_title">Text Block</span>
@@ -166,7 +159,7 @@
     </div>
 
 
-    <div data-snippet-id="title" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_title.png"/>
             <span class="oe_snippet_thumbnail_title">Title</span>
@@ -183,7 +176,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="features" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_features.png"/>
             <span class="oe_snippet_thumbnail_title">Features</span>
@@ -214,7 +207,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="big-picture" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
             <span class="oe_snippet_thumbnail_title">Big Picture</span>
@@ -246,7 +239,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="three-columns" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_three_columns.png"/>
             <span class="oe_snippet_thumbnail_title">Three Columns</span>
@@ -291,7 +284,7 @@
 
 <div id="snippet_content" class="tab-pane fade">
 
-    <div data-snippet-id="well" data-selector-siblings="p, h1, h2, h3, blockquote" data-selector-children=".content">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_well.png"/>
             <span class="oe_snippet_thumbnail_title">Well</span>
@@ -303,7 +296,7 @@
     </div>
 
 
-    <div data-snippet-id="quote" data-selector-siblings="p, h1, h2, h3, blockquote" data-selector-children=".content">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quote.png"/>
             <span class="oe_snippet_thumbnail_title">Quote</span>
@@ -318,7 +311,7 @@
     </div>
 
 
-    <div data-snippet-id="panel" data-selector-siblings="p, h1, h2, h3, blockquote" data-selector-children=".content">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_panel.png"/>
             <span class="oe_snippet_thumbnail_title">Panel</span>
@@ -335,7 +328,7 @@
     </div>
 
 
-    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
             <span class="oe_snippet_thumbnail_title">Separator</span>
@@ -347,7 +340,7 @@
 
 <div id="snippet_feature" class="tab-pane fade">
 
-    <div data-snippet-id="portfolio" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_portfolio.png"/>
             <span class="oe_snippet_thumbnail_title">Portfolio</span>
@@ -380,7 +373,7 @@
     </div>
 
 
-    <div data-snippet-id="image-gallery" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_gallery.png"/>
             <span class="oe_snippet_thumbnail_title">Image Gallery</span>
@@ -422,7 +415,7 @@
     </div>
 
 
-    <div data-snippet-id="pricing" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_comparison.png"/>
             <span class="oe_snippet_thumbnail_title">Comparisons</span>
@@ -528,7 +521,7 @@
     </div>
 
 
-    <div data-snippet-id="cta" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
             <span class="oe_snippet_thumbnail_title">Button</span>
@@ -545,7 +538,7 @@
     </div>
 
 
-    <div data-snippet-id="faq" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_faq.png"/>
             <span class="oe_snippet_thumbnail_title">FAQ</span>
@@ -592,7 +585,7 @@
     </div>
 
 
-    <div data-snippet-id="references" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_references.png"/>
             <span class="oe_snippet_thumbnail_title">References</span>
@@ -609,7 +602,7 @@
                         </h3>
                     </div>
                     <div class="col-md-4 col-md-offset-1 mt16 mb32">
-                        <blockquote data-snippet-id="quote">
+                        <blockquote>
                             <p>
                                 Write a quote here from one of your customers. Quotes are a
                                 great way to build confidence in your products or services.
@@ -618,7 +611,7 @@
                         </blockquote>
                     </div>
                     <div class="col-md-4 col-md-offset-2 mt16 mb32">
-                        <blockquote data-snippet-id="quote">
+                        <blockquote>
                             <p>
                                 OpenERP provides essential platform for our project management.
                                 Things are better organized and more visible with it.
@@ -646,14 +639,7 @@
         </section>
     </div>
 
-    <div data-snippet-id="slider" data-selector-children=".oe_structure, [data-oe-type=html]">
-        <li class="oe_snippet_options divider"></li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
-        <li class="oe_snippet_options">
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quotes_slider.png"/>
             <span class="oe_snippet_thumbnail_title">Quotes Slider</span>
@@ -706,7 +692,7 @@
         </div>
     </div>
 
-    <div data-snippet-id="features-list" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_features.png"/>
             <span class="oe_snippet_thumbnail_title">Feature Grid</span>
@@ -766,22 +752,11 @@
 
 <div id="snippet_effect" class="tab-pane fade">
 
-    <div data-snippet-id="parallax" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_parallax.png"/>
             <span class="oe_snippet_thumbnail_title">Parallax</span>
         </div>
-        <li class="oe_snippet_options dropdown-submenu">
-            <a tabindex="-1" href="#">Scroll Speed</a>
-            <ul class="dropdown-menu" name="parallax-scroll">
-                <li data-value="0"><a>Static</a></li>
-                <li data-value="0.3"><a>Very Slow</a></li>
-                <li data-value="0.6"><a>Slow</a></li>
-                <li data-value="1"><a>Fixed</a></li>
-                <li data-value="1.4"><a>Fast</a></li>
-                <li data-value="1.7"><a>Very Fast</a></li>
-            </ul>
-        </li>
         <section class="oe_snippet_body parallax"
                 style="height: 320px; background-image: url('/website/static/src/img/banner/mountains.jpg')"
                 data-scroll-background-ratio="0.3">
@@ -789,17 +764,17 @@
         </section>
     </div>
 
-    <div data-snippet-id="parallax_quote" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quotes_slider.png"/>
             <span class="oe_snippet_thumbnail_title">Parallax Slider</span>
         </div>
-        <section class="oe_snippet_body parallax" data-snippet-id="parallax"
+        <section class="oe_snippet_body parallax"
                  style="height: 320px; background-image: url('/website/static/src/img/parallax/quote.png')"
                 data-scroll-background-ratio="0.3">
             <div>
                 <div class="oe_structure">
-                    <div id="myQuoteCarousel" class="carousel quotecarousel slide mb0" data-snippet-id="slider">
+                    <div id="myQuoteCarousel" class="carousel quotecarousel slide mb0">
                         <!-- Indicators -->
                         <ol class="carousel-indicators mb0">
                             <li data-target="#myQuoteCarousel" data-slide-to="0" class="active"></li>
@@ -852,50 +827,20 @@
 
 </div>
 
-<!-- use to declare snippet for snippet editor -->
-<div id="snippet_hidden" class="hidden">
-
-    <div data-snippet-id='colmd' data-selector-vertical-children='.row'>
-        <div class="oe_snippet_thumbnail">
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_column.png"/>
-            <span class="oe_snippet_thumbnail_title">Add Column</span>
-        </div>
-        <div class="oe_snippet_body col-md-4">
-            <img class="img img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
-            <h4 class="mt16">Feature</h4>
-            <p>
-                Delete the above image or replace it with a picture
-                that illustrates your message. Click on the picture to
-                change it's <em>rounded corner</em> style.
-            </p>
-        </div>
-    </div>
-
-</div>
-
 <div id="snippet_styles" class="hidden">
 
-    <div data-snippet-style-id='text-style' data-selector="section">
+    <div data-snippet-style-id='blog-style'
+        data-selector="section:not(.carousel):not(.parallax)">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Style</a>
             <ul class="dropdown-menu">
-                <li data-class="readable"><a>Readability</a></li>
+                <li data-class="readable"><a>Blog Style</a></li>
             </ul>
         </li>
     </div>
 
-    <div data-snippet-style-id='carousel-style' data-selector="div[data-snippet-id='carousel']">
-        <li class="dropdown-submenu" data-required="true">
-            <a tabindex="-1" href="#">Layout</a>
-            <ul class="dropdown-menu">
-                <li data-class="text_only"><a>Text Only</a></li>
-                <li data-class="image_text"><a>Image - Text</a></li>
-                <li data-class="text_image"><a>Text - Image</a></li>
-            </ul>
-        </li>
-    </div>
-
-    <div data-snippet-style-id='background' data-selector="section, section[data-snippet-id='parallax'], div[data-snippet-id='carousel'], div[data-snippet-id='slider']">
+    <div data-snippet-style-id='background'
+        data-selector="section, .carousel, .parallax">
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Background</a>
             <ul class="dropdown-menu">
@@ -951,6 +896,65 @@
         </li>
     </div>
 
+    <div data-snippet-style-id='carousel'
+        data-selector=".carousel">
+        <li class="divider"></li>
+        <li>
+            <a href="#" class="button js_add">Add Slide</a>
+        </li>
+        <li>
+            <a href="#" class="button js_remove">Remove Slide</a>
+        </li>
+    </div>
+
+    <div data-snippet-style-id='carousel-style'
+        data-selector="div[data-snippet-id='carousel']">
+        <li class="dropdown-submenu" data-required="true">
+            <a tabindex="-1" href="#">Layout</a>
+            <ul class="dropdown-menu">
+                <li data-class="text_only"><a>Text Only</a></li>
+                <li data-class="image_text"><a>Image - Text</a></li>
+                <li data-class="text_image"><a>Text - Image</a></li>
+            </ul>
+        </li>
+    </div>
+
+    <div data-snippet-style-id='margin-y'
+        data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr"
+        data-selector-children=".oe_structure, [data-oe-type=html]">
+    </div>
+
+    <div data-snippet-style-id='resize'
+        data-selector="section, .carousel, .parallax"
+        data-selector-children=".oe_structure, [data-oe-type=html]">
+    </div>
+
+    <div data-snippet-style-id='margin-x'
+        data-selector=".row > [class*='col-md-']"
+        data-selector-vertical-children='.row'>
+    </div>
+
+    <div data-snippet-style-id='content'
+        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-children=".content">
+    </div>
+
+    <div data-snippet-style-id='parallax'
+        data-selector=".parallax">
+        <li class="dropdown-submenu">
+            <a tabindex="-1" href="#">Scroll Speed</a>
+            <ul class="dropdown-menu" name="parallax-scroll">
+                <li data-value="0"><a>Static</a></li>
+                <li data-value="0.3"><a>Very Slow</a></li>
+                <li data-value="0.6"><a>Slow</a></li>
+                <li data-value="1"><a>Fixed</a></li>
+                <li data-value="1.4"><a>Fast</a></li>
+                <li data-value="1.7"><a>Very Fast</a></li>
+            </ul>
+        </li>
+    </div>
+
 </div>
 
     </div>

From 4a80c007e38cf27b8a2b3d2d2b28b1181448e749 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 13:19:45 +0100
Subject: [PATCH 02/56] [IMP] website: snippet selector

bzr revid: chm@openerp.com-20140303121945-d2ynze1vja5v0d7d
---
 .../static/src/js/website.snippets.editor.js  | 27 ++++++++++++++-----
 addons/website/views/snippets.xml             |  3 +--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index addd610e47b..891ebc079a8 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -356,9 +356,6 @@
                                 "data-selector-siblings, data-selector-children or data-selector-vertical-children tag for mutate action");
                             return;
                         }
-                        console.log(selector_siblings);
-                        console.log(selector_children);
-                        console.log(selector_vertical_children);
                         self.activate_insertion_zones({
                             siblings: selector_siblings.join(","),
                             children: selector_children.join(","),
@@ -1361,10 +1358,11 @@
             self.$overlay.addClass("hidden");
 
             self.BuildingBlock.activate_insertion_zones({
-                siblings: self.$el ? self.$el.data('selector-siblings') : false,
-                children:   self.$el ? self.$el.data('selector-children') : false,
-                vertical_children: self.$el ? self.$el.data('selector-vertical-children') : false,
+                siblings: self.selector_siblings,
+                children: self.selector_children,
+                vertical_children: self.selector_vertical_children,
             });
+            console.log(self);
 
             $("body").addClass('move-important');
 
@@ -1390,15 +1388,32 @@
             var $styles = this.$overlay.find('.oe_options');
             var $ul = $styles.find('ul:first');
             this.styles = {};
+            this.selector_siblings = [];
+            this.selector_children = [];
+            this.selector_vertical_children = [];
             _.each(website.snippet.styles, function (val) {
                 if (!self.$target.is(val.selector)) {
                     return;
                 }
+                if (val['selector-siblings']) self.selector_siblings.push(val['selector-siblings']);
+                if (val['selector-children']) self.selector_children.push(val['selector-children']);
+                if (val['selector-vertical-children']) self.selector_vertical_children.push(val['selector-vertical-children']);
+
                 var style = val['snippet-style-id'];
                 var Editor = website.snippet.styleRegistry[style] || website.snippet.StyleEditor;
                 var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
                 $ul.append(editor.$el.addClass("snippet-style-" + style));
             });
+            this.selector_siblings = this.selector_siblings.join(",");
+            if (this.selector_siblings === "")
+                this.selector_siblings = false;
+            this.selector_children = this.selector_children.join(",");
+            if (this.selector_children === "")
+                this.selector_children = false;
+            this.selector_vertical_children = this.selector_vertical_children.join(",");
+            if (this.selector_vertical_children === "")
+                this.selector_vertical_children = false;
+
 
             if ($ul.find("li").length) {
                 $styles.removeClass("hidden");
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 08520bb2397..88f1c7a50bd 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -920,8 +920,7 @@
     </div>
 
     <div data-snippet-style-id='margin-y'
-        data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr"
-        data-selector-children=".oe_structure, [data-oe-type=html]">
+        data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
     </div>
 
     <div data-snippet-style-id='resize'

From 68749a06831a3f3e22c75b8647ecfdafe99429c0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 15:20:17 +0100
Subject: [PATCH 03/56] [IMP] website: snippet: remove data-snippet-id and add
 auto resize on resising option

bzr revid: chm@openerp.com-20140303142017-jcb3401wpiuvbc1n
---
 addons/website/data/website_demo.xml          |   4 +-
 addons/website/static/src/css/snippets.css    |   5 -
 addons/website/static/src/css/snippets.sass   |   4 -
 addons/website/static/src/css/website.css     |   9 +-
 addons/website/static/src/css/website.sass    |   7 +-
 .../src/js/website.snippets.animation.js      |   5 +-
 .../static/src/js/website.snippets.editor.js  | 115 ++++++++----------
 .../static/src/js/website.tour.banner.js      |   2 +-
 addons/website/views/snippets.xml             |  23 ++--
 9 files changed, 76 insertions(+), 98 deletions(-)

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 8abf901fd89..63900506741 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -25,7 +25,7 @@
     <t t-set="additional_title">Partner Detail</t>
     <div id="wrap">
         <div class="oe_structure">
-            <section data-snippet-id="title">
+            <section>
                 <div class="container">
                     <div class="row">
                         <div class="col-md-12">
@@ -73,7 +73,7 @@ response = request.website.render("website.template_partner_post", values)
     <t t-set="additional_title">Partners</t>
     <div id="wrap">
         <div class="oe_structure">
-            <section data-snippet-id="title">
+            <section>
                 <div class="container">
                     <div class="row">
                         <div class="col-md-12">
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index fe9c18c0081..3f5373e57e4 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -608,8 +608,3 @@
   height: 16px;
   display: inline-block;
 }
-
-[data-snippet-id] {
-  min-height: 10px;
-  min-width: 10px;
-}
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index a06bba01dba..f9432b3749d 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -483,10 +483,6 @@
             height: 16px
             display: inline-block
 
-[data-snippet-id] 
-    min-height: 10px
-    min-width: 10px
-
 
 
 
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index e47b7a41baa..78262bc7dd4 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -280,12 +280,13 @@ ul.nav-stacked > li > a {
   background-size: 100%;
 }
 
-[data-snippet-id], .colmd, .hr, .blockquote {
+section, .carousel, .parallax, .row, .hr, .blockquote {
+  min-height: 30px;
   overflow: hidden;
 }
 
 @media (max-width: 400px) {
-  [data-snippet-id]:not([data-snippet-id="carousel"]) {
+  section, .parallax, .row, .hr, .blockquote {
     height: auto !important;
   }
 }
@@ -380,10 +381,10 @@ ul.nav-stacked > li > a {
 }
 
 /* Parallax Theme */
-div.carousel[data-snippet-id="slider"] .carousel-indicators li {
+div.carousel .carousel-indicators li {
   border: 1px solid grey;
 }
-div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
+div.carousel .carousel-indicators .active {
   background-color: grey;
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 3cdfe37a896..680f26cef07 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -230,11 +230,12 @@ ul.nav-stacked > li > a
 .oe_img_bg
     background-size: 100%
 
-[data-snippet-id],.colmd,.hr,.blockquote
+section, .carousel, .parallax, .row, .hr, .blockquote
+    min-height: 30px
     overflow: hidden
 
 @media (max-width: 400px)
-    [data-snippet-id]:not([data-snippet-id="carousel"])
+    section, .parallax, .row, .hr, .blockquote
         height: auto !important
 
 .carousel-inner
@@ -312,7 +313,7 @@ ul.nav-stacked > li > a
 
 /* Parallax Theme */
 
-div.carousel[data-snippet-id="slider"]
+div.carousel
     .carousel-indicators
         li
             border: 1px solid grey
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 01e4c5239cb..e07e58e59e7 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -8,9 +8,10 @@
     website.snippet.start_animation = function ($target) {
         for (var k in website.snippet.animationRegistry) {
             var Animation = website.snippet.animationRegistry[k];
-            var selector = "[data-snippet-id='"+k+"']";
+            var selector = "";
             if (Animation.prototype.selector) {
-                selector += ", " + Animation.prototype.selector;
+                if (selector != "") selector += ", " 
+                selector += Animation.prototype.selector;
             }
             if ($target) {
                 if ($target.is(selector)) selector = $target;
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 891ebc079a8..94035d27544 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -36,7 +36,6 @@
             // FIXME: call clean_for_save on all snippets of the page, not only modified ones
             // important for banner of parallax that changes data automatically.
             this.snippets.clean_for_save();
-            remove_added_snippet_id();
             this._super();
         },
     });
@@ -49,38 +48,13 @@
                 })) {
             return;
         }
-        hack_to_add_snippet_id()
-    });
-
-    // puts $el at the same absolute position as $target
-    function hack_to_add_snippet_id () {
-        _.each(website.snippet.selector, function (val) {
-            $(val[0]).each(function() {
-                if (!$(this).is("[data-snippet-id]") && $(this).parents("[data-oe-model]").length) {
-                    $(this).attr("data-snippet-id", val[1]);
-                }
-            });
-        });
-    }
-    function remove_added_snippet_id () {
-        _.each(website.snippet.selector, function (val) {
-            $(val[0]).each(function() {
-                if ($(this).data("snippet-id") === val[1]) {
-                    $(this).removeAttr("data-snippet-id");
-                }
-            });
-        });
-    }
-
-    $(document).ready(function() {
-        hack_to_add_snippet_id();
     });
 
     // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
     // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
 
     if (!website.snippet) website.snippet = {};
-    website.snippet.styles = {};
+    website.snippet.templateOptions = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
         template: 'website.snippets',
@@ -92,7 +66,6 @@
                 $("<div id='oe_manipulators'></div>").appendTo('body');
             }
             this.$active_snipped_id = false;
-            hack_to_add_snippet_id();
             this.snippets = [];
 
             observer.observe(document.body, {
@@ -159,12 +132,12 @@
                 .then(function (html) {
                     var $html = $(html);
 
-                    var $styles = $html.find("[data-snippet-style-id]");
+                    var $styles = $html.find("[data-snippet-option-id]");
                     $styles.each(function () {
                         var $style = $(this);
-                        var style_id = $style.data('snippet-style-id');
-                        website.snippet.styles[style_id] = {
-                            'snippet-style-id' : style_id,
+                        var style_id = $style.data('snippet-option-id');
+                        website.snippet.templateOptions[style_id] = {
+                            'snippet-option-id' : style_id,
                             'selector': $style.data('selector'),
                             '$el': $style,
                             'selector-siblings': $style.data('selector-siblings'),
@@ -223,8 +196,8 @@
                 }
                 snipped_event_flag = true;
                 var selector = [];
-                for (var k in website.snippet.styles) {
-                    selector.push(website.snippet.styles[k].selector);
+                for (var k in website.snippet.templateOptions) {
+                    selector.push(website.snippet.templateOptions[k].selector);
                 }
                 selector = selector.join(",");
 
@@ -336,15 +309,15 @@
                     var selector_siblings = [];
                     var selector_children = [];
                     var selector_vertical_children = [];
-                    for (var k in website.snippet.styles) {
-                        if ($toInsert.is(website.snippet.styles[k].selector)) {
-                            selector.push(website.snippet.styles[k].selector);
-                            if (website.snippet.styles[k]['selector-siblings'])
-                                selector_siblings.push(website.snippet.styles[k]['selector-siblings']);
-                            if (website.snippet.styles[k]['selector-children'])
-                                selector_children.push(website.snippet.styles[k]['selector-children']);
-                            if (website.snippet.styles[k]['selector-vertical-children'])
-                                selector_vertical_children.push(website.snippet.styles[k]['selector-vertical-children']);
+                    for (var k in website.snippet.templateOptions) {
+                        if ($toInsert.is(website.snippet.templateOptions[k].selector)) {
+                            selector.push(website.snippet.templateOptions[k].selector);
+                            if (website.snippet.templateOptions[k]['selector-siblings'])
+                                selector_siblings.push(website.snippet.templateOptions[k]['selector-siblings']);
+                            if (website.snippet.templateOptions[k]['selector-children'])
+                                selector_children.push(website.snippet.templateOptions[k]['selector-children']);
+                            if (website.snippet.templateOptions[k]['selector-vertical-children'])
+                                selector_vertical_children.push(website.snippet.templateOptions[k]['selector-vertical-children']);
                         }
                     }
 
@@ -418,8 +391,8 @@
                                 $target.data("snippet-editor").drop_and_build_snippet($target);
                             }
 
-                            for (var k in website.snippet.styles) {
-                                $target.find(website.snippet.styles[k].selector).each(function () {
+                            for (var k in website.snippet.templateOptions) {
+                                $target.find(website.snippet.templateOptions[k].selector).each(function () {
                                     var $snippet = $(this);
                                     self.create_overlay($snippet);
                                     if ($snippet.data("snippet-editor")) {
@@ -545,7 +518,7 @@
         // generate drop zones covering the elements selected by the selector
         // we generate overlay drop zones only to get an idea of where the snippet are, the drop
         activate_overlay_zones: function(selector){
-            var $targets = this.dom_filter(selector || '[data-snippet-id]');
+            var $targets = this.dom_filter(selector);
             var self = this;
 
             if (typeof selector !== 'string' && !$targets.length) {
@@ -590,18 +563,18 @@
     });
 
 
-    website.snippet.styleRegistry = {};
-    website.snippet.StyleEditor = openerp.Class.extend({
+    website.snippet.options = {};
+    website.snippet.Option = openerp.Class.extend({
         // initialisation (don't overwrite)
         init: function (BuildingBlock, $target, snippet_id) {
             this.BuildingBlock = BuildingBlock;
             this.$target = $target;
-            var styles = this.$target.data("snippet-style-ids") || {};
+            var styles = this.$target.data("snippet-option-ids") || {};
             styles[snippet_id] = this;
-            this.$target.data("snippet-style-ids", styles);
+            this.$target.data("snippet-option-ids", styles);
             this.$overlay = this.$target.data('overlay');
-            this['snippet-style-id'] = snippet_id;
-            this.$el = website.snippet.styles[snippet_id].$el.find(">li").clone();
+            this['snippet-option-id'] = snippet_id;
+            this.$el = website.snippet.templateOptions[snippet_id].$el.find(">li").clone();
 
             this.required = this.$el.data("required");
 
@@ -717,7 +690,7 @@
         }
     });
 
-    website.snippet.styleRegistry.background = website.snippet.StyleEditor.extend({
+    website.snippet.options.background = website.snippet.Option.extend({
         _get_bg: function () {
             return this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
         },
@@ -782,7 +755,7 @@
             this.$el.find('li:has(li[data-class].active)').addClass("active");
         }
     });
-    website.snippet.styleRegistry.slider = website.snippet.StyleEditor.extend({
+    website.snippet.options.slider = website.snippet.Option.extend({
         drop_and_build_snippet: function() {
             var id = $(".carousel").length;
             this.id = "myCarousel" + id;
@@ -869,7 +842,7 @@
             }
         },
     });
-    website.snippet.styleRegistry.carousel = website.snippet.styleRegistry.slider.extend({
+    website.snippet.options.carousel = website.snippet.options.slider.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
@@ -895,8 +868,8 @@
             };
             this.$target.on('snippet-style-change snippet-style-preview', function (event, style, np) {
                 var $active = self.$target.find(".item.active");
-                if (style['snippet-style-id'] === "size") return;
-                if (style['snippet-style-id'] === "background") {
+                if (style['snippet-option-id'] === "size") return;
+                if (style['snippet-option-id'] === "background") {
                     $active.css("background-image", self.$target.css("background-image"));
                 }
                 if (np.$prev) {
@@ -923,7 +896,7 @@
             var $clone = this._super();
 
             // choose an other background
-            var bg = this.$target.data("snippet-style-ids").background;
+            var bg = this.$target.data("snippet-option-ids").background;
             if (!bg) return $clone;
 
             var $styles = bg.$el.find("li[data-class]:not(.oe_custom_bg)");
@@ -946,7 +919,7 @@
         },
     });
 
-    website.snippet.styleRegistry.resize = website.snippet.StyleEditor.extend({
+    website.snippet.options.marginAndResize = website.snippet.Option.extend({
         start: function () {
             var self = this;
             this._super();
@@ -1111,7 +1084,7 @@
             this.change_cursor();
         }
     });
-    website.snippet.styleRegistry["margin-y"] = website.snippet.styleRegistry.resize.extend({
+    website.snippet.options["margin-y"] = website.snippet.options.marginAndResize.extend({
         getSize: function () {
             this.grid = this._super();
             var grid = [0,4,8,16,32,48,64,92,128];
@@ -1125,7 +1098,7 @@
             return this.grid;
         },
     });
-    website.snippet.styleRegistry["margin-x"] = website.snippet.styleRegistry.resize.extend({
+    website.snippet.options["margin-x"] = website.snippet.options.marginAndResize.extend({
         getSize: function () {
             this.grid = this._super();
             var width = this.$target.parents(".row:first").first().outerWidth();
@@ -1223,15 +1196,24 @@
             this._super(compass, beginClass, current);
         },
     });
-    website.snippet.styleRegistry["resize"] = website.snippet.styleRegistry.resize.extend({
+    website.snippet.options["resize"] = website.snippet.options.marginAndResize.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
             return this.grid;
         },
+        start: function () {
+            var self = this;
+            this._super();
+            this.$el.find(".js_size_auto").on('click', function (event){
+                self.$target.css("height", "");
+                self.BuildingBlock.cover_target(self.$overlay, self.$target);
+                return false;
+            });
+        },
     });
 
-    website.snippet.styleRegistry.parallax = website.snippet.StyleEditor.extend({
+    website.snippet.options.parallax = website.snippet.Option.extend({
         getSize: function () {
             this.grid = this._super();
             this.grid.size = 8;
@@ -1362,7 +1344,6 @@
                 children: self.selector_children,
                 vertical_children: self.selector_vertical_children,
             });
-            console.log(self);
 
             $("body").addClass('move-important');
 
@@ -1391,7 +1372,7 @@
             this.selector_siblings = [];
             this.selector_children = [];
             this.selector_vertical_children = [];
-            _.each(website.snippet.styles, function (val) {
+            _.each(website.snippet.templateOptions, function (val) {
                 if (!self.$target.is(val.selector)) {
                     return;
                 }
@@ -1399,8 +1380,8 @@
                 if (val['selector-children']) self.selector_children.push(val['selector-children']);
                 if (val['selector-vertical-children']) self.selector_vertical_children.push(val['selector-vertical-children']);
 
-                var style = val['snippet-style-id'];
-                var Editor = website.snippet.styleRegistry[style] || website.snippet.StyleEditor;
+                var style = val['snippet-option-id'];
+                var Editor = website.snippet.options[style] || website.snippet.Option;
                 var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
                 $ul.append(editor.$el.addClass("snippet-style-" + style));
             });
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 1d4a0c0f752..97568e37f35 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -47,7 +47,7 @@
                 },
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
-                    element:   '#wrap [data-snippet-id=carousel]:first .carousel-caption',
+                    element:   '#wrap .carousel:first .carousel-caption',
                     placement: 'top',
                     title:     _("Customize banner's text"),
                     content:   _("Click in the text and start editing it."),
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 88f1c7a50bd..e9cb694a358 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -827,9 +827,9 @@
 
 </div>
 
-<div id="snippet_styles" class="hidden">
+<div id="snippet_options" class="hidden">
 
-    <div data-snippet-style-id='blog-style'
+    <div data-snippet-option-id='blog-style'
         data-selector="section:not(.carousel):not(.parallax)">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Style</a>
@@ -839,7 +839,7 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='background'
+    <div data-snippet-option-id='background'
         data-selector="section, .carousel, .parallax">
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Background</a>
@@ -896,7 +896,7 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='carousel'
+    <div data-snippet-option-id='carousel'
         data-selector=".carousel">
         <li class="divider"></li>
         <li>
@@ -907,7 +907,7 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='carousel-style'
+    <div data-snippet-option-id='carousel-style'
         data-selector="div[data-snippet-id='carousel']">
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Layout</a>
@@ -919,27 +919,30 @@
         </li>
     </div>
 
-    <div data-snippet-style-id='margin-y'
+    <div data-snippet-option-id='margin-y'
         data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
     </div>
 
-    <div data-snippet-style-id='resize'
+    <div data-snippet-option-id='resize'
         data-selector="section, .carousel, .parallax"
         data-selector-children=".oe_structure, [data-oe-type=html]">
+        <li>
+            <a href="#" class="button js_size_auto">Size Automatic</a>
+        </li>
     </div>
 
-    <div data-snippet-style-id='margin-x'
+    <div data-snippet-option-id='margin-x'
         data-selector=".row > [class*='col-md-']"
         data-selector-vertical-children='.row'>
     </div>
 
-    <div data-snippet-style-id='content'
+    <div data-snippet-option-id='content'
         data-selector="p, h1, h2, h3, blockquote, .well, .panel"
         data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
         data-selector-children=".content">
     </div>
 
-    <div data-snippet-style-id='parallax'
+    <div data-snippet-option-id='parallax'
         data-selector=".parallax">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#">Scroll Speed</a>

From ab80456fe7f61ea3e15d41c8a222800c4970b103 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Mon, 3 Mar 2014 17:08:05 +0100
Subject: [PATCH 04/56] [IMP] openerp/service/db.py: lint file

bzr revid: chs@openerp.com-20140303160805-ywbtw04jd3022jcv
---
 openerp/service/db.py | 58 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/openerp/service/db.py b/openerp/service/db.py
index f48a1e6e91b..1502abb013d 100644
--- a/openerp/service/db.py
+++ b/openerp/service/db.py
@@ -6,7 +6,7 @@ import logging
 import os
 import threading
 import traceback
-from contextlib import contextmanager, closing
+from contextlib import closing
 
 import openerp
 from openerp import SUPERUSER_ID
@@ -28,7 +28,8 @@ def _initialize_db(id, db_name, demo, lang, user_password):
         self_actions[id]['progress'] = 0
         db = openerp.sql_db.db_connect(db_name)
         with closing(db.cursor()) as cr:
-            openerp.modules.db.initialize(cr) # TODO this should be removed as it is done by RegistryManager.new().
+            # TODO this should be removed as it is done by RegistryManager.new().
+            openerp.modules.db.initialize(cr)
             openerp.tools.config['lang'] = lang
             cr.commit()
 
@@ -55,14 +56,13 @@ def _initialize_db(id, db_name, demo, lang, user_password):
         self_actions[id]['traceback'] = traceback.format_exc()
 
 def dispatch(method, params):
-    if method in [ 'create', 'get_progress', 'drop', 'dump',
-        'restore', 'rename',
-        'change_admin_password', 'migrate_databases',
-        'create_database', 'duplicate_database' ]:
+    if method in ['create', 'get_progress', 'drop', 'dump', 'restore', 'rename',
+                  'change_admin_password', 'migrate_databases',
+                  'create_database', 'duplicate_database']:
         passwd = params[0]
         params = params[1:]
         security.check_super(passwd)
-    elif method in [ 'db_exist', 'list', 'list_lang', 'server_version' ]:
+    elif method in ['db_exist', 'list', 'list_lang', 'server_version']:
         # params = params
         # No security check for these methods
         pass
@@ -78,9 +78,9 @@ def _create_empty_database(name):
         cr.execute("SELECT datname FROM pg_database WHERE datname = %s",
                    (name,))
         if cr.fetchall():
-            raise openerp.exceptions.Warning(" %s database already exists!" % name )
+            raise openerp.exceptions.Warning("database %r already exists!" % (name,))
         else:
-            cr.autocommit(True) # avoid transaction block
+            cr.autocommit(True)     # avoid transaction block
             cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "%s" """ % (name, chosen_template))
 
 def exp_create(db_name, demo, lang, user_password='admin'):
@@ -96,7 +96,7 @@ def exp_create(db_name, demo, lang, user_password='admin'):
 
     _logger.info('CREATE DATABASE %s', db_name.lower())
     create_thread = threading.Thread(target=_initialize_db,
-            args=(id, db_name, demo, lang, user_password))
+                                     args=(id, db_name, demo, lang, user_password))
     create_thread.start()
     self_actions[id]['thread'] = create_thread
     return id
@@ -121,14 +121,14 @@ def exp_duplicate_database(db_original_name, db_name):
     openerp.sql_db.close_db(db_original_name)
     db = openerp.sql_db.db_connect('postgres')
     with closing(db.cursor()) as cr:
-        cr.autocommit(True) # avoid transaction block
+        cr.autocommit(True)     # avoid transaction block
         cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "%s" """ % (db_name, db_original_name))
     return True
 
 def exp_get_progress(id):
     if self_actions[id]['thread'].isAlive():
 #       return openerp.modules.init_progress[db_name]
-        return min(self_actions[id].get('progress', 0),0.95), []
+        return min(self_actions[id].get('progress', 0), 0.95), []
     else:
         clean = self_actions[id]['clean']
         if clean:
@@ -140,9 +140,8 @@ def exp_get_progress(id):
             self_actions.pop(id)
             return 1.0, users
         else:
-            e = self_actions[id]['exception'] # TODO this seems wrong: actions[id]['traceback'] is set, but not 'exception'.
-            self_actions.pop(id)
-            raise Exception, e
+            a = self_actions.pop(id)
+            raise Exception, a['exception'], a['traceback']     # flake8: noqa
 
 def exp_drop(db_name):
     if db_name not in exp_list(True):
@@ -152,18 +151,17 @@ def exp_drop(db_name):
 
     db = openerp.sql_db.db_connect('postgres')
     with closing(db.cursor()) as cr:
-        cr.autocommit(True) # avoid transaction block
+        cr.autocommit(True)     # avoid transaction block
         # Try to terminate all other connections that might prevent
         # dropping the database
         try:
-
             # PostgreSQL 9.2 renamed pg_stat_activity.procpid to pid:
             # http://www.postgresql.org/docs/9.2/static/release-9-2.html#AEN110389
             pid_col = 'pid' if cr._cnx.server_version >= 90200 else 'procpid'
 
             cr.execute("""SELECT pg_terminate_backend(%(pid_col)s)
                           FROM pg_stat_activity
-                          WHERE datname = %%s AND 
+                          WHERE datname = %%s AND
                                 %(pid_col)s != pg_backend_pid()""" % {'pid_col': pid_col},
                        (db_name,))
         except Exception:
@@ -190,7 +188,7 @@ def _set_pg_password_in_environment():
     set, and removing it afterwards.
 
     See also http://www.postgresql.org/docs/8.4/static/libpq-envars.html
-    
+
     .. note:: This is not thread-safe, and should never be enabled for
          SaaS (giving SaaS users the super-admin password is not a good idea
          anyway)
@@ -222,11 +220,11 @@ def exp_dump(db_name):
         res = stdout.close()
 
         if not data or res:
-            _logger.error(
-                    'DUMP DB: %s failed! Please verify the configuration of the database password on the server. '
-                    'You may need to create a .pgpass file for authentication, or specify `db_password` in the '
-                    'server configuration file.\n %s', db_name, data)
-            raise Exception, "Couldn't dump database"
+            _logger.error('DUMP DB: %s failed! Please verify the configuration of the database '
+                          'password on the server. You may need to create a .pgpass file for '
+                          'authentication, or specify `db_password` in the server configuration '
+                          'file.\n %s', db_name, data)
+            raise Exception("Couldn't dump database")
         _logger.info('DUMP DB successful: %s', db_name)
 
         return base64.encodestring(data)
@@ -235,7 +233,7 @@ def exp_restore(db_name, data):
     with _set_pg_password_in_environment():
         if exp_db_exist(db_name):
             _logger.warning('RESTORE DB: %s already exists', db_name)
-            raise Exception, "Database already exists"
+            raise Exception("Database already exists")
 
         _create_empty_database(db_name)
 
@@ -249,20 +247,20 @@ def exp_restore(db_name, data):
         cmd.append('--dbname=' + db_name)
         args2 = tuple(cmd)
 
-        buf=base64.decodestring(data)
+        buf = base64.decodestring(data)
         if os.name == "nt":
             tmpfile = (os.environ['TMP'] or 'C:\\') + os.tmpnam()
             file(tmpfile, 'wb').write(buf)
-            args2=list(args2)
+            args2 = list(args2)
             args2.append(tmpfile)
-            args2=tuple(args2)
+            args2 = tuple(args2)
         stdin, stdout = openerp.tools.exec_pg_command_pipe(*args2)
         if not os.name == "nt":
             stdin.write(base64.decodestring(data))
         stdin.close()
         res = stdout.close()
         if res:
-            raise Exception, "Couldn't restore database"
+            raise Exception("Couldn't restore database")
         _logger.info('RESTORE DB: %s', db_name)
 
         return True
@@ -273,7 +271,7 @@ def exp_rename(old_name, new_name):
 
     db = openerp.sql_db.db_connect('postgres')
     with closing(db.cursor()) as cr:
-        cr.autocommit(True) # avoid transaction block
+        cr.autocommit(True)     # avoid transaction block
         try:
             cr.execute('ALTER DATABASE "%s" RENAME TO "%s"' % (old_name, new_name))
             _logger.info('RENAME DB: %s -> %s', old_name, new_name)

From 447d597815411a92f22b5dcf56a69e2ecb16129c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 4 Mar 2014 18:56:56 +0100
Subject: [PATCH 05/56] [IMP] new backup format.

The new backup format is a zip containing the sql dump of the
database and the filestore of this database.

Old backups can still be restored

bzr revid: chs@openerp.com-20140304175656-iu3un6q43ttnhjfz
---
 openerp/service/db.py   | 163 ++++++++++++++++++++++++++--------------
 openerp/tools/osutil.py |  28 +++++++
 2 files changed, 135 insertions(+), 56 deletions(-)

diff --git a/openerp/service/db.py b/openerp/service/db.py
index 1502abb013d..f10f39aab9b 100644
--- a/openerp/service/db.py
+++ b/openerp/service/db.py
@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
-
-import base64
-import contextlib
+from contextlib import closing
+from functools import wraps
 import logging
 import os
+import shutil
 import threading
 import traceback
-from contextlib import closing
+import tempfile
+import zipfile
+
+import psycopg2
 
 import openerp
 from openerp import SUPERUSER_ID
@@ -141,7 +144,8 @@ def exp_get_progress(id):
             return 1.0, users
         else:
             a = self_actions.pop(id)
-            raise Exception, a['exception'], a['traceback']     # flake8: noqa
+            exc, tb = a['exception'], a['traceback']
+            raise Exception, exc, tb
 
 def exp_drop(db_name):
     if db_name not in exp_list(True):
@@ -176,14 +180,13 @@ def exp_drop(db_name):
             _logger.info('DROP DB: %s', db_name)
     return True
 
-@contextlib.contextmanager
-def _set_pg_password_in_environment():
+def _set_pg_password_in_environment(func):
     """ On systems where pg_restore/pg_dump require an explicit
     password (i.e. when not connecting via unix sockets, and most
     importantly on Windows), it is necessary to pass the PG user
     password in the environment or in a special .pgpass file.
 
-    This context management method handles setting
+    This decorator handles setting
     :envvar:`PGPASSWORD` if it is not already
     set, and removing it afterwards.
 
@@ -193,77 +196,124 @@ def _set_pg_password_in_environment():
          SaaS (giving SaaS users the super-admin password is not a good idea
          anyway)
     """
-    if os.environ.get('PGPASSWORD') or not openerp.tools.config['db_password']:
-        yield
-    else:
-        os.environ['PGPASSWORD'] = openerp.tools.config['db_password']
-        try:
-            yield
-        finally:
-            del os.environ['PGPASSWORD']
-
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        if os.environ.get('PGPASSWORD') or not openerp.tools.config['db_password']:
+            return func(*args, **kwargs)
+        else:
+            os.environ['PGPASSWORD'] = openerp.tools.config['db_password']
+            try:
+                return func(*args, **kwargs)
+            finally:
+                del os.environ['PGPASSWORD']
+    return wrapper
 
 def exp_dump(db_name):
-    with _set_pg_password_in_environment():
-        cmd = ['pg_dump', '--format=c', '--no-owner']
+    with tempfile.TemporaryFile() as t:
+        dump_db(db_name, t)
+        t.seek(0)
+        return t.read().encode('base64')
+
+@_set_pg_password_in_environment
+def dump_db(db, stream):
+    """Dump database `db` into file-like object `stream`"""
+    with openerp.tools.osutil.tempdir() as dump_dir:
+        registry = openerp.modules.registry.RegistryManager.get(db)
+        with registry.cursor() as cr:
+            filestore = registry['ir.attachment']._filestore(cr, SUPERUSER_ID)
+            if os.path.exists(filestore):
+                shutil.copytree(filestore, os.path.join(dump_dir, 'filestore'))
+
+        dump_file = os.path.join(dump_dir, 'dump.sql')
+        cmd = ['pg_dump', '--format=p', '--no-owner', '--file=' + dump_file]
         if openerp.tools.config['db_user']:
             cmd.append('--username=' + openerp.tools.config['db_user'])
         if openerp.tools.config['db_host']:
             cmd.append('--host=' + openerp.tools.config['db_host'])
         if openerp.tools.config['db_port']:
             cmd.append('--port=' + str(openerp.tools.config['db_port']))
-        cmd.append(db_name)
+        cmd.append(db)
 
-        stdin, stdout = openerp.tools.exec_pg_command_pipe(*tuple(cmd))
-        stdin.close()
-        data = stdout.read()
-        res = stdout.close()
-
-        if not data or res:
+        if openerp.tools.exec_pg_command(*cmd):
             _logger.error('DUMP DB: %s failed! Please verify the configuration of the database '
                           'password on the server. You may need to create a .pgpass file for '
                           'authentication, or specify `db_password` in the server configuration '
-                          'file.\n %s', db_name, data)
+                          'file.', db)
             raise Exception("Couldn't dump database")
-        _logger.info('DUMP DB successful: %s', db_name)
 
-        return base64.encodestring(data)
+        openerp.tools.osutil.zip_dir(dump_dir, stream, include_dir=False)
 
-def exp_restore(db_name, data):
-    with _set_pg_password_in_environment():
-        if exp_db_exist(db_name):
-            _logger.warning('RESTORE DB: %s already exists', db_name)
-            raise Exception("Database already exists")
+    _logger.info('DUMP DB successful: %s', db)
 
-        _create_empty_database(db_name)
+def exp_restore(db_name, data, copy=False):
+    data_file = tempfile.NamedTemporaryFile(delete=False)
+    try:
+        data_file.write(data.decode('base64'))
+        data_file.close()
+        restore_db(db_name, data_file.name, copy=copy)
+    finally:
+        os.unlink(data_file.name)
+    return True
 
-        cmd = ['pg_restore', '--no-owner']
+@_set_pg_password_in_environment
+def restore_db(db, dump_file, copy=False):
+    assert isinstance(db, basestring)
+    if exp_db_exist(db):
+        _logger.warning('RESTORE DB: %s already exists', db)
+        raise Exception("Database already exists")
+
+    _create_empty_database(db)
+
+    filestore_path = None
+    with openerp.tools.osutil.tempdir() as dump_dir:
+        if zipfile.is_zipfile(dump_file):
+            # v8 format
+            with zipfile.ZipFile(dump_file, 'r') as z:
+                # only extract known members!
+                filestore = [m for m in z.namelist() if m.startswith('filestore/')]
+                z.extractall(dump_dir, ['dump.sql'] + filestore)
+
+                if filestore:
+                    filestore_path = os.path.join(dump_dir, 'filestore')
+
+            pg_cmd = 'psql'
+            pg_args = ['-q', '-f', os.path.join(dump_dir, 'dump.sql')]
+
+        else:
+            # <= 7.0 format (raw pg_dump output)
+            pg_cmd = 'pg_restore'
+            pg_args = ['--no-owner', dump_file]
+
+        args = []
         if openerp.tools.config['db_user']:
-            cmd.append('--username=' + openerp.tools.config['db_user'])
+            args.append('--username=' + openerp.tools.config['db_user'])
         if openerp.tools.config['db_host']:
-            cmd.append('--host=' + openerp.tools.config['db_host'])
+            args.append('--host=' + openerp.tools.config['db_host'])
         if openerp.tools.config['db_port']:
-            cmd.append('--port=' + str(openerp.tools.config['db_port']))
-        cmd.append('--dbname=' + db_name)
-        args2 = tuple(cmd)
+            args.append('--port=' + str(openerp.tools.config['db_port']))
+        args.append('--dbname=' + db)
+        pg_args = args + pg_args
 
-        buf = base64.decodestring(data)
-        if os.name == "nt":
-            tmpfile = (os.environ['TMP'] or 'C:\\') + os.tmpnam()
-            file(tmpfile, 'wb').write(buf)
-            args2 = list(args2)
-            args2.append(tmpfile)
-            args2 = tuple(args2)
-        stdin, stdout = openerp.tools.exec_pg_command_pipe(*args2)
-        if not os.name == "nt":
-            stdin.write(base64.decodestring(data))
-        stdin.close()
-        res = stdout.close()
-        if res:
+        if openerp.tools.exec_pg_command(pg_cmd, *pg_args):
             raise Exception("Couldn't restore database")
-        _logger.info('RESTORE DB: %s', db_name)
 
-        return True
+        registry = openerp.modules.registry.RegistryManager.new(db)
+        with registry.cursor() as cr:
+            if copy:
+                # if it's a copy of a database, force generation of a new dbuuid
+                registry['ir.config_parameter'].init(cr, force=True)
+            if filestore_path:
+                filestore_dest = registry['ir.attachment']._filestore(cr, SUPERUSER_ID)
+                shutil.move(filestore_path, filestore_dest)
+
+            if openerp.tools.config['unaccent']:
+                try:
+                    with cr.savepoint():
+                        cr.execute("CREATE EXTENSION unaccent")
+                except psycopg2.Error:
+                    pass
+
+    _logger.info('RESTORE DB: %s', db)
 
 def exp_rename(old_name, new_name):
     openerp.modules.registry.RegistryManager.delete(old_name)
@@ -280,6 +330,7 @@ def exp_rename(old_name, new_name):
             raise Exception("Couldn't rename database %s to %s: %s" % (old_name, new_name, e))
     return True
 
+@openerp.tools.mute_logger('openerp.sql_db')
 def exp_db_exist(db_name):
     ## Not True: in fact, check if connection to database is possible. The database may exists
     return bool(openerp.sql_db.db_connect(db_name))
diff --git a/openerp/tools/osutil.py b/openerp/tools/osutil.py
index b5cff6b2646..94684d34673 100644
--- a/openerp/tools/osutil.py
+++ b/openerp/tools/osutil.py
@@ -23,8 +23,12 @@
 Some functions related to the os and os.path module
 """
 
+from contextlib import contextmanager
 import os
 from os.path import join as opj
+import shutil
+import tempfile
+import zipfile
 
 if os.name == 'nt':
     import ctypes
@@ -61,6 +65,30 @@ def walksymlinks(top, topdown=True, onerror=None):
         if not topdown:
             yield dirpath, dirnames, filenames
 
+@contextmanager
+def tempdir():
+    tmpdir = tempfile.mkdtemp()
+    try:
+        yield tmpdir
+    finally:
+        shutil.rmtree(tmpdir)
+
+def zip_dir(path, stream, include_dir=True):      # TODO add ignore list
+    path = os.path.normpath(path)
+    len_prefix = len(os.path.dirname(path)) if include_dir else len(path)
+    if len_prefix:
+        len_prefix += 1
+
+    with zipfile.ZipFile(stream, 'w', compression=zipfile.ZIP_DEFLATED, allowZip64=True) as zipf:
+        for dirpath, dirnames, filenames in os.walk(path):
+            for fname in filenames:
+                bname, ext = os.path.splitext(fname)
+                ext = ext or bname
+                if ext not in ['.pyc', '.pyo', '.swp', '.DS_Store']:
+                    path = os.path.normpath(os.path.join(dirpath, fname))
+                    if os.path.isfile(path):
+                        zipf.write(path, path[len_prefix:])
+
 
 if os.name != 'nt':
     getppid = os.getppid

From 2ab0441ec2778be349bc312f967a60a9d06bce48 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Mar 2014 12:41:10 +0100
Subject: [PATCH 06/56] [FIX] auth_oauth: reset openerp oauth client_id when
 generating new dbuuid

bzr revid: chs@openerp.com-20140305114110-ym3c0x3muc34ep7b
---
 addons/auth_oauth/__init__.py           |  1 +
 addons/auth_oauth/ir_configparameter.py | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 addons/auth_oauth/ir_configparameter.py

diff --git a/addons/auth_oauth/__init__.py b/addons/auth_oauth/__init__.py
index a56db75633b..08c1dd3d6b5 100644
--- a/addons/auth_oauth/__init__.py
+++ b/addons/auth_oauth/__init__.py
@@ -2,3 +2,4 @@ import controllers
 import auth_oauth
 import res_users
 import res_config
+import ir_configparameter
diff --git a/addons/auth_oauth/ir_configparameter.py b/addons/auth_oauth/ir_configparameter.py
new file mode 100644
index 00000000000..b0fa17ffa5b
--- /dev/null
+++ b/addons/auth_oauth/ir_configparameter.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+from openerp import SUPERUSER_ID
+from openerp.osv import osv
+
+class ir_configparameter(osv.Model):
+    _inherit = 'ir.config_parameter'
+
+    def init(self, cr, force=False):
+        super(ir_configparameter, self).init(cr, force=force)
+        if force:
+            IMD = self.pool['ir.model.data']
+            oauth_oe = IMD.xmlid_to_object(cr, SUPERUSER_ID, 'auth_oauth.provider_openerp')
+            dbuuid = self.get_param(cr, SUPERUSER_ID, 'database.uuid')
+            oauth_oe.write({'client_id': dbuuid})

From 5d95027f0a4fe030651ccf9bb3c02c097135fd28 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Mar 2014 13:44:44 +0100
Subject: [PATCH 07/56] [IMP] web: database manager: restore copy database

bzr revid: chs@openerp.com-20140305124444-1jzxmffrm7502t4e
---
 addons/web/controllers/main.py     |  5 +++--
 addons/web/static/src/xml/base.xml | 15 +++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index a9f56a2099c..8cae08eb3d2 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -930,10 +930,11 @@ class Database(http.Controller):
             return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
 
     @http.route('/web/database/restore', type='http', auth="none")
-    def restore(self, db_file, restore_pwd, new_db):
+    def restore(self, db_file, restore_pwd, new_db, mode):
         try:
+            copy = mode == 'copy'
             data = base64.b64encode(db_file.read())
-            request.session.proxy("db").restore(restore_pwd, new_db, data)
+            request.session.proxy("db").restore(restore_pwd, new_db, data, copy)
             return ''
         except openerp.exceptions.AccessDenied, e:
             raise Exception("AccessDenied")
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 80b82c1f40b..7ba06b69095 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -231,17 +231,24 @@
                 </div>
                 <table align="center" class="db_option_table">
                     <tr>
-                        <td><label for="restore_db">File:</label></td>
-                        <td><input type="file" name="db_file" class="required" autofocus="autofocus"/></td>
+                        <td><label for="restore_pwd">Master Password:</label></td>
+                        <td><input type="password" name="restore_pwd" class="required" autofocus="autofocus"/></td>
                     </tr>
                     <tr>
-                        <td><label for="restore_pwd">Master Password:</label></td>
-                        <td><input type="password" name="restore_pwd" class="required"/></td>
+                        <td><label for="restore_db">File:</label></td>
+                        <td><input type="file" name="db_file" class="required"/></td>
                     </tr>
                     <tr>
                         <td><label for="new_db">New database name:</label></td>
                         <td><input type="text" name="new_db" class="required"/></td>
                     </tr>
+                    <tr>
+                        <td><label for="mode">Mode:</label></td>
+                        <td><select name="mode" class="required">
+                            <option value="restore">Backup Restore</option>
+                            <option value="copy">Copy of an existing database</option>
+                        </select></td>
+                    </tr>
                 </table>
             </form>
             <form id="db_change_password" name="change_pwd_form" style="display: none;">

From 7cf77276fbad07f9757255bf08adc927f80e0036 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 5 Mar 2014 18:54:11 +0100
Subject: [PATCH 08/56] [IMP] website snippet: add Configurable follow snippet

bzr revid: chm@openerp.com-20140305175411-in3oodk778dxvu0k
---
 addons/website/static/src/css/snippets.css    |  2 +-
 addons/website/static/src/css/snippets.sass   |  2 +-
 addons/website/static/src/js/website.js       |  2 +
 .../static/src/js/website.snippets.editor.js  | 13 +++++-
 addons/website_mail/models/__init__.py        |  1 +
 addons/website_mail/views/snippets.xml        | 45 +++++++++++++++++++
 addons/website_mail/views/website_mail.xml    |  1 +
 7 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 3f5373e57e4..4baa2b06f2d 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -342,7 +342,7 @@
   position: absolute;
   width: 100%;
   text-align: center;
-  top: -11px;
+  top: -20px;
   z-index: 1002;
 }
 .oe_overlay .oe_overlay_options .btn, .oe_overlay .oe_overlay_options a {
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index f9432b3749d..1be99e27f19 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -258,7 +258,7 @@
         position: absolute
         width: 100%
         text-align: center
-        top: -11px
+        top: -20px
         z-index: 1002
         .btn, a
             pointer-events: auto
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 671dfc14ee9..b99004243a2 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -229,11 +229,13 @@
             dialog.on('click', '.btn-primary', function () {
                 def.resolve(field.val(), field, dialog);
                 dialog.remove();
+                $('.modal-backdrop').remove();
             });
         });
         dialog.on('hidden.bs.modal', function () {
             def.reject();
             dialog.remove();
+            $('.modal-backdrop').remove();
         });
         if (field.is('input[type="text"], select')) {
             field.keypress(function (e) {
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 94035d27544..b9b697f99a1 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -566,8 +566,9 @@
     website.snippet.options = {};
     website.snippet.Option = openerp.Class.extend({
         // initialisation (don't overwrite)
-        init: function (BuildingBlock, $target, snippet_id) {
+        init: function (BuildingBlock, editor, $target, snippet_id) {
             this.BuildingBlock = BuildingBlock;
+            this.editor = editor;
             this.$target = $target;
             var styles = this.$target.data("snippet-option-ids") || {};
             styles[snippet_id] = this;
@@ -687,6 +688,11 @@
                 .first()
                 .addClass("active");
             this.$el.find('li:has(li[data-class].active)').addClass("active");
+        },
+        /* clean_for_save
+        *  function called just before save vue
+        */
+        clean_for_save: function () {
         }
     });
 
@@ -1382,7 +1388,7 @@
 
                 var style = val['snippet-option-id'];
                 var Editor = website.snippet.options[style] || website.snippet.Option;
-                var editor = self.styles[style] = new Editor(self.BuildingBlock, self.$target, style);
+                var editor = self.styles[style] = new Editor(self.BuildingBlock, self, self.$target, style);
                 $ul.append(editor.$el.addClass("snippet-style-" + style));
             });
             this.selector_siblings = this.selector_siblings.join(",");
@@ -1473,6 +1479,9 @@
         *  function called just before save vue
         */
         clean_for_save: function () {
+            for (var i in this.styles){
+                this.styles[i].clean_for_save();
+            }
             this.$target.removeAttr('contentEditable')
                 .find('*').removeAttr('contentEditable');
             this.$target.removeAttr('attributeEditable')
diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
index e60de014149..fd8997c645f 100644
--- a/addons/website_mail/models/__init__.py
+++ b/addons/website_mail/models/__init__.py
@@ -1,3 +1,4 @@
 import mail_message
 import mail_thread
 import email_template
+import website
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 35932f6f7c3..3a1f8ab07bf 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -491,5 +491,50 @@
     </div>
 
 </template>
+
+
+<template id="subscribe" inherit_id="website.snippets" name="Snippet Subscribe">
+
+    <xpath expr="//div[@id='snippet_content']" position="inside">
+        <div>
+            <div class="oe_snippet_thumbnail">
+                <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
+                <span class="oe_snippet_thumbnail_title">Subscribe Button</span>
+            </div>
+
+            <div class="oe_snippet_body input-group js_follow"
+                      data-id="0"
+                      data-object="mail.group"
+                      data-follow="off">
+                <input
+                      type="email"
+                      name="email"
+                      class="js_follow_email form-control"
+                      t-att-value="email or ''"
+                      placeholder="your email..."/>
+                <span class="input-group-btn">
+                    <button href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</button>
+                    <button href="#" class="btn btn-primary js_follow_btn">Subscribe</button>
+                </span>
+                <div class="alert alert-success hidden">Thanks for your subscription!</div>
+            </div>
+
+        </div>
+    </xpath>
+
+
+    <xpath expr="//div[@id='snippet_options']" position="inside">
+        <div data-snippet-option-id='subscribe'
+            data-selector=".js_follow"
+            data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+            data-selector-children=".content">
+            <li>
+                <a href="#" class="button js_mailing_list">Select a mailing list</a>
+            </li>
+        </div>
+    </xpath>
+
+</template>
+
 </data>
 </openerp>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index e7a17c8f3db..4f128248bac 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -22,6 +22,7 @@
 
 <template id="head" inherit_id="website.layout" name="Mail customization">
     <xpath expr="//head" position="inside">
+        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js" groups="base.group_website_publisher"></script>
         <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>

From 58a5f907584d4f06f19362b21aae6bd3816abe79 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 14:02:40 +0100
Subject: [PATCH 09/56] [IMP] website: dynamic website_mail snippet with js

bzr revid: chm@openerp.com-20140306130240-cpsd5mssziuvrpf8
---
 .../src/js/website.snippets.animation.js      |  6 +-
 .../static/src/js/website.snippets.editor.js  |  2 +-
 addons/website/views/snippets.xml             | 20 ++++++-
 addons/website_mail/controllers/main.py       | 10 ++++
 .../static/src/css/website_mail.css           |  1 +
 .../static/src/js/website_mail.editor.js      | 37 ++++++++++++
 .../static/src/js/website_mail.js             | 58 ++++++++++++++-----
 addons/website_mail/views/snippets.xml        | 34 ++++++-----
 addons/website_mail/views/website_mail.xml    |  1 -
 9 files changed, 133 insertions(+), 36 deletions(-)
 create mode 100644 addons/website_mail/static/src/js/website_mail.editor.js

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index e07e58e59e7..2b6373ac226 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -38,7 +38,9 @@
             }
         });
     };
-    $(document).ready(function () {website.snippet.start_animation();});
+    $(document).ready(function () {
+        website.snippet.start_animation();
+    });
 
 
     website.snippet.animationRegistry = {};
@@ -110,7 +112,7 @@
             img.onload = function () {
                 var offset = 0;
                 var padding =  parseInt($(document.body).css("padding-top"));
-                if (speed < 1) {
+                if (speed > 1) {
                     var inner_offset = - self.$target.outerHeight() + this.height / this.width * document.body.clientWidth;
                     var outer_offset = self.$target.offset().top - (document.body.clientHeight - self.$target.outerHeight()) - padding;
                     offset = - outer_offset * speed + inner_offset;
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index b9b697f99a1..2c9d00c8e27 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -18,7 +18,7 @@
         },
         edit: function () {
             var self = this;
-            $("body").off('click');
+            $("[data-oe-model] *, [data-oe-type=html] *").off('click');
             window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
             this.snippets.appendTo(this.$el);
 
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index e9cb694a358..c2c9f9a55fe 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -829,6 +829,16 @@
 
 <div id="snippet_options" class="hidden">
 
+    <t t-call="website.snippet_options"/>
+
+</div>
+
+    </div>
+</div>
+</template>
+
+<template id="snippet_options">
+
     <div data-snippet-option-id='blog-style'
         data-selector="section:not(.carousel):not(.parallax)">
         <li class="dropdown-submenu">
@@ -957,10 +967,14 @@
         </li>
     </div>
 
-</div>
-
+    <div data-snippet-option-id='content'
+        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector-children=".content">
     </div>
-</div>
+
 </template>
+
+
 </data>
 </openerp>
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index f700fa7dc67..0da804a4f1c 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -56,3 +56,13 @@ class WebsiteMail(http.Controller):
         follower_ids = [p.id for p in obj.message_follower_ids]
 
         return partner_ids[0] in follower_ids and 1 or 0
+
+    @http.route(['/website_mail/is_follower/'], type='json', auth="public", website=True)
+    def call(self, model, id, **post):
+        public_id = request.registry['website'].get_public_user(request.cr, request.uid, request.context)
+        value = request.registry.get(model).read(request.cr, request.uid, [id], ['message_is_follower'], request.context)
+        return {
+            'is_public': request.uid == public_id, 
+            'is_follower': value and value[0]['message_is_follower'] or False
+        }
+
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css
index 5678442416c..25d88ebf191 100644
--- a/addons/website_mail/static/src/css/website_mail.css
+++ b/addons/website_mail/static/src/css/website_mail.css
@@ -1,4 +1,5 @@
 .js_follow[data-follow='on'] .js_follow_btn ,
+.js_follow[data-follow='on'] .js_follow_email,
 .js_follow[data-follow='off'] .js_unfollow_btn {
     display: none;
 }
\ No newline at end of file
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
new file mode 100644
index 00000000000..c67f0eba2b8
--- /dev/null
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -0,0 +1,37 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+    var _t = openerp._t;
+
+    website.snippet.options.subscribe = website.snippet.Option.extend({
+        on_prompt: function () {
+            var self = this;
+            return website.prompt({
+                id: "editor_new_subscribe_button",
+                window_title: _t("New Subscribe Button"),
+                select: _t("Mailing List"),
+                init: function (field) {
+                    return website.session.model('mail.group')
+                            .call('name_search', ['', [['public','=','public']]], { context: website.get_context() });
+                },
+            }).then(function (mail_group_id) {
+                self.$target.attr("data-id", mail_group_id);
+            });
+        },
+        drop_and_build_snippet: function() {
+            var self = this;
+            this._super();
+            this.on_prompt().fail(function () {
+                self.editor.on_remove();
+            });
+        },
+        start : function () {
+            var self = this;
+            this.$el.find(".js_mailing_list").on("click", _.bind(this.on_prompt, this));
+            this._super();
+        },
+    });
+})();
+
+
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 862e061afd6..15f7e4381a0 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -1,30 +1,62 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
+        selector: ".js_follow",
+        start: function () {
+            var self = this;
+
+            openerp.jsonRpc('/website_mail/is_follower/', 'call', {
+                model: this.$target.data('object'),
+                id: +this.$target.data('id'),
+            }).always(function (data) {
+
+                var $input = self.$target.find('input.js_follow_email');
+                if(data.is_public) {
+                    $input.removeClass("hidden");
+                } else {
+                    $input.addClass("hidden");
+                }
+
+                self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
+            });
+        },
+    });
+})();
+
 $(document).ready(function () {
 
-    $(document).on('click', '.js_follow_btn, .js_unfollow_btn', function (ev) {
+    $('.js_follow > .alert').addClass("hidden");
+    $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+
+    $('.js_follow_btn, .js_unfollow_btn').on('click', function (ev) {
         ev.preventDefault();
 
-        var self = this;
-        var $data = $(this).parents("div.js_follow");
-        var $email = $data.find(".js_follow_email");
+        var $follow = $(this).parents("div.js_follow");
+        var $email = $follow.find(".js_follow_email:visible");
 
         if ($email.length && !$email.val().match(/.+@.+/)) {
+            $follow.addClass('has-error');
             return false;
         }
 
-        var message_is_follower = $data.attr("data-follow") || "off";
-        $data.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off');
+        $email.removeClass('has-error');
+
+        var message_is_follower = $follow.attr("data-follow") || "off";
+        $follow.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off');
 
         openerp.jsonRpc('/website_mail/follow', 'call', {
-            'id': $data.data('id'),
-            'object': $data.data('object'),
+            'id': +$follow.data('id'),
+            'object': $follow.data('object'),
             'message_is_follower': message_is_follower,
             'email': $email.length ? $email.val() : false,
-        }).then(function (result) {
-            if (result) {
-                $data.find(" > *").toggleClass("hidden");
+        }).then(function (follow) {
+            if (follow) {
+                $follow.find(" > *").toggleClass("hidden");
             }
-            $data.attr("data-follow", result ? 'on' : 'off');
+            $follow.attr("data-follow", follow ? 'on' : 'off');
         });
     });
-
 });
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 3a1f8ab07bf..23c2046ecff 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -13,7 +13,7 @@
 <div id="snippet_email_structure" class="tab-pane fade in active">
 
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_block.png"/>
             <span class="oe_snippet_thumbnail_title">Text Block</span>
@@ -63,7 +63,7 @@
     </div>
 
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_image.png"/>
             <span class="oe_snippet_thumbnail_title">Text-Image</span>
@@ -104,7 +104,7 @@
     </div>
 
 
-    <div data-snippet-id="image-text" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_text.png"/>
             <span class="oe_snippet_thumbnail_title">Image-Text</span>
@@ -145,7 +145,7 @@
     </div>
 
 
-    <div data-snippet-id="three-columns" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/block_two_columns.png"/>
             <span class="oe_snippet_thumbnail_title">Two Columns</span>            
@@ -185,7 +185,7 @@
     </div>
 
 
-    <div data-snippet-id="three-columns" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website_mail/static/src/img/blocks/block_three_columns.png"/>
             <span class="oe_snippet_thumbnail_title">Three Columns</span>            
@@ -236,7 +236,7 @@
     </div>
 
 
-    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
             <span class="oe_snippet_thumbnail_title">Separator</span>        
@@ -262,7 +262,7 @@
 <div id="snippet_email_feature" class="tab-pane fade">
 
 
-    <div data-snippet-id="big-picture" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
             <span class="oe_snippet_thumbnail_title">Big Picture</span>          
@@ -298,7 +298,7 @@
     </div>
 
 
-    <div data-snippet-id="pricing" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_comparison.png"/>
             <span class="oe_snippet_thumbnail_title">Comparisons</span>         
@@ -389,7 +389,7 @@
     </div>
 
 
-    <div data-snippet-id="text-image" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_jumbotron.png"/>
             <span class="oe_snippet_thumbnail_title">Big Message</span>
@@ -413,7 +413,7 @@
     </div>
 
 
-    <div data-snippet-id="cta" data-selector-children=".oe_structure, [data-oe-type=html]">
+    <div>
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
             <span class="oe_snippet_thumbnail_title">Button</span>   
@@ -482,7 +482,10 @@
 </div>
 
 
-<div id="snippet_styles" class="hidden">
+<div id="snippet_options" class="hidden">
+
+    <t t-call="website.snippet_options"/>
+
 </div>
 
 
@@ -510,11 +513,10 @@
                       type="email"
                       name="email"
                       class="js_follow_email form-control"
-                      t-att-value="email or ''"
                       placeholder="your email..."/>
                 <span class="input-group-btn">
-                    <button href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</button>
-                    <button href="#" class="btn btn-primary js_follow_btn">Subscribe</button>
+                    <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
+                    <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
                 </span>
                 <div class="alert alert-success hidden">Thanks for your subscription!</div>
             </div>
@@ -527,9 +529,9 @@
         <div data-snippet-option-id='subscribe'
             data-selector=".js_follow"
             data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-            data-selector-children=".content">
+           >
             <li>
-                <a href="#" class="button js_mailing_list">Select a mailing list</a>
+                <a href="#" class="button js_mailing_list">Change mailing list</a>
             </li>
         </div>
     </xpath>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 4f128248bac..2882125de67 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -9,7 +9,6 @@
         <input
               type="email" name="email"
               class="js_follow_email form-control"
-              t-att-value="email or ''"
               placeholder="your email..."
               groups="base.group_public"/>
         <span class="input-group-btn">

From 73446943f554bef9528e6892f5bf28484ce71eb7 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 14:47:46 +0100
Subject: [PATCH 10/56] [FIX] website snippet: clean_for_save; display email in
 subscribe snippet

bzr revid: chm@openerp.com-20140306134746-oi0p580c3s3t2a24
---
 .../static/src/js/website.snippets.editor.js  | 28 +++++++++----------
 addons/website_mail/controllers/main.py       |  4 +--
 .../static/src/js/website_mail.editor.js      |  3 ++
 .../static/src/js/website_mail.js             | 12 +++-----
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 2c9d00c8e27..f619dd10c03 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -31,10 +31,6 @@
             return this._super.apply(this, arguments);
         },
         save: function () {
-            this.snippets.make_active(false);
-
-            // FIXME: call clean_for_save on all snippets of the page, not only modified ones
-            // important for banner of parallax that changes data automatically.
             this.snippets.clean_for_save();
             this._super();
         },
@@ -55,6 +51,7 @@
 
     if (!website.snippet) website.snippet = {};
     website.snippet.templateOptions = {};
+    website.snippet.globalSelector = "";
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
         template: 'website.snippets',
@@ -132,6 +129,7 @@
                 .then(function (html) {
                     var $html = $(html);
 
+                    var selector = [];
                     var $styles = $html.find("[data-snippet-option-id]");
                     $styles.each(function () {
                         var $style = $(this);
@@ -144,8 +142,10 @@
                             'selector-children': $style.data('selector-children'),
                             'selector-vertical-children': $style.data('selector-vertical-children')
                         };
+                        selector.push($style.data('selector'));
                     });
                     $styles.addClass("hidden");
+                    website.snippet.globalSelector = selector.join(",");
 
                     self.$snippets = $html.find(".tab-content > div > div").addClass("oe_snippet");
                     self.$el.append($html);
@@ -195,17 +195,12 @@
                     return;
                 }
                 snipped_event_flag = true;
-                var selector = [];
-                for (var k in website.snippet.templateOptions) {
-                    selector.push(website.snippet.templateOptions[k].selector);
-                }
-                selector = selector.join(",");
 
                 setTimeout(function () {snipped_event_flag = false;}, 0);
                 var $target = $(event.srcElement);
 
-                if (!$target.is(selector)) {
-                    $target = $target.parents(selector).first();
+                if (!$target.is(website.snippet.globalSelector)) {
+                    $target = $target.parents(website.snippet.globalSelector).first();
                 }
                 if (!self.dom_filter($target).length) {
                     $target = false;
@@ -231,13 +226,16 @@
             }
         },
         clean_for_save: function () {
-            for (var k in this.snippets) {
-                if (!this.snippets.hasOwnProperty(k)) { continue; }
-                var editor = $(this.snippets[k]).data("snippet-editor");
+            var self = this;
+            $(website.snippet.globalSelector).each(function () {
+                var $snippet = $(this);
+                self.make_active($snippet);
+                self.make_active(false);
+                var editor = $snippet.data("snippet-editor");
                 if (editor) {
                     editor.clean_for_save();
                 }
-            }
+            });
         },
         make_active: function ($snippet) {
             if ($snippet && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snippet.get(0)) {
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 0da804a4f1c..601e1387f0a 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -59,10 +59,10 @@ class WebsiteMail(http.Controller):
 
     @http.route(['/website_mail/is_follower/'], type='json', auth="public", website=True)
     def call(self, model, id, **post):
-        public_id = request.registry['website'].get_public_user(request.cr, request.uid, request.context)
+        email = request.registry['res.users'].browse(request.cr, request.uid, request.uid, request.context).partner_id.email
         value = request.registry.get(model).read(request.cr, request.uid, [id], ['message_is_follower'], request.context)
         return {
-            'is_public': request.uid == public_id, 
+            'email': email, 
             'is_follower': value and value[0]['message_is_follower'] or False
         }
 
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index c67f0eba2b8..bef6eedfef4 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -31,6 +31,9 @@
             this.$el.find(".js_mailing_list").on("click", _.bind(this.on_prompt, this));
             this._super();
         },
+        clean_for_save: function () {
+            this.$target.addClass("hidden");
+        },
     });
 })();
 
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 15f7e4381a0..e72cf0bc9b6 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -12,15 +12,11 @@
                 model: this.$target.data('object'),
                 id: +this.$target.data('id'),
             }).always(function (data) {
-
-                var $input = self.$target.find('input.js_follow_email');
-                if(data.is_public) {
-                    $input.removeClass("hidden");
-                } else {
-                    $input.addClass("hidden");
-                }
-
+                self.$target.find('input.js_follow_email')
+                    .val(data.email ? data.email : "")
+                    .attr("disabled", data.email.length ? "disabled" : false);
                 self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
+                self.$target.removeClass("hidden");
             });
         },
     });

From 5f3f09329fed083dd3df604301329a5e4b3f44bc Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 15:03:23 +0100
Subject: [PATCH 11/56] [IMP] website: snippet :
 website.snippet.animationRegistry.follow

bzr revid: chm@openerp.com-20140306140323-o2e77a66eu28bddu
---
 .../src/js/website.snippets.animation.js      |  8 +--
 .../static/src/js/website.snippets.editor.js  |  4 +-
 .../static/src/js/website_mail.js             | 70 +++++++++----------
 3 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 2b6373ac226..933f4b8e6ed 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -5,7 +5,7 @@
     if (!website.snippet) website.snippet = {};
     website.snippet.readyAnimation = [];
 
-    website.snippet.start_animation = function ($target) {
+    website.snippet.start_animation = function (editable_mode, $target) {
         for (var k in website.snippet.animationRegistry) {
             var Animation = website.snippet.animationRegistry[k];
             var selector = "";
@@ -24,7 +24,7 @@
                         !$snipped_id.parent("body").length &&
                         !$snipped_id.data("snippet-view")) {
                     website.snippet.readyAnimation.push($snipped_id);
-                    $snipped_id.data("snippet-view", new Animation($snipped_id));
+                    $snipped_id.data("snippet-view", new Animation($snipped_id, editable_mode));
                 }
             });
         }
@@ -49,9 +49,9 @@
         $: function () {
             return this.$el.find.apply(this.$el, arguments);
         },
-        init: function (dom) {
+        init: function (dom, editable_mode) {
             this.$el = this.$target = $(dom);
-            this.start();
+            this.start(editable_mode);
         },
         /*
         *  start
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f619dd10c03..b615f8d60e5 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -25,7 +25,7 @@
             this.on('rte:ready', this, function () {
                 self.snippets.$button.removeClass("hidden");
                 website.snippet.stop_animation();
-                website.snippet.start_animation();
+                website.snippet.start_animation(true);
             });
 
             return this._super.apply(this, arguments);
@@ -382,7 +382,7 @@
                             $("#oe_snippets").trigger('snippet-dropped', $target);
 
                             // after rte
-                            website.snippet.start_animation($target);
+                            website.snippet.start_animation(true, $target);
 
                             self.create_overlay($target);
                             if ($target.data("snippet-editor")) {
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index e72cf0bc9b6..672a21324a8 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -5,9 +5,10 @@
 
     website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
         selector: ".js_follow",
-        start: function () {
+        start: function (editable_mode) {
             var self = this;
 
+            // set value and display button
             openerp.jsonRpc('/website_mail/is_follower/', 'call', {
                 model: this.$target.data('object'),
                 id: +this.$target.data('id'),
@@ -18,41 +19,38 @@
                 self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
                 self.$target.removeClass("hidden");
             });
+
+            // not if editable mode to allow designer to edit alert field
+            if (!editable_mode) {
+                $('.js_follow > .alert').addClass("hidden");
+                $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+                this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) {
+                    event.preventDefault();
+                    self.on_click();
+                });
+            }
+        },
+        on_click: function () {
+            var self = this;
+            var $email = this.$target.find(".js_follow_email:visible");
+
+            if ($email.length && !$email.val().match(/.+@.+/)) {
+                this.$target.addClass('has-error');
+                return false;
+            }
+            this.$target.removeClass('has-error');
+
+            openerp.jsonRpc('/website_mail/follow', 'call', {
+                'id': +this.$target.data('id'),
+                'object': this.$target.data('object'),
+                'message_is_follower': this.$target.attr("data-follow") || "off",
+                'email': $email.length ? $email.val() : false,
+            }).then(function (follow) {
+                if (follow) {
+                    self.$target.find(" > *").toggleClass("hidden");
+                }
+                self.$target.attr("data-follow", follow ? 'on' : 'off');
+            });
         },
     });
 })();
-
-$(document).ready(function () {
-
-    $('.js_follow > .alert').addClass("hidden");
-    $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
-
-    $('.js_follow_btn, .js_unfollow_btn').on('click', function (ev) {
-        ev.preventDefault();
-
-        var $follow = $(this).parents("div.js_follow");
-        var $email = $follow.find(".js_follow_email:visible");
-
-        if ($email.length && !$email.val().match(/.+@.+/)) {
-            $follow.addClass('has-error');
-            return false;
-        }
-
-        $email.removeClass('has-error');
-
-        var message_is_follower = $follow.attr("data-follow") || "off";
-        $follow.attr("data-follow", message_is_follower == 'off' ? 'on' : 'off');
-
-        openerp.jsonRpc('/website_mail/follow', 'call', {
-            'id': +$follow.data('id'),
-            'object': $follow.data('object'),
-            'message_is_follower': message_is_follower,
-            'email': $email.length ? $email.val() : false,
-        }).then(function (follow) {
-            if (follow) {
-                $follow.find(" > *").toggleClass("hidden");
-            }
-            $follow.attr("data-follow", follow ? 'on' : 'off');
-        });
-    });
-});

From b6b0a26777146a08f0d748933fcc04b3ac688bae Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 15:38:56 +0100
Subject: [PATCH 12/56] [FIX] website_mail

bzr revid: chm@openerp.com-20140306143856-1b9q9zhgqtwr6brf
---
 addons/website_mail/models/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
index fd8997c645f..e60de014149 100644
--- a/addons/website_mail/models/__init__.py
+++ b/addons/website_mail/models/__init__.py
@@ -1,4 +1,3 @@
 import mail_message
 import mail_thread
 import email_template
-import website

From 29faa56d8e1c9ea49ae6cc8724f88cc65a22ad8f Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 17:11:04 +0100
Subject: [PATCH 13/56] [FIX] website tour

bzr revid: chm@openerp.com-20140306161104-39dmtb9mw1crw2sd
---
 .../website/static/src/js/website.tour.banner.js | 16 ++++++++--------
 addons/website/static/src/js/website.tour.js     |  2 +-
 .../static/src/js/website.tour.test.admin.js     |  2 +-
 addons/website/views/snippets.xml                | 10 ++--------
 .../static/src/js/website.tour.blog.js           |  4 ++--
 .../static/src/js/website.tour.event.js          |  4 ++--
 .../static/src/js/website.tour.shop.js           |  2 +-
 7 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 97568e37f35..ff3ed030f76 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -39,7 +39,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'carousel',
+                    snippet:   '#snippet_structure .oe_snippet:first',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a Banner"),
                     content:   _t("Drag the Banner block and drop it in your page."),
@@ -47,14 +47,14 @@
                 },
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
-                    element:   '#wrap .carousel:first .carousel-caption',
+                    element:   '#wrap .carousel:first .carousel-caption > div',
                     placement: 'top',
-                    title:     _("Customize banner's text"),
-                    content:   _("Click in the text and start editing it."),
+                    title:     _t("Customize banner's text"),
+                    content:   _t("Click in the text and start editing it."),
                     popover:   { next: _t("Continue") },
                 },
                 {
-                    element:   '.oe_overlay_options .oe_options',
+                    element:   '.oe_overlay_options .oe_options:visible',
                     placement: 'left',
                     title:     _t("Customize the banner"),
                     content:   _t("Customize any block through this menu. Try to change the background of the banner."),
@@ -69,7 +69,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'features',
+                    snippet:   '#snippet_structure .oe_snippet:eq(6)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop This Block"),
                     content:   _t("Drag the <em>'Features'</em> block and drop it below the banner."),
@@ -85,8 +85,8 @@
                 },
                 {
                     waitFor:   'button[data-action=edit]:visible',
-                    title:     _("Good Job!"),
-                    content:   _("Well done, you created your homepage."),
+                    title:     _t("Good Job!"),
+                    content:   _t("Well done, you created your homepage."),
                     popover:   { next: _t("Continue") },
                 },
                 {
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 2416cb511f1..33fe11f5e81 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -205,7 +205,7 @@ website.Tour = openerp.Class.extend({
 
             if (!step.element) step.orphan = true;
             if (step.snippet) {
-                step.element = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail';
+                step.element = '#oe_snippets '+step.snippet+' .oe_snippet_thumbnail';
             }
 
         }
diff --git a/addons/website/static/src/js/website.tour.test.admin.js b/addons/website/static/src/js/website.tour.test.admin.js
index 787f05beb23..01f4448abb2 100644
--- a/addons/website/static/src/js/website.tour.test.admin.js
+++ b/addons/website/static/src/js/website.tour.test.admin.js
@@ -57,7 +57,7 @@
                 },
                 {
                     title:     'add snippets',
-                    snippet:   'carousel',
+                    snippet:   '#snippet_structure .oe_snippet:first',
                 },
                 {
                     title:     'try to save',
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index c2c9f9a55fe..53e2d87186d 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -947,8 +947,8 @@
     </div>
 
     <div data-snippet-option-id='content'
-        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
+        data-selector="blockquote, .well, .panel"
+        data-selector-siblings="blockquote, .well, .panel"
         data-selector-children=".content">
     </div>
 
@@ -967,12 +967,6 @@
         </li>
     </div>
 
-    <div data-snippet-option-id='content'
-        data-selector="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
-        data-selector-children=".content">
-    </div>
-
 </template>
 
 
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index e76e793dfda..3470e2e383b 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -65,7 +65,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'image-text',
+                    snippet:   '#snippet_structure .oe_snippet:eq(2)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a Block"),
                     content:   _t("Drag this block and drop it in your page."),
@@ -79,7 +79,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'text-block',
+                    snippet:   '#snippet_structure .oe_snippet:eq(4)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag this block and drop it below the image block."),
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index a9e40a5f65b..ef013398acb 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -65,7 +65,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'image-text',
+                    snippet:   '#snippet_structure .oe_snippet:eq(2)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Image-Text' block and drop it in your page."),
@@ -80,7 +80,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'text-block',
+                    snippet:   '#snippet_structure .oe_snippet:eq(4)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Text Block' in your event page."),
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 24dd5fd2d66..adb4a9e556c 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -109,7 +109,7 @@
                     popover:   { fixed: true },
                 },
                 {
-                    snippet:   'big-picture',
+                    snippet:   '#snippet_structure .oe_snippet:eq(7)',
                     placement: 'bottom',
                     title:     _t("Drag & Drop a block"),
                     content:   _t("Drag the 'Big Picture' block and drop it in your page."),

From 34f05212b78d94c7ac5c8ee09be4ddd9b84fe968 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 6 Mar 2014 17:24:20 +0100
Subject: [PATCH 14/56] [FIX] website: snippet & bootstrap for event view

bzr revid: chm@openerp.com-20140306162420-rvrjia8cx6y8yxd1
---
 addons/website/static/src/css/website.css  | 1 +
 addons/website/static/src/css/website.sass | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 78262bc7dd4..fb6dd4552b1 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -119,6 +119,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: auto;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 680f26cef07..787dca1257f 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: auto
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 

From 74bb1d6e9554afd2bd49db3ce4d9a98526c4f0a7 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 7 Mar 2014 11:13:25 +0100
Subject: [PATCH 15/56] [FIX] website tour

bzr revid: chm@openerp.com-20140307101325-qrpn41ue1yxbfgcs
---
 addons/website/static/src/js/website.tour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 33fe11f5e81..a17115d2184 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -377,7 +377,7 @@ website.Tour = openerp.Class.extend({
 
             if (step.snippet) {
             
-                var selector = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail';
+                var selector = '#oe_snippets '+step.snippet+' .oe_snippet_thumbnail';
                 self.autoDragAndDropSnippet(selector);
             
             } else if (step.element.match(/#oe_snippets .* \.oe_snippet_thumbnail/)) {

From a6fdc988ec58903c5db9c6f23eca795ed6d1cb54 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 7 Mar 2014 18:54:49 +0530
Subject: [PATCH 16/56] [ADD] : module website_mail_group

bzr revid: aja@tinyerp.com-20140307132449-zy216yv5kmt3o0zw
---
 addons/mail/mail_message.py                   |   2 +-
 addons/mail/mail_thread.py                    |   3 +-
 addons/website_mail_group/__init__.py         |   2 +
 addons/website_mail_group/__openerp__.py      |  23 ++++
 .../controllers/__init__.py                   |   3 +
 addons/website_mail_group/controllers/main.py | 104 +++++++++++++++
 .../data/website_mail_group_data.xml          |   4 +
 .../data/website_mail_group_demo.xml          |   5 +
 addons/website_mail_group/models/__init__.py  |   1 +
 .../website_mail_group/models/mail_group.py   |  25 ++++
 .../security/ir.model.access.csv              |   0
 .../static/src/css/website_mail_group.css     |   0
 .../views/website_mail_group.xml              | 120 ++++++++++++++++++
 .../views/website_mail_group_backend.xml      |   5 +
 14 files changed, 295 insertions(+), 2 deletions(-)
 create mode 100644 addons/website_mail_group/__init__.py
 create mode 100644 addons/website_mail_group/__openerp__.py
 create mode 100644 addons/website_mail_group/controllers/__init__.py
 create mode 100644 addons/website_mail_group/controllers/main.py
 create mode 100644 addons/website_mail_group/data/website_mail_group_data.xml
 create mode 100644 addons/website_mail_group/data/website_mail_group_demo.xml
 create mode 100644 addons/website_mail_group/models/__init__.py
 create mode 100644 addons/website_mail_group/models/mail_group.py
 create mode 100644 addons/website_mail_group/security/ir.model.access.csv
 create mode 100644 addons/website_mail_group/static/src/css/website_mail_group.css
 create mode 100644 addons/website_mail_group/views/website_mail_group.xml
 create mode 100644 addons/website_mail_group/views/website_mail_group_backend.xml

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 40a51df91d2..2b10ce46b85 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -181,6 +181,7 @@ class mail_message(osv.Model):
         'subject': fields.char('Subject'),
         'date': fields.datetime('Date'),
         'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
+        'parent_message': fields.char('Immediate Parent', select=1, readonly=1),
         'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
         'to_read': fields.function(_get_to_read, fnct_search=_search_to_read,
             type='boolean', string='To read',
@@ -834,7 +835,6 @@ class mail_message(osv.Model):
         if context is None:
             context = {}
         default_starred = context.pop('default_starred', False)
-
         if 'email_from' not in values:  # needed to compute reply_to
             values['email_from'] = self._get_default_from(cr, uid, context=context)
         if 'message_id' not in values:
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c72ef8a77cb..a306d1160e7 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1259,6 +1259,7 @@ class mail_thread(osv.AbstractModel):
             parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To']))])
             if parent_ids:
                 msg_dict['parent_id'] = parent_ids[0]
+            msg_dict['parent_message'] = message.get('In-Reply-To')
 
         if message.get('References') and 'parent_id' not in msg_dict:
             parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in',
@@ -1866,4 +1867,4 @@ class mail_thread(osv.AbstractModel):
         message_obj.write(cr, uid, msg_ids_comment, {"res_id" : new_res_id, "model" : new_model}, context=context)
         message_obj.write(cr, uid, msg_ids_not_comment, {"res_id" : new_res_id, "model" : new_model, "subtype_id" : None}, context=context)
         
-        return True
\ No newline at end of file
+        return True
diff --git a/addons/website_mail_group/__init__.py b/addons/website_mail_group/__init__.py
new file mode 100644
index 00000000000..9f86759e32b
--- /dev/null
+++ b/addons/website_mail_group/__init__.py
@@ -0,0 +1,2 @@
+import controllers
+import models
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
new file mode 100644
index 00000000000..f90d654036f
--- /dev/null
+++ b/addons/website_mail_group/__openerp__.py
@@ -0,0 +1,23 @@
+{
+    'name': 'Mailing List Archive',
+    'category': 'Website',
+    'summary': '',
+    'version': '1.0',
+    'description': """
+OpenERP Mail Group : Mailing List Archive
+==================
+
+        """,
+    'author': 'OpenERP SA',
+    'depends': ['website','mail'],
+    'data': [
+        'views/website_mail_group.xml',
+        'views/website_mail_group_backend.xml',
+        'data/website_mail_group_data.xml',
+    ],
+    'demo': [
+        'data/website_mail_group_demo.xml'
+    ],
+    'qweb': ['static/src/xml/*.xml'],
+    'installable': True,
+}
diff --git a/addons/website_mail_group/controllers/__init__.py b/addons/website_mail_group/controllers/__init__.py
new file mode 100644
index 00000000000..e11f9ba81bb
--- /dev/null
+++ b/addons/website_mail_group/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
new file mode 100644
index 00000000000..8f36503aa32
--- /dev/null
+++ b/addons/website_mail_group/controllers/main.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import SUPERUSER_ID
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+import werkzeug
+import datetime
+import time
+
+from openerp.tools.translate import _
+
+class MailGroup(http.Controller):
+    _thread_per_page = 10
+
+    @http.route([
+        "/groups",
+    ], type='http', auth="public", website=True)
+    def view(self, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        user_obj = request.registry.get('res.users')
+        group_ids = group_obj.search(cr, SUPERUSER_ID, [], context=context)
+        values = {
+            'groups': group_obj.browse(cr, uid, group_ids, context),
+        }
+        return request.website.render('website_mail_group.mail_groups', values)
+
+    @http.route([
+        "/groups/follow/<int:group_id>",
+    ], type='http', auth="public", website=True)
+    def follow(self, group_id, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
+        return werkzeug.utils.redirect('/groups')
+
+    @http.route([
+        "/groups/unfollow/<int:group_id>",
+    ], type='http', auth="public", website=True)
+    def unfollow(self, group_id, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        group_obj.message_unsubscribe_users(cr, uid, [group_id], context=context)
+        return werkzeug.utils.redirect('/groups')
+
+    @http.route([
+        "/groups/<int:group_id>/",
+        "/groups/<int:group_id>/page/<int:page>/"
+    ], type='http', auth="public", website=True)
+    def thread(self, group_id, page=1, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        thread_obj = request.registry.get('mail.message')
+        thread_ids = thread_obj.search(cr, uid, [('type','=','email'),('model','=','mail.group'),('res_id','=',group_id),('parent_message','=',False)])
+        group_ids = group_obj.search(cr, SUPERUSER_ID, [])
+        pager = request.website.pager(
+            url='/groups/%s/' % group_id,
+            total=len(thread_ids),
+            page=page,
+            step=self._thread_per_page,
+        )
+        pager_begin = (page - 1) * self._thread_per_page
+        pager_end = page * self._thread_per_page
+        thread_ids = thread_ids[pager_begin:pager_end]
+        values = {
+            'groups': group_obj.browse(cr, uid, group_ids, context),
+            'thread_list': thread_obj.browse(cr, uid, thread_ids, context),
+            'active_group': group_obj.browse(cr, uid, group_id, context),
+            'pager': pager,
+        }
+        return request.website.render('website_mail_group.group_thread_list', values)
+
+    @http.route([
+        "/groups/thread/<int:message_id>",
+    ], type='http', auth="public", website=True)
+    def get_thread(self, message_id, **post):
+        cr, uid, context = request.cr , request.uid, request.context
+        group_obj = request.registry.get('mail.group')
+        thread_obj = request.registry.get('mail.message')
+        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message_id)])
+        values = {
+            'main_thread' : thread_obj.browse(cr, uid, message_id, context),
+            'child_thread' : thread_obj.browse(cr, uid, child_ids, context),
+        }
+        return request.website.render('website_mail_group.group_thread', values)
diff --git a/addons/website_mail_group/data/website_mail_group_data.xml b/addons/website_mail_group/data/website_mail_group_data.xml
new file mode 100644
index 00000000000..b020c6a30ae
--- /dev/null
+++ b/addons/website_mail_group/data/website_mail_group_data.xml
@@ -0,0 +1,4 @@
+<openerp>
+    <data>
+    </data>
+</openerp>
diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
new file mode 100644
index 00000000000..ebc084668b7
--- /dev/null
+++ b/addons/website_mail_group/data/website_mail_group_demo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    </data>
+</openerp>
diff --git a/addons/website_mail_group/models/__init__.py b/addons/website_mail_group/models/__init__.py
new file mode 100644
index 00000000000..ea8be51acde
--- /dev/null
+++ b/addons/website_mail_group/models/__init__.py
@@ -0,0 +1 @@
+import mail_group
diff --git a/addons/website_mail_group/models/mail_group.py b/addons/website_mail_group/models/mail_group.py
new file mode 100644
index 00000000000..66a7481fb52
--- /dev/null
+++ b/addons/website_mail_group/models/mail_group.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+import uuid
+import time
+import datetime
diff --git a/addons/website_mail_group/security/ir.model.access.csv b/addons/website_mail_group/security/ir.model.access.csv
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/website_mail_group/static/src/css/website_mail_group.css b/addons/website_mail_group/static/src/css/website_mail_group.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
new file mode 100644
index 00000000000..a3abfaf605a
--- /dev/null
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <template id="header" inherit_id="website.layout" name="Header Mail Groups Link">
+        <xpath expr="//header//ul[@id='top_menu']/li" position="before">
+            <li>
+                <a href="/groups">Mail Groups</a>
+            </li>
+        </xpath>
+    </template>
+    <template id="mail_groups" name="My Groups">
+        <t t-call="website.layout">
+            <div class="row">
+                <div class="container">
+                    <div class="col-md-3 col-md-push-1">
+                        <t t-call="website_mail_group.navigation_menu"/>
+                    </div>
+                    <div class="col-md-8">
+                        <t t-foreach="groups" t-as="group">
+                            <div class="col-md-6" style="min-height: 150px">
+                                <div class="col-md-3 col-md-pull-1">
+                                    <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])"/>
+                                </div>
+                                <div class="col-md-8">
+                                    <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                                    <br/>
+                                    <small t-esc="group.description"/>
+                                    <br/>
+                                    <t t-if="group.message_is_follower">
+                                        <a class="btn btn-primary" t-attf-href="/groups/unfollow/#{ group.id }">UnFollow</a>
+                                    </t>
+                                    <t t-if="not group.message_is_follower">
+                                        <a class="btn btn-default" t-attf-href="/groups/follow/#{ group.id }">Join Group</a>
+                                    </t>
+                                </div>
+                            </div>
+                        </t>
+                    </div>
+                </div>
+            </div>
+        </t>
+    </template>
+    <template id="navigation_menu">
+        <ul class="nav nav-pills nav-stacked">
+            <t t-foreach="groups" t-as="group">
+                <li t-if="group.message_is_follower"><a t-attf-href="/groups/#{group.id}" t-esc="group.name"/></li>
+            </t>
+        </ul>
+    </template>
+    <template id="group_thread_list">
+        <t t-call="website.layout">
+            <section class="container">
+                <div class="row">
+                    <div class="col-md-12 col-md-push-3">
+                        <t t-call="website.pager"/>
+                    </div>
+                </div>
+            </section>
+            <section class="container">
+                <div class="row">
+                    <div class="col-md-3">
+                        <t t-call="website_mail_group.navigation_menu"/>
+                    </div>
+                    <div class="col-md-8">
+                        <div class="panel panel-default">
+                            <div class="panel-heading" t-esc="active_group.name"/>
+                            <table class="table table-bordered">
+                                <tbody>
+                                    <t t-foreach="thread_list" t-as="thread">
+                                        <tr>
+                                            <td>
+                                                <a t-attf-href="/groups/thread/#{thread.id}" t-esc="thread.subject"></a>
+                                                <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
+                                                <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
+                                            </td>
+                                        </tr>
+                                    </t>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </t>
+    </template>
+    <template id="group_thread">
+        <t t-call="website.layout">
+            <t t-set="head">
+                <link rel='stylesheet' href='/website_mail_group/static/src/css/website_mail_group.css'/>
+            </t>
+            <div class="row mt32">
+                <div class="container">
+                    <div class="col-md-1 mt0">
+                        <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
+                    </div>
+                    <div class="col-md-11">
+                        <div class="panel panel-default">
+                            <div class="panel-heading" t-esc="main_thread.subject"/>
+                            <div class="panel-body">
+                                <t t-raw="main_thread.body"/>
+                            </div>
+                        </div>
+                    </div>
+                    <t t-foreach="child_thread" t-as="message">
+                        <div class="col-md-1 mt0">
+                            <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
+                        </div>
+                        <div class="col-md-11">
+                            <div class="panel panel-default">
+                                <div class="panel-heading panel-line" t-esc="message.subject"/>
+                                <t t-raw="message.body"/>
+                            </div>
+                        </div>
+                    </t>
+                </div>
+            </div>
+        </t>
+    </template>
+</data>
+</openerp>
diff --git a/addons/website_mail_group/views/website_mail_group_backend.xml b/addons/website_mail_group/views/website_mail_group_backend.xml
new file mode 100644
index 00000000000..cc8d30d080d
--- /dev/null
+++ b/addons/website_mail_group/views/website_mail_group_backend.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    </data>
+</openerp>

From 3f25397dfa037aac3e4c81d4a4b49594bf5e51c8 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 10 Mar 2014 17:17:48 +0530
Subject: [PATCH 17/56] [IMP] : code

bzr revid: aja@tinyerp.com-20140310114748-gnlktp3dngnccbl3
---
 addons/website_mail_group/controllers/main.py | 63 ++++++++-----------
 .../static/src/js/website_mail_group.js       | 26 ++++++++
 .../views/website_mail_group.xml              | 21 +++----
 3 files changed, 61 insertions(+), 49 deletions(-)
 create mode 100644 addons/website_mail_group/static/src/js/website_mail_group.js

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 8f36503aa32..b57c8e22379 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -19,14 +19,9 @@
 #
 ##############################################################################
 
-from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
-import werkzeug
-import datetime
-import time
 
-from openerp.tools.translate import _
 
 class MailGroup(http.Controller):
     _thread_per_page = 10
@@ -35,45 +30,38 @@ class MailGroup(http.Controller):
         "/groups",
     ], type='http', auth="public", website=True)
     def view(self, **post):
-        cr, uid, context = request.cr , request.uid, request.context
+        cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        user_obj = request.registry.get('res.users')
-        group_ids = group_obj.search(cr, SUPERUSER_ID, [], context=context)
+        group_ids = group_obj.search(cr, uid, [], context=context)
         values = {
             'groups': group_obj.browse(cr, uid, group_ids, context),
         }
         return request.website.render('website_mail_group.mail_groups', values)
 
     @http.route([
-        "/groups/follow/<int:group_id>",
-    ], type='http', auth="public", website=True)
-    def follow(self, group_id, **post):
-        cr, uid, context = request.cr , request.uid, request.context
+        "/groups/subscription",
+    ], type='json', auth="public", website=True)
+    def subscription(self, group_id=0, action=False ,**post):
+        cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
-        return werkzeug.utils.redirect('/groups')
+        if action:
+            group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
+        else:
+            group_obj.message_unsubscribe_users(cr, uid, [group_id], context=context)
+        return []
 
     @http.route([
-        "/groups/unfollow/<int:group_id>",
+        "/groups/<model('mail.group'):group>/",
+        "/groups/<model('mail.group'):group>/page/<int:page>/"
     ], type='http', auth="public", website=True)
-    def unfollow(self, group_id, **post):
-        cr, uid, context = request.cr , request.uid, request.context
-        group_obj = request.registry.get('mail.group')
-        group_obj.message_unsubscribe_users(cr, uid, [group_id], context=context)
-        return werkzeug.utils.redirect('/groups')
-
-    @http.route([
-        "/groups/<int:group_id>/",
-        "/groups/<int:group_id>/page/<int:page>/"
-    ], type='http', auth="public", website=True)
-    def thread(self, group_id, page=1, **post):
-        cr, uid, context = request.cr , request.uid, request.context
+    def thread(self, group, page=1, **post):
+        cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
         thread_obj = request.registry.get('mail.message')
-        thread_ids = thread_obj.search(cr, uid, [('type','=','email'),('model','=','mail.group'),('res_id','=',group_id),('parent_message','=',False)])
-        group_ids = group_obj.search(cr, SUPERUSER_ID, [])
+        thread_ids = thread_obj.search(cr, uid, [('type','=','email'), ('model','=','mail.group'), ('res_id','=',group.id), ('parent_message','=',False)])
+        group_ids = group_obj.search(cr, uid, [])
         pager = request.website.pager(
-            url='/groups/%s/' % group_id,
+            url='/groups/%s/' % group.id,
             total=len(thread_ids),
             page=page,
             step=self._thread_per_page,
@@ -84,21 +72,20 @@ class MailGroup(http.Controller):
         values = {
             'groups': group_obj.browse(cr, uid, group_ids, context),
             'thread_list': thread_obj.browse(cr, uid, thread_ids, context),
-            'active_group': group_obj.browse(cr, uid, group_id, context),
+            'active_group': group,
             'pager': pager,
         }
         return request.website.render('website_mail_group.group_thread_list', values)
 
     @http.route([
-        "/groups/thread/<int:message_id>",
+        "/groups/<model('mail.group'):group>/message/<model('mail.message'):message>",
     ], type='http', auth="public", website=True)
-    def get_thread(self, message_id, **post):
-        cr, uid, context = request.cr , request.uid, request.context
-        group_obj = request.registry.get('mail.group')
+    def get_thread(self, group, message, **post):
+        cr, uid, context = request.cr, request.uid, request.context
         thread_obj = request.registry.get('mail.message')
-        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message_id)])
+        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)])
         values = {
-            'main_thread' : thread_obj.browse(cr, uid, message_id, context),
-            'child_thread' : thread_obj.browse(cr, uid, child_ids, context),
+            'main_thread': message,
+            'child_thread': thread_obj.browse(cr, uid, child_ids, context),
         }
         return request.website.render('website_mail_group.group_thread', values)
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
new file mode 100644
index 00000000000..3b856d12684
--- /dev/null
+++ b/addons/website_mail_group/static/src/js/website_mail_group.js
@@ -0,0 +1,26 @@
+$(document).ready(function () {
+    $('a.js_group').on('click', function (ev) {
+        ev.preventDefault();
+        var $link = $(ev.currentTarget);
+        var href = $link.attr("href");
+        var group_id = href.match(/subscription\/([0-9]+)/)[1];
+        var action = href.match(/action=(.*)/)[1] == 'follow' ? true : false;
+        openerp.jsonRpc("/groups/subscription/", 'call', {
+                    'group_id': parseInt(group_id),
+                    'action' : action,
+                })
+                .then(function (data) {
+                    if (action){
+                        $('li#'+ group_id).toggleClass('hidden visible');
+                        $('.unfollow_' + group_id).toggleClass('visible hidden');
+                        $('.follow_' + group_id).toggleClass('hidden visible');
+                    }
+                    else {
+                        $('li#'+ group_id).toggleClass('visible hidden');
+                        $('.unfollow_' + group_id).toggleClass('hidden visible');
+                        $('.follow_' + group_id).toggleClass('visible hidden');
+                    }
+                });
+        return false;
+    });
+});
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index a3abfaf605a..a87365ad803 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -10,6 +10,9 @@
     </template>
     <template id="mail_groups" name="My Groups">
         <t t-call="website.layout">
+            <t t-set="head">
+                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
+            </t>
             <div class="row">
                 <div class="container">
                     <div class="col-md-3 col-md-push-1">
@@ -26,12 +29,8 @@
                                     <br/>
                                     <small t-esc="group.description"/>
                                     <br/>
-                                    <t t-if="group.message_is_follower">
-                                        <a class="btn btn-primary" t-attf-href="/groups/unfollow/#{ group.id }">UnFollow</a>
-                                    </t>
-                                    <t t-if="not group.message_is_follower">
-                                        <a class="btn btn-default" t-attf-href="/groups/follow/#{ group.id }">Join Group</a>
-                                    </t>
+                                    <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
+                                    <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
                                 </div>
                             </div>
                         </t>
@@ -41,9 +40,9 @@
         </t>
     </template>
     <template id="navigation_menu">
-        <ul class="nav nav-pills nav-stacked">
+        <ul class="nav nav-pills nav-stacked" id="group_follows">
             <t t-foreach="groups" t-as="group">
-                <li t-if="group.message_is_follower"><a t-attf-href="/groups/#{group.id}" t-esc="group.name"/></li>
+                <li t-attf-class="#{group.message_is_follower and 'visible' or 'hidden'}" t-att-id="group.id"><a t-attf-href="/groups/#{group.id}" t-esc="group.name"/></li>
             </t>
         </ul>
     </template>
@@ -69,7 +68,7 @@
                                     <t t-foreach="thread_list" t-as="thread">
                                         <tr>
                                             <td>
-                                                <a t-attf-href="/groups/thread/#{thread.id}" t-esc="thread.subject"></a>
+                                                <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"></a>
                                                 <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
                                                 <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
                                             </td>
@@ -101,7 +100,7 @@
                             </div>
                         </div>
                     </div>
-                    <t t-foreach="child_thread" t-as="message">
+                    <div class="row" t-foreach="child_thread" t-as="message">
                         <div class="col-md-1 mt0">
                             <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
                         </div>
@@ -111,7 +110,7 @@
                                 <t t-raw="message.body"/>
                             </div>
                         </div>
-                    </t>
+                    </div>
                 </div>
             </div>
         </t>

From 7e8b25dbeeec3a8bef5f092fd74cc71da75943ad Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 14:54:34 +0100
Subject: [PATCH 18/56] [IMP] website: create share snippet. TODO: controller
 to send mail or mailto href

bzr revid: chm@openerp.com-20140310135434-7xt2sy89if9116l3
---
 addons/website/controllers/main.py            |  8 ++
 .../src/js/website.snippets.animation.js      | 37 ++++++++++
 addons/website/views/snippets.xml             | 73 ++++++++++++++++++-
 3 files changed, 115 insertions(+), 3 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 95c7ad82e2b..b155317d826 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -378,6 +378,14 @@ class Website(openerp.addons.web.controllers.main.Home):
             del response.headers['Content-Length']
 
         return response
+    
+    @http.route(['/website/current_user/'], type='json', auth="public", website=True)
+    def get_current_user(self, fields):
+        cr, uid, context = request.cr, request.uid, request.context
+        if request.registry["website"].get_public_user(cr, uid, context=context) != uid:
+            return request.registry["res.users"].read(cr, openerp.SUPERUSER_ID, [uid], fields, context=context)[0]
+        else:
+            return None
 
     #------------------------------------------------------
     # Server actions
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 933f4b8e6ed..173cdf39a58 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -127,4 +127,41 @@
         }
     });
 
+    website.snippet.animationRegistry.share = website.snippet.Animation.extend({
+        selector: ".oe_share",
+        start: function () {
+            var self = this;
+            var url = encodeURIComponent(window.location.href);
+            var title = encodeURIComponent($("title").text());
+            this.$target.find(".oe_share_facebook").attr("href",
+                "https://www.facebook.com/sharer/sharer.php?u="+url);
+            this.$target.find(".oe_share_twitter").attr("href",
+                "https://twitter.com/intent/tweet?text="+title+"&related=&url="+url);
+            this.$target.find(".oe_share_linkedin").attr("href",
+                "http://www.linkedin.com/shareArticle?mini=true&url="+url+"&title="+title+"&summary=&source=");
+            this.$target.find(".oe_share_google").attr("href",
+                "https://plus.google.com/share?url="+url);
+            this.$target.find("a").click(function () {
+                window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
+            });
+            
+            var $modal = this.$target.find(".oe_share_mail_modal");
+            var $from = $modal.find("input[name='from']").parent().parent();
+            this.$target.find(".oe_share_mail").off("click").click(function () {
+                // open popover
+                $modal.modal("show");
+            });
+            $modal.find("input[name='url']").attr("value", window.location.href);
+            openerp.jsonRpc('/website/current_user/', 'call', {
+                fields: ["email"]
+            }).then(function (result) {
+                if (result) $from.addClass("hidden");
+                else $from.removeClass("hidden");
+            });
+            $modal.find(".btn-primary").click(function () {
+                $modal.modal("hide");
+                console.log("valid");
+            });
+        },
+    });
 })();
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 53e2d87186d..f592286c8f7 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -336,6 +336,73 @@
         <hr class="oe_snippet_body"/>
     </div>
 
+
+    <div>
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
+            <span class="oe_snippet_thumbnail_title">Share</span>
+        </div>
+        <div class="oe_snippet_body oe_share">
+            <h3>
+                Share 
+                <a target="_Blank" class="oe_share_facebook" href="https://www.facebook.com/OpenERP"><i class="fa fa-facebook-square"></i></a>
+                <a target="_Blank" class="oe_share_twitter" href="https://twitter.com/openerp"><i class="fa fa-twitter"></i></a>
+                <a target="_Blank" class="oe_share_linkedin" href="http://www.linkedin.com/company/openerp"><i class="fa fa-linkedin"></i></a>
+                <a target="_Blank" class="oe_share_google" href="https://plus.google.com/+openerp"><i class="fa fa-google-plus-square"></i></a>
+                <a class="oe_share_mail" href="#"><i class="fa fa-envelope-o"></i></a>
+            </h3>
+
+            <!-- Modal for Mail -->
+            <div class="oe_share_mail_modal modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <form class="form-horizontal" role="form">
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                                <h4 class="modal-title" id="myModalLabel">Share by Email</h4>
+                            </div>
+                            <div class="modal-body">
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">To</label>
+                                    <div class="col-sm-10">
+                                        <input type="email" class="form-control" name="to"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">From</label>
+                                    <div class="col-sm-10">
+                                        <input type="email" class="form-control" name="from"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">Subject</label>
+                                    <div class="col-sm-10">
+                                        <input type="text" class="form-control" name="subject"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">Summary</label>
+                                    <div class="col-sm-10">
+                                        <textarea class="form-control" rows="4" name="Summary"></textarea>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-2 control-label">URL</label>
+                                    <div class="col-sm-10">
+                                        <input readonly="readonly" value="" class="form-control" name="url"/>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-primary pull-right">Send Email</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
 </div>
 
 <div id="snippet_feature" class="tab-pane fade">
@@ -947,8 +1014,8 @@
     </div>
 
     <div data-snippet-option-id='content'
-        data-selector="blockquote, .well, .panel"
-        data-selector-siblings="blockquote, .well, .panel"
+        data-selector="blockquote, .well, .panel, .oe_share"
+        data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel, .oe_share"
         data-selector-children=".content">
     </div>
 
@@ -971,4 +1038,4 @@
 
 
 </data>
-</openerp>
+</openerp>
\ No newline at end of file

From 8694a48ef1a3e251a91d57b878d188503523aa84 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 15:19:47 +0100
Subject: [PATCH 19/56] [IMP] website: use mailto for share snippet insead of
 mail form

bzr revid: chm@openerp.com-20140310141947-zs9ltuzx48k5ej5x
---
 addons/website/controllers/main.py            |  8 ---
 .../src/js/website.snippets.animation.js      | 21 ++------
 addons/website/views/snippets.xml             | 49 -------------------
 3 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b155317d826..95c7ad82e2b 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -378,14 +378,6 @@ class Website(openerp.addons.web.controllers.main.Home):
             del response.headers['Content-Length']
 
         return response
-    
-    @http.route(['/website/current_user/'], type='json', auth="public", website=True)
-    def get_current_user(self, fields):
-        cr, uid, context = request.cr, request.uid, request.context
-        if request.registry["website"].get_public_user(cr, uid, context=context) != uid:
-            return request.registry["res.users"].read(cr, openerp.SUPERUSER_ID, [uid], fields, context=context)[0]
-        else:
-            return None
 
     #------------------------------------------------------
     # Server actions
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 173cdf39a58..8d7b634e177 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -143,25 +143,10 @@
                 "https://plus.google.com/share?url="+url);
             this.$target.find("a").click(function () {
                 window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
+                return false;
             });
-            
-            var $modal = this.$target.find(".oe_share_mail_modal");
-            var $from = $modal.find("input[name='from']").parent().parent();
-            this.$target.find(".oe_share_mail").off("click").click(function () {
-                // open popover
-                $modal.modal("show");
-            });
-            $modal.find("input[name='url']").attr("value", window.location.href);
-            openerp.jsonRpc('/website/current_user/', 'call', {
-                fields: ["email"]
-            }).then(function (result) {
-                if (result) $from.addClass("hidden");
-                else $from.removeClass("hidden");
-            });
-            $modal.find(".btn-primary").click(function () {
-                $modal.modal("hide");
-                console.log("valid");
-            });
+            this.$target.find(".oe_share_mail").attr("href",
+                "mailto:?body="+url+"&subject="+title).off("click");
         },
     });
 })();
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index f592286c8f7..35861331338 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -351,55 +351,6 @@
                 <a target="_Blank" class="oe_share_google" href="https://plus.google.com/+openerp"><i class="fa fa-google-plus-square"></i></a>
                 <a class="oe_share_mail" href="#"><i class="fa fa-envelope-o"></i></a>
             </h3>
-
-            <!-- Modal for Mail -->
-            <div class="oe_share_mail_modal modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-content">
-                        <form class="form-horizontal" role="form">
-                            <div class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
-                                <h4 class="modal-title" id="myModalLabel">Share by Email</h4>
-                            </div>
-                            <div class="modal-body">
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">To</label>
-                                    <div class="col-sm-10">
-                                        <input type="email" class="form-control" name="to"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">From</label>
-                                    <div class="col-sm-10">
-                                        <input type="email" class="form-control" name="from"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">Subject</label>
-                                    <div class="col-sm-10">
-                                        <input type="text" class="form-control" name="subject"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">Summary</label>
-                                    <div class="col-sm-10">
-                                        <textarea class="form-control" rows="4" name="Summary"></textarea>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-sm-2 control-label">URL</label>
-                                    <div class="col-sm-10">
-                                        <input readonly="readonly" value="" class="form-control" name="url"/>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-primary pull-right">Send Email</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
 

From 9ee5a6d0a17d1393a8cc2dd7f1e1852326f831aa Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 15:30:55 +0100
Subject: [PATCH 20/56] [FIX] website_mail: remove frontend js and css from
 __openerp__

bzr revid: chm@openerp.com-20140310143055-nfrk745uth835qu7
---
 addons/website_mail/__openerp__.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py
index 74fe86c6193..8642f46f388 100644
--- a/addons/website_mail/__openerp__.py
+++ b/addons/website_mail/__openerp__.py
@@ -34,12 +34,6 @@
         'views/email_template_view.xml',
         'security/website_mail.xml',
     ],
-    'css': [
-        'static/src/css/website_mail.css',
-    ],
-    'js': [
-        'static/src/js/website_mail.js',
-    ],
     'qweb': [
         'static/src/xml/website_mail.xml'
     ],

From 9aa0baf7dd8a5bbe3e1688e2cf1ba98705069765 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 17:26:26 +0100
Subject: [PATCH 21/56] website_crm: contact form improvement get argument are
 processed and set into input fields + hidden fields save some datas from http
 headers controller should save all the submitted vars

bzr revid: chm@openerp.com-20140310162626-libizyxlycvuwo7h
---
 addons/website_crm/controllers/main.py   | 20 ++++++++++++++++++--
 addons/website_crm/views/website_crm.xml |  3 +++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 85ffc950a3f..dbb606dc819 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -15,8 +15,14 @@ class contactus(http.Controller):
         )
         return url
 
+    @http.route(['/page/website.contactus'], type='http', auth="public", website=True, multilang=True)
+    def contact(self, **kwargs):
+        return request.website.render("website.contactus", {
+                'kwargs': kwargs.items()
+            })
+
     @http.route(['/crm/contactus'], type='http', auth="public", website=True, multilang=True)
-    def contactus(self, description=None, partner_name=None, phone=None, contact_name=None, email_from=None, name=None):
+    def contactus(self, description=None, partner_name=None, phone=None, contact_name=None, email_from=None, name=None, **kwargs):
         post = {}
         post['description'] = description
         post['partner_name'] = partner_name
@@ -35,6 +41,7 @@ class contactus(http.Controller):
             if not post.get(field):
                 error.add(field)
         if error:
+            values.update(kwargs=kwargs.items())
             return request.website.render("website.contactus", values)
 
         # if not given: subject is contact name
@@ -48,9 +55,18 @@ class contactus(http.Controller):
         except ValueError:
             pass
 
+        environ = request.httprequest.headers.environ
+        values['description'] = "%s\n-----------------------------\nIP: %s\nUSER_AGENT: %s\nACCEPT_LANGUAGE: %s" % (
+            values['description'],
+            environ.get("REMOTE_ADDR"),
+            environ.get("HTTP_USER_AGENT"),
+            environ.get("HTTP_ACCEPT_LANGUAGE"))
+        for field in kwargs.items():
+            values['description'] = "%s\n%s: %s" % (values['description'], field[0], field[1])
+
         request.registry['crm.lead'].create(request.cr, SUPERUSER_ID, post, request.context)
         company = request.website.company_id
         values = {
-            'google_map_url': self.generate_google_map_url(company.street, company.city, company.zip, company.country_id and company.country_id.name_get()[0][1] or '')
+            'google_map_url': self.generate_google_map_url(company.street, company.city, company.zip, company.country_id and company.country_id.name_get()[0][1] or ''),
         }
         return request.website.render("website_crm.contactus_thanks", values)
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index fa0489924ce..655819d16f0 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -5,6 +5,9 @@
 <template id="contactus_form" name="Contact Form" inherit_id="website.contactus" inherit_option_id="website.contactus">
     <xpath expr="//div[@name='mail_button']" position="replace">
         <form action="/crm/contactus" method="post" class="form-horizontal mt32" >
+            <t t-foreach="kwargs" t-as="kwarg">
+                <input type="hidden" t-att-name="kwarg[0]" t-att-value="kwarg[1]"/>
+            </t>
             <div t-attf-class="form-group #{error and 'contact_name' in error and 'has-error' or ''}">
                 <label class="col-md-3 col-sm-4 control-label" for="contact_name">Your Name</label>
                 <div class="col-md-7 col-sm-8">

From b77521ae7f2dfa2c81f22528d2f395e002d7f0c2 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 10 Mar 2014 17:42:04 +0100
Subject: [PATCH 22/56] [FIX] website_crm: update post value and not values
 object

bzr revid: chm@openerp.com-20140310164204-q0nm93jmq10aa20x
---
 addons/website_crm/controllers/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index dbb606dc819..03ce4810463 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -56,13 +56,13 @@ class contactus(http.Controller):
             pass
 
         environ = request.httprequest.headers.environ
-        values['description'] = "%s\n-----------------------------\nIP: %s\nUSER_AGENT: %s\nACCEPT_LANGUAGE: %s" % (
-            values['description'],
+        post['description'] = "%s\n-----------------------------\nIP: %s\nUSER_AGENT: %s\nACCEPT_LANGUAGE: %s" % (
+            post['description'],
             environ.get("REMOTE_ADDR"),
             environ.get("HTTP_USER_AGENT"),
             environ.get("HTTP_ACCEPT_LANGUAGE"))
         for field in kwargs.items():
-            values['description'] = "%s\n%s: %s" % (values['description'], field[0], field[1])
+            post['description'] = "%s\n%s: %s" % (post['description'], field[0], field[1])
 
         request.registry['crm.lead'].create(request.cr, SUPERUSER_ID, post, request.context)
         company = request.website.company_id

From 22d1989d6ccb81908fbf7d13ba71abd853b9b20c Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 11 Mar 2014 14:26:26 +0530
Subject: [PATCH 23/56] [ADD] : demo data

bzr revid: aja@tinyerp.com-20140311085626-phkz5012uvwagc94
---
 addons/website_mail_group/controllers/main.py |   4 +-
 .../data/website_mail_group_demo.xml          | 123 ++++++++++++++++++
 .../views/website_mail_group.xml              |  66 +++++-----
 3 files changed, 156 insertions(+), 37 deletions(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index b57c8e22379..996b5524ffd 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -58,7 +58,7 @@ class MailGroup(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
         thread_obj = request.registry.get('mail.message')
-        thread_ids = thread_obj.search(cr, uid, [('type','=','email'), ('model','=','mail.group'), ('res_id','=',group.id), ('parent_message','=',False)])
+        thread_ids = thread_obj.search(cr, uid, [('type','=','email'), ('model','=','mail.group'), ('res_id','=',group.id), ('parent_id','=',False)])
         group_ids = group_obj.search(cr, uid, [])
         pager = request.website.pager(
             url='/groups/%s/' % group.id,
@@ -83,7 +83,7 @@ class MailGroup(http.Controller):
     def get_thread(self, group, message, **post):
         cr, uid, context = request.cr, request.uid, request.context
         thread_obj = request.registry.get('mail.message')
-        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)])
+        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)], order='date')
         values = {
             'main_thread': message,
             'child_thread': thread_obj.browse(cr, uid, child_ids, context),
diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
index ebc084668b7..366fa69ed6a 100644
--- a/addons/website_mail_group/data/website_mail_group_demo.xml
+++ b/addons/website_mail_group/data/website_mail_group_demo.xml
@@ -1,5 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record model="mail.group" id="group_community">
+            <field name="name">Community</field>
+            <field name="description">Community team</field>
+        </record>
+        <record model="mail.group" id="group_community">
+            <field name="message_follower_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
+        </record>
+        <record id="msg_group_community_1" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Discover OpenERP V8</field>
+            <field name="body"><![CDATA[<p>Dear community,</p>
+                <p>We are organizing a serie of events to showcase the new features of OpenERP v8.
+                The events are visible on http://openerp.com/events
+                </p>
+                <p>The America Tour:</p>
+                <p>3/11: New York: </p>
+                <p>3/13: Montreal: <a href="http://www.eventbrite.com/event/10577717237">http://www.eventbrite.com/event/10577717237</a></p>
+                <p>3/18: Los Angeles: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
+                <p>3/20: San Francisco: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
+                <p>4/10: Chicago: <a href="http://www.eventbrite.com/event/10577414331">http://www.eventbrite.com/event/10577414331</a></p>
+                <p>4/17: Miami: <a href="http://www.eventbrite.com/event/10577616937">http://www.eventbrite.com/event/10577616937</a></p>
+                <p>The European Tour:</p>
+                <p>2/20: Gosselies - Belgium: <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783>http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783</a></p>
+                <p>2/21: Brussels - Belgium: <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143</a></p>
+                <p>3/10: Germany: <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071</a></p>
+                <p>3/18: Lisbon, Portugal: <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519</a></p>
+                <p>Please spread the news and lets meet there.</p>
+                <p>Thanks,</p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: Discover OpenERP V8</field>
+            <field name="body"><![CDATA[<p>Hi,<p>
+
+            <p>is there any event scheduled for Africa in near future?</p>
+
+            <p>Regards</p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="parent_id" ref="msg_group_community_1"></field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_3" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: Discover OpenERP V8</field>
+            <field name="body"><![CDATA[<p>Yes,<p>
+                <p>in Moroco. You can contact Yves-Pascal (ypm@xxxxxxxxxxx) for morinformation.</p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="parent_id" ref="msg_group_community_1"></field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_4" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">OpenERP Marketing</field>
+            <field name="body"><![CDATA[<p>Dear community,</p>
+                <p>
+                    Over the past years, we did not invest a lot in marketing. We put most
+                    our efforts in R&D and Sales departements (starting from 2010) and
+                    services (started in 2012).
+                </p><p>
+                    Things are changing and we are now ready to invest a lot in marketing
+                    activities. I just wrote a "very draft" internal document to discuss the
+                    brand positioning of OpenERP:
+                    <a href="http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb">http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb</a>
+                </p><p>
+                    I would like to have your point of view on these marketing thoughts for
+                    OpenERP.
+                </p><p>
+                    Thanks,
+                </p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_5" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: OpenERP Marketing</field>
+            <field name="body"><![CDATA[<p>I just posted my feedback request about the OpenERP brand positioning on
+                HN, you can react there: <a href="https://news.ycombinator.com/item?id=7243726">
+                https://news.ycombinator.com/item?id=7243726</a>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="parent_id" ref="msg_group_community_4"></field>
+            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_group_community_6" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_community"/>
+            <field name="subject">Re: report_webkit future</field>
+            <field name="body"><![CDATA[<p>Hello,</p>
+                <p>I don't think there can be only one positioning for OpenERP.</p>
+                <p>Depending on the customer in front of me, I will present OpenERP as :</p>
+                <ol>
+                    <li>an Apps-consuming platform (like a cell phone)</li>
+                    <li>an ERP (in its traditional meaning)</li>
+                    <li>a business apps development framework</li>
+                </ol>
+                <p>
+                    OpenERP answers a wide range of needs, so you need to differentiate 
+                    the positioning based on the 3 axis above. In each of those axis,
+                    the competition is different and arguments toward OpenERP will be
+                    different as well.
+                </p>
+            ]]></field>
+            <field name="type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="parent_id" ref="msg_group_community_4"></field>
+            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index a87365ad803..18c7d47d01a 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -19,21 +19,19 @@
                         <t t-call="website_mail_group.navigation_menu"/>
                     </div>
                     <div class="col-md-8">
-                        <t t-foreach="groups" t-as="group">
-                            <div class="col-md-6" style="min-height: 150px">
-                                <div class="col-md-3 col-md-pull-1">
-                                    <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])"/>
-                                </div>
-                                <div class="col-md-8">
-                                    <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
-                                    <br/>
-                                    <small t-esc="group.description"/>
-                                    <br/>
-                                    <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
-                                    <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
-                                </div>
+                        <div class="col-md-6" style="min-height: 150px" t-foreach="groups" t-as="group">
+                            <div class="col-md-3 col-md-pull-1">
+                                <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])"/>
                             </div>
-                        </t>
+                            <div class="col-md-8">
+                                <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                                <br/>
+                                <small t-esc="group.description"/>
+                                <br/>
+                                <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
+                                <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -65,15 +63,13 @@
                             <div class="panel-heading" t-esc="active_group.name"/>
                             <table class="table table-bordered">
                                 <tbody>
-                                    <t t-foreach="thread_list" t-as="thread">
-                                        <tr>
-                                            <td>
-                                                <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"></a>
-                                                <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
-                                                <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
-                                            </td>
-                                        </tr>
-                                    </t>
+                                    <tr t-foreach="thread_list" t-as="thread">
+                                        <td>
+                                            <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"></a>
+                                            <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)" style="width : 30px"/>
+                                            <p><small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small></p>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -89,25 +85,25 @@
             </t>
             <div class="row mt32">
                 <div class="container">
-                    <div class="col-md-1 mt0">
-                        <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
-                    </div>
-                    <div class="col-md-11">
-                        <div class="panel panel-default">
-                            <div class="panel-heading" t-esc="main_thread.subject"/>
-                            <div class="panel-body">
-                                <t t-raw="main_thread.body"/>
+                    <div class="row">
+                        <div class="col-md-1">
+                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
+                        </div>
+                        <div class="col-md-11">
+                            <div class="panel panel-default">
+                                <div class="panel-heading" t-esc="main_thread.subject"/>
+                                <div class="panel-body" t-raw="main_thread.body"/>
                             </div>
                         </div>
                     </div>
                     <div class="row" t-foreach="child_thread" t-as="message">
-                        <div class="col-md-1 mt0">
-                            <img class="img-rounded pull-right mt0" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
+                        <div class="col-md-1">
+                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
                         </div>
                         <div class="col-md-11">
                             <div class="panel panel-default">
-                                <div class="panel-heading panel-line" t-esc="message.subject"/>
-                                <t t-raw="message.body"/>
+                                <div class="panel-heading" t-esc="message.subject"/>
+                                <div class="panel-body" t-raw="message.body"/>
                             </div>
                         </div>
                     </div>

From 7198fed6f80838dafa7d25fff368e0de16a2c168 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 11 Mar 2014 14:59:24 +0530
Subject: [PATCH 24/56] [IMP]: demo data

bzr revid: aja@tinyerp.com-20140311092924-y0yauql0igx4aifr
---
 .../data/website_mail_group_demo.xml          | 138 ++++++++++++++----
 1 file changed, 107 insertions(+), 31 deletions(-)

diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
index 366fa69ed6a..2744986dcdd 100644
--- a/addons/website_mail_group/data/website_mail_group_demo.xml
+++ b/addons/website_mail_group/data/website_mail_group_demo.xml
@@ -12,24 +12,74 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Discover OpenERP V8</field>
-            <field name="body"><![CDATA[<p>Dear community,</p>
-                <p>We are organizing a serie of events to showcase the new features of OpenERP v8.
-                The events are visible on http://openerp.com/events
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    Dear community,
+                </p><p>
+                    We are organizing a serie of events to showcase the new 
+                    features of OpenERP v8.The events are visible on 
+                    http://openerp.com/events
+                </p><p>
+                    The America Tour:
+                </p><p>
+                    3/11: New York:
+                    <a href="http://www.eventbrite.com/event/10576455463">
+                        http://www.eventbrite.com/event/10576455463
+                    </a>
+                </p><p>
+                    3/13: Montreal: 
+                    <a href="http://www.eventbrite.com/event/10577717237">
+                        http://www.eventbrite.com/event/10577717237
+                    </a>
+                </p><p>
+                    3/18: Los Angeles: 
+                    <a href="http://www.eventbrite.com/event/10577185647">
+                        http://www.eventbrite.com/event/10577185647
+                    </a>
+                </p><p>
+                    3/20: San Francisco: 
+                    <a href="http://www.eventbrite.com/event/10577185647">
+                        http://www.eventbrite.com/event/10577185647
+                    </a>
+                </p><p>
+                    4/10: Chicago:
+                    <a href="http://www.eventbrite.com/event/10577414331">
+                        http://www.eventbrite.com/event/10577414331
+                    </a>
+                </p><p>
+                    4/17: Miami:
+                    <a href="http://www.eventbrite.com/event/10577616937">
+                        http://www.eventbrite.com/event/10577616937
+                    </a>
+                </p><p>
+                    The European Tour:
+                </p><p>
+                    2/20: Gosselies - Belgium:
+                    <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783">
+                        http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783
+                    </a>
+                </p><p>
+                    2/21: Brussels - Belgium:
+                    <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">
+                        http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143
+                    </a>
+                </p><p>
+                    3/10: Germany:
+                    <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">
+                        http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071
+                    </a>
+                </p><p>
+                    3/18: Lisbon, Portugal:
+                    <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">
+                        https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519
+                    </a>
+                </p><p>
+                    Please spread the news and lets meet there.
+                </p><p>
+                    Thanks,
                 </p>
-                <p>The America Tour:</p>
-                <p>3/11: New York: </p>
-                <p>3/13: Montreal: <a href="http://www.eventbrite.com/event/10577717237">http://www.eventbrite.com/event/10577717237</a></p>
-                <p>3/18: Los Angeles: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
-                <p>3/20: San Francisco: <a href="http://www.eventbrite.com/event/10577185647">http://www.eventbrite.com/event/10577185647</a></p>
-                <p>4/10: Chicago: <a href="http://www.eventbrite.com/event/10577414331">http://www.eventbrite.com/event/10577414331</a></p>
-                <p>4/17: Miami: <a href="http://www.eventbrite.com/event/10577616937">http://www.eventbrite.com/event/10577616937</a></p>
-                <p>The European Tour:</p>
-                <p>2/20: Gosselies - Belgium: <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783>http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783</a></p>
-                <p>2/21: Brussels - Belgium: <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143</a></p>
-                <p>3/10: Germany: <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071</a></p>
-                <p>3/18: Lisbon, Portugal: <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519</a></p>
-                <p>Please spread the news and lets meet there.</p>
-                <p>Thanks,</p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_root"/>
@@ -39,11 +89,16 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[<p>Hi,<p>
-
-            <p>is there any event scheduled for Africa in near future?</p>
-
-            <p>Regards</p>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    Hi,
+                </p><p>
+                    is there any event scheduled for Africa in near future?
+                </p><p>
+                    Regards
+                </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="parent_id" ref="msg_group_community_1"></field>
@@ -54,8 +109,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[<p>Yes,<p>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>Yes,<p>
                 <p>in Moroco. You can contact Yves-Pascal (ypm@xxxxxxxxxxx) for morinformation.</p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="parent_id" ref="msg_group_community_1"></field>
@@ -66,7 +124,9 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">OpenERP Marketing</field>
-            <field name="body"><![CDATA[<p>Dear community,</p>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>Dear community,</p>
                 <p>
                     Over the past years, we did not invest a lot in marketing. We put most
                     our efforts in R&D and Sales departements (starting from 2010) and
@@ -82,6 +142,7 @@
                 </p><p>
                     Thanks,
                 </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_root"/>
@@ -91,9 +152,17 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
             <field name="subject">Re: OpenERP Marketing</field>
-            <field name="body"><![CDATA[<p>I just posted my feedback request about the OpenERP brand positioning on
-                HN, you can react there: <a href="https://news.ycombinator.com/item?id=7243726">
-                https://news.ycombinator.com/item?id=7243726</a>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    I just posted my feedback request 
+                    about the OpenERP brand positioning on
+                    HN, you can react there:
+                    <a href="https://news.ycombinator.com/item?id=7243726">
+                        https://news.ycombinator.com/item?id=7243726
+                    </a>
+                </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_demo"/>
@@ -103,10 +172,16 @@
         <record id="msg_group_community_6" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: report_webkit future</field>
-            <field name="body"><![CDATA[<p>Hello,</p>
-                <p>I don't think there can be only one positioning for OpenERP.</p>
-                <p>Depending on the customer in front of me, I will present OpenERP as :</p>
+            <field name="subject">Re: OpenERP Marketing</field>
+            <field name="body"><![CDATA[
+            <section data-snippet-id='text-block'>
+                <p>
+                    Hello,
+                </p><p>
+                    I don't think there can be only one positioning for OpenERP.
+                </p><p>
+                    Depending on the customer in front of me, I will present OpenERP as :
+                </p>
                 <ol>
                     <li>an Apps-consuming platform (like a cell phone)</li>
                     <li>an ERP (in its traditional meaning)</li>
@@ -118,6 +193,7 @@
                     the competition is different and arguments toward OpenERP will be
                     different as well.
                 </p>
+            </section>
             ]]></field>
             <field name="type">email</field>
             <field name="author_id" ref="base.partner_demo"/>

From 697b72befcc12081e5a1576a05d66948a976b3f2 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 11 Mar 2014 11:29:46 +0100
Subject: [PATCH 25/56] [IMP] website_crm: prefill form with query strig value

bzr revid: chm@openerp.com-20140311102946-l4razug7j701mska
---
 addons/website_crm/controllers/main.py   | 15 ++++++++++-----
 addons/website_crm/views/website_crm.xml |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 03ce4810463..c1680ce22ff 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -17,9 +17,13 @@ class contactus(http.Controller):
 
     @http.route(['/page/website.contactus'], type='http', auth="public", website=True, multilang=True)
     def contact(self, **kwargs):
-        return request.website.render("website.contactus", {
-                'kwargs': kwargs.items()
-            })
+        values = {}
+        for field in ['description', 'partner_name', 'phone', 'contact_name', 'email_from', 'name']:
+            if kwargs.get(field):
+                values[field] = kwargs.pop(field)
+        values.update(kwargs=kwargs.items())
+        print values
+        return request.website.render("website.contactus", values)
 
     @http.route(['/crm/contactus'], type='http', auth="public", website=True, multilang=True)
     def contactus(self, description=None, partner_name=None, phone=None, contact_name=None, email_from=None, name=None, **kwargs):
@@ -56,11 +60,12 @@ class contactus(http.Controller):
             pass
 
         environ = request.httprequest.headers.environ
-        post['description'] = "%s\n-----------------------------\nIP: %s\nUSER_AGENT: %s\nACCEPT_LANGUAGE: %s" % (
+        post['description'] = "%s\n-----------------------------\nIP: %s\nUSER_AGENT: %s\nACCEPT_LANGUAGE: %s\nREFERER: %s" % (
             post['description'],
             environ.get("REMOTE_ADDR"),
             environ.get("HTTP_USER_AGENT"),
-            environ.get("HTTP_ACCEPT_LANGUAGE"))
+            environ.get("HTTP_ACCEPT_LANGUAGE"),
+            environ.get("HTTP_REFERER"))
         for field in kwargs.items():
             post['description'] = "%s\n%s: %s" % (post['description'], field[0], field[1])
 
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 655819d16f0..a60a2c6843e 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -35,7 +35,7 @@
             <div t-attf-class="form-group #{error and 'description' in error and 'has-error' or ''}">
                 <label class="col-md-3 col-sm-4 control-label" for="description">Your Question</label>
                 <div class="col-md-7 col-sm-8">
-                    <textarea  class="form-control" name="description" style="min-height: 120px" required="True" t-attf-value="#{description or ''}"/>
+                    <textarea  class="form-control" name="description" style="min-height: 120px" required="True"><t t-esc="description or ''"/></textarea>
                 </div>
             </div>
             <div class="form-group">

From 79e55a06d629d0794fc5880323891c3b5be01fce Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 11 Mar 2014 16:13:17 +0530
Subject: [PATCH 26/56] [IMP] : Group follow/unfollow button not visible
 without logged in

bzr revid: aja@tinyerp.com-20140311104317-ysrtonu691g7qqek
---
 addons/website_mail_group/__openerp__.py             |  1 +
 addons/website_mail_group/controllers/main.py        |  3 ++-
 .../security/website_mail_group.xml                  | 12 ++++++++++++
 .../website_mail_group/views/website_mail_group.xml  |  6 +++---
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 addons/website_mail_group/security/website_mail_group.xml

diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index f90d654036f..5681dc31fd3 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -14,6 +14,7 @@ OpenERP Mail Group : Mailing List Archive
         'views/website_mail_group.xml',
         'views/website_mail_group_backend.xml',
         'data/website_mail_group_data.xml',
+        'security/website_mail_group.xml',
     ],
     'demo': [
         'data/website_mail_group_demo.xml'
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 996b5524ffd..01ec8633d55 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -32,6 +32,7 @@ class MailGroup(http.Controller):
     def view(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
+        
         group_ids = group_obj.search(cr, uid, [], context=context)
         values = {
             'groups': group_obj.browse(cr, uid, group_ids, context),
@@ -39,7 +40,7 @@ class MailGroup(http.Controller):
         return request.website.render('website_mail_group.mail_groups', values)
 
     @http.route([
-        "/groups/subscription",
+        "/groups/subscription/",
     ], type='json', auth="public", website=True)
     def subscription(self, group_id=0, action=False ,**post):
         cr, uid, context = request.cr, request.uid, request.context
diff --git a/addons/website_mail_group/security/website_mail_group.xml b/addons/website_mail_group/security/website_mail_group.xml
new file mode 100644
index 00000000000..79d4390f6f9
--- /dev/null
+++ b/addons/website_mail_group/security/website_mail_group.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.rule" id="mail.mail_group_public_and_joined">
+            <field name="name">Mail.group: access only public and joined groups</field>
+            <field name="model_id" ref="mail.model_mail_group"/>
+            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
+            <field name="perm_read" eval="False"/>
+            <field name="perm_create" eval="False"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 18c7d47d01a..e6963200290 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -13,7 +13,7 @@
             <t t-set="head">
                 <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
             </t>
-            <div class="row">
+            <div class="row mt16">
                 <div class="container">
                     <div class="col-md-3 col-md-push-1">
                         <t t-call="website_mail_group.navigation_menu"/>
@@ -28,8 +28,8 @@
                                 <br/>
                                 <small t-esc="group.description"/>
                                 <br/>
-                                <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
-                                <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
+                                <a groups="base.group_user" t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
+                                <a groups="base.group_user" t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
                             </div>
                         </div>
                     </div>

From 384f3980906f296f2c33ff7eb3b140dd7741f499 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 11 Mar 2014 18:19:41 +0100
Subject: [PATCH 27/56] [IMP] website: publish button use action for url to
 backend

bzr revid: chm@openerp.com-20140311171941-1fwhholwlsuncjyh
---
 addons/website/static/src/css/website.css     |  1 +
 addons/website/static/src/css/website.sass    |  1 +
 addons/website/views/website_templates.xml    |  2 +-
 .../views/website_blog_templates.xml          | 26 +++++++++----------
 addons/website_event/views/website_event.xml  |  5 ++++
 addons/website_sale/views/website_sale.xml    |  1 +
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 774be6ae09a..b0f118258f4 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -119,6 +119,7 @@ header a.navbar-brand img {
 .container .container {
   padding-left: 0;
   padding-right: 0;
+  width: 100%;
 }
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 4796d88cbb8..233bd447566 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -89,6 +89,7 @@ header
     .container
         padding-left: 0
         padding-right: 0
+        width: 100%
 
 /* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
 
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 580957b81d6..4b4cca1a19a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -364,7 +364,7 @@
                 </li>
                 <t t-raw="0"/>
                 <li t-if="publish_edit">
-                    <a t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (object._name, object.id)"
+                    <a t-attf-href="/web#return_label=Website&amp;view_type=form&amp;model=#{object._name}&amp;id=#{object.id}&amp;action=#{action}"
                     title='Edit in backend'>Edit</a>
                 </li>
             </ul>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 203dcc3bb71..179b1b49ff0 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -155,7 +155,19 @@
 <template id="blog_post_complete" name="Blog Post">
     <t t-call="website_blog.index">
 
-    <div class="container" id="title">
+    <t t-call="website.publish_management">
+        <t t-set="object" t-value="blog_post"/>
+        <t t-set="publish_edit" t-value="True"/>
+        <t t-set="action" t-value="'website_blog.action_blog_post'"/>
+        <li>
+            <form class="duplicate hidden" action="/blogpost/duplicate">
+                <input name="blog_post_id" t-att-value="blog_post.id"/>
+            </form>
+            <a href="#" class="duplicate" onclick="$(this).prev('form').submit()">Duplicate</a>
+        </li>
+    </t>
+
+    <div id="title">
         <h1 class="text-center" t-field="blog_post.name"/>
         <p class="post-meta text-muted text-center" name="blog_post_data">
             <span class="fa fa-calendar oe_date"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
@@ -167,18 +179,6 @@
             </span>
         </p>
     </div>
-    <div class="container">
-        <t t-call="website.publish_management">
-            <t t-set="object" t-value="blog_post"/>
-            <t t-set="publish_edit" t-value="True"/>
-            <li>
-                <form class="duplicate hidden" action="/blogpost/duplicate">
-                    <input name="blog_post_id" t-att-value="blog_post.id"/>
-                </form>
-                <a href="#" class="duplicate" onclick="$(this).prev('form').submit()">Duplicate</a>
-            </li>
-        </t>
-    </div>
 
     <div t-field="blog_post.content"/>
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index e490b1a0687..20d3499cf4a 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -189,6 +189,11 @@
                     </ol>
                 </div>
                 <div class="col-sm-5" groups="event.group_event_manager">
+                    <t t-call="website.publish_management">
+                      <t t-set="object" t-value="event"/>
+                      <t t-set="publish_edit" t-value="True"/>
+                      <t t-set="action" t-value="'event.action_event_view'"/>
+                    </t>
                 </div>
             </div>
         </div>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 31517b8bfbb..a3576b90c2c 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -293,6 +293,7 @@
                 <t t-call="website.publish_management">
                   <t t-set="object" t-value="product"/>
                   <t t-set="publish_edit" t-value="True"/>
+                  <t t-set="action" t-value="'product.product_template_action'"/>
                 </t>
             </div>
           </div>

From 4d125a3b52f6141736a7c125482f6e8dff3809e6 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 10:34:40 +0100
Subject: [PATCH 28/56] [IMP] website: simplify code share button; wip: fix
 overlay

bzr revid: chm@openerp.com-20140312093440-4uzrpkguzu0fc5p5
---
 addons/website/static/src/css/snippets.css    |  3 +++
 addons/website/static/src/css/snippets.sass   |  2 ++
 .../src/js/website.snippets.animation.js      | 23 ++++++++-----------
 .../static/src/js/website.snippets.editor.js  |  1 +
 addons/website/views/snippets.xml             | 10 ++++----
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 1416f2f899f..48400b88d45 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -344,6 +344,9 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.readonly {
+  content: "";
+}
 .oe_overlay .icon.btn {
   display: inline-block;
 }
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 8d337aadf3c..0c4abe362e2 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -252,6 +252,8 @@
                     background: rgba(30, 30, 30, .8)
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+        &.readonly
+            content: ""
 
     .icon.btn
         display: inline-block
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 55da2b9df66..56ad596d71a 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -134,23 +134,18 @@
     website.snippet.animationRegistry.share = website.snippet.Animation.extend({
         selector: ".oe_share",
         start: function () {
-            var self = this;
             var url = encodeURIComponent(window.location.href);
             var title = encodeURIComponent($("title").text());
-            this.$target.find(".oe_share_facebook").attr("href",
-                "https://www.facebook.com/sharer/sharer.php?u="+url);
-            this.$target.find(".oe_share_twitter").attr("href",
-                "https://twitter.com/intent/tweet?text="+title+"&related=&url="+url);
-            this.$target.find(".oe_share_linkedin").attr("href",
-                "http://www.linkedin.com/shareArticle?mini=true&url="+url+"&title="+title+"&summary=&source=");
-            this.$target.find(".oe_share_google").attr("href",
-                "https://plus.google.com/share?url="+url);
-            this.$target.find("a").click(function () {
-                window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
-                return false;
+            this.$target.find("a").each(function () {
+                var $a = $(this);
+                $a.attr("href", $(this).attr("href").replace("{url}", url).replace("{title}", title));
+                if ($a.attr("target") && $a.attr("target").match(/_blank/i)) {
+                    $a.click(function () {
+                        window.open(this.href,'','menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=550,width=600');
+                        return false;
+                    });
+                }
             });
-            this.$target.find(".oe_share_mail").attr("href",
-                "mailto:?body="+url+"&subject="+title).off("click");
         },
     });
 })();
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ce24f7e7780..f3c702e7be3 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -200,6 +200,7 @@
 
         bind_snippet_click_editor: function () {
             var self = this;
+            var snipped_event_flag;
             $("#wrapwrap").on('click', function (event) {
                 if (snipped_event_flag) {
                     return;
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index ebbece93f64..000383a512c 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -345,11 +345,11 @@
         <div class="oe_snippet_body oe_share">
             <h3>
                 Share 
-                <a target="_Blank" class="oe_share_facebook" href="https://www.facebook.com/OpenERP"><i class="fa fa-facebook-square"></i></a>
-                <a target="_Blank" class="oe_share_twitter" href="https://twitter.com/openerp"><i class="fa fa-twitter"></i></a>
-                <a target="_Blank" class="oe_share_linkedin" href="http://www.linkedin.com/company/openerp"><i class="fa fa-linkedin"></i></a>
-                <a target="_Blank" class="oe_share_google" href="https://plus.google.com/+openerp"><i class="fa fa-google-plus-square"></i></a>
-                <a class="oe_share_mail" href="#"><i class="fa fa-envelope-o"></i></a>
+                <a target="_Blank" class="oe_share_facebook" href="https://www.facebook.com/sharer/sharer.php?u={url}"><i class="fa fa-facebook-square"></i></a>
+                <a target="_Blank" class="oe_share_twitter" href="https://twitter.com/intent/tweet?text={title}&amp;url={url}"><i class="fa fa-twitter"></i></a>
+                <a target="_Blank" class="oe_share_linkedin" href="http://www.linkedin.com/shareArticle?mini=true&amp;url={url}&amp;title={title}&amp;"><i class="fa fa-linkedin"></i></a>
+                <a target="_Blank" class="oe_share_google" href="https://plus.google.com/share?url={url}"><i class="fa fa-google-plus-square"></i></a>
+                <a href="mailto:?body={url}&amp;subject={title}"><i class="fa fa-envelope-o"></i></a>
             </h3>
         </div>
     </div>

From 282b9624e4deadab85cb04fc6699c74b80497e92 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 12 Mar 2014 11:25:54 +0100
Subject: [PATCH 29/56] [FIX] Reactivate tests js  which have been commented !

bzr revid: jke@openerp.com-20140312102554-fcdixi03bw5rqqj1
---
 addons/website_sale/tests/test_ui.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 5216ab5fe0b..b024e405a1c 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -11,20 +11,14 @@ inject = [
 
 class TestUi(openerp.tests.HttpCase):
     def test_01_admin_shop_tour(self):
-        #self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
-        # AssertionError: Error: Time overlaps to arrive to step 5: 'New product created'
-        print 'FIXME TODO ERROR FAILED test_01_admin_shop_tour has been deactivated due to systematic errors'
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
     def test_02_admin_checkout(self):
-        # self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
-        # AssertionError: TypeError: 'undefined' is not an object (evaluating 'website.Tour.tours[id].run')
-        print 'FIXME TODO ERROR FAILED test_02_admin_checkout has been deactivated due to systematic errors'
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour", login="admin")
 
-    @unittest2.expectedFailure
     def test_03_demo_checkout(self):
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)
 
     @unittest2.expectedFailure
     def test_04_public_checkout(self):
         self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", inject=inject)
-

From d6fc0c259e510a1608caca785f91cdb3bb3fdb76 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 12 Mar 2014 14:09:39 +0100
Subject: [PATCH 30/56] [FIX] website: snippet overlay position

bzr revid: chm@openerp.com-20140312130939-6k15igo39ybuu81s
---
 addons/website/static/src/css/snippets.css    |  5 ++++-
 addons/website/static/src/css/snippets.sass   |  4 +++-
 .../static/src/js/website.snippets.editor.js  | 21 ++++++++-----------
 .../static/src/xml/website.snippets.xml       | 14 ++++++-------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 48400b88d45..4121b70ef2e 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -345,7 +345,10 @@
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
 .oe_overlay .oe_handle.readonly {
-  content: "";
+  cursor: auto !important;
+}
+.oe_overlay .oe_handle.readonly:before, .oe_overlay .oe_handle.readonly.size {
+  display: none !important;
 }
 .oe_overlay .icon.btn {
   display: inline-block;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index 0c4abe362e2..d7442a5b0f7 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -253,7 +253,9 @@
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
         &.readonly
-            content: ""
+            cursor: auto !important
+            &:before, &.size
+                display: none !important
 
     .icon.btn
         display: inline-block
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f3c702e7be3..bc7c6db15d1 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -180,10 +180,10 @@
                 'top': pos.top - mt - 5,
                 'left': pos.left
             });
-            $el.find(">.e,>.w").css({'height': $target.outerHeight() + mt + mb+1});
-            $el.find(">.s").css({'top': $target.outerHeight() + mt + mb});
-            $el.find(">.size").css({'top': $target.outerHeight() + mt});
-            $el.find(">.s,>.n").css({'width': $target.outerWidth()-2});
+            $el.find(".oe_handle.e,.oe_handle.w").css({'height': $target.outerHeight() + mt + mb+1});
+            $el.find(".oe_handle.s").css({'top': $target.outerHeight() + mt + mb});
+            $el.find(".oe_handle.size").css({'top': $target.outerHeight() + mt});
+            $el.find(".oe_handle.s,.oe_handle.n").css({'width': $target.outerWidth()-2});
         },
         show: function () {
             this.$el.removeClass("hidden");
@@ -969,16 +969,13 @@
         start: function () {
             var self = this;
             this._super();
-            var $box = $(openerp.qweb.render("website.snippets.resize"));
 
             var resize_values = this.getSize();
-            if (!resize_values.n) $box.find(".oe_handle.n").remove();
-            if (!resize_values.s) $box.find(".oe_handle.s").remove();
-            if (!resize_values.e) $box.find(".oe_handle.e").remove();
-            if (!resize_values.w) $box.find(".oe_handle.w").remove();
-            if (!resize_values.size) $box.find(".oe_handle.size").remove();
-
-            this.$overlay.append($box.find(".oe_handles").html());
+            if (resize_values.n) this.$overlay.find(".oe_handle.n").removeClass("readonly");
+            if (resize_values.s) this.$overlay.find(".oe_handle.s").removeClass("readonly");
+            if (resize_values.e) this.$overlay.find(".oe_handle.e").removeClass("readonly");
+            if (resize_values.w) this.$overlay.find(".oe_handle.w").removeClass("readonly");
+            if (resize_values.size) this.$overlay.find(".oe_handle.size").removeClass("readonly");
 
             this.$overlay.find(".oe_handle:not(:has(.oe_handle_button)), .oe_handle .oe_handle_button").on('mousedown', function (event){
                 event.preventDefault();
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index ae109139e3c..4a9769203ef 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -34,6 +34,13 @@
                     <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove Block">&amp;nbsp;<i class="fa fa-trash-o"></i>&amp;nbsp; </a>
                 </div>
             </div>
+            <div class='oe_handles'>
+                <div class='oe_handle n readonly'><div></div></div>
+                <div class='oe_handle e readonly'><div></div></div>
+                <div class='oe_handle w readonly'><div></div></div>
+                <div class='oe_handle size readonly'><div class="oe_handle_button size">Resize</div></div>
+                <div class='oe_handle s readonly'><div></div></div>
+            </div>
         </div>
     </t>
 
@@ -45,13 +52,6 @@
 
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
         <!-- custom data for the widget -->
-        <div class='oe_handles'>
-            <div class='oe_handle n'><div></div></div>
-            <div class='oe_handle e'><div></div></div>
-            <div class='oe_handle w'><div></div></div>
-            <div class='oe_handle size'><div class="oe_handle_button size">Resize</div></div>
-            <div class='oe_handle s'><div></div></div>
-        </div>
         <div class='oe_snippet_thumbnail'>Margin resize</div>
     </div>
 

From 8ad325614de9b600e73ad40a680b3fb56d1aa298 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 12 Mar 2014 15:19:10 +0100
Subject: [PATCH 31/56] [FIX] sprurious widgetification and editability of icon
 elements

* tighten widget match: don't match elements with .fa which are also "view
  section" roots (~ editing hosts) as the classes themselves out not be
  editable and the result will thus be odd
* correspondingly, only associate the icon "change" button to instances of the
  ``icons`` widget, other elements bearing ``.fa`` are not editable and should
  be excluded.

bzr revid: xmo@openerp.com-20140312141910-a2apy22qj4wwxsne
---
 .../website/static/src/js/website.editor.js   | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index a5cf89b3a4e..3965e1c3d1a 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -383,7 +383,11 @@
                         });
                     },
                     upcast: function (el) {
-                        return el.hasClass('fa');
+                        return el.hasClass('fa')
+                            // ignore ir.ui.view (other data-oe-model should
+                            // already have been matched by oeref and
+                            // monetary?
+                            && !el.attributes['data-oe-model'];
                     }
                 });
             }
@@ -645,6 +649,11 @@
                 previous = null;
             }, 'btn-sm');
 
+            function is_icons_widget(element) {
+                var w = editor.widgets.getByElement(element);
+                return w && w.name === 'icons';
+            }
+
             // previous is the state of the button-trigger: it's the
             // currently-ish hovered element which can trigger a button showing.
             // -ish, because when moving to the button itself ``previous`` is
@@ -654,9 +663,15 @@
                 // Back from edit button -> ignore
                 if (previous && previous === this) { return; }
 
+                // hover button should appear for "editable" links and images
+                // (img and a nodes whose *attributes* are editable, they
+                // can not be "editing hosts") *or* for non-editing-host
+                // elements bearing an ``fa`` class. These should have been
+                // made into CKE widgets which are editing hosts by
+                // definition, so instead check if the element has been
+                // converted/upcasted to an fa widget
                 var selected = new CKEDITOR.dom.element(this);
-                // FIXME: fa nodes may not be editable widgets (?)
-                if (!is_editable_node(selected) && !selected.hasClass('fa')) {
+                if (!(is_editable_node(selected) || is_icons_widget(selected))) {
                     return;
                 }
 

From b4ffbb4b35ce75b7bd0f83d22972089bed8e44d7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 12 Mar 2014 15:35:39 +0100
Subject: [PATCH 32/56] [FIX] website#ir.http: do not postprocess arguments on
 non `website_enabled` endpoints

bzr revid: fme@openerp.com-20140312143539-bzf54zlzeawqkfuo
---
 addons/website/models/ir_http.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index f73138313ab..47c0853d6be 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -79,6 +79,9 @@ class ir_http(orm.AbstractModel):
         return self._dispatch()
 
     def _postprocess_args(self, arguments, rule):
+        if not getattr(request, 'website_enabled', False):
+            return super(ir_http, self)._postprocess_args(arguments, rule)
+
         for arg, val in arguments.items():
             # Replace uid placeholder by the current request.uid
             if isinstance(val, orm.browse_record) and isinstance(val._uid, RequestUID):

From 584a88294ff5d4752c40aede755650ac825c24f1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 13 Mar 2014 06:16:54 +0000
Subject: [PATCH 33/56] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140313061654-qs7tba29pn3cenc7
---
 addons/l10n_be_invoice_bba/i18n/zh_CN.po | 146 +++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 addons/l10n_be_invoice_bba/i18n/zh_CN.po

diff --git a/addons/l10n_be_invoice_bba/i18n/zh_CN.po b/addons/l10n_be_invoice_bba/i18n/zh_CN.po
new file mode 100644
index 00000000000..f821806edcd
--- /dev/null
+++ b/addons/l10n_be_invoice_bba/i18n/zh_CN.po
@@ -0,0 +1,146 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2014-03-13 05:55+0000\n"
+"Last-Translator: LaoBiao.JX <betty2349@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-03-13 06:16+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: l10n_be_invoice_bba
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "发票号必须在公司范围内唯一"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_account_invoice
+msgid "Invoice"
+msgstr "发票"
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "错误，您不能创建循环引用的会员用户"
+
+#. module: l10n_be_invoice_bba
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "BBA结构化传输有误！"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Random"
+msgstr "随机"
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_type:0
+msgid "Select Default Communication Type for Outgoing Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_algorithm:0
+msgid ""
+"Select Algorithm to generate the Structured Communication on Outgoing "
+"Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:109
+#: code:addons/l10n_be_invoice_bba/invoice.py:135
+#, python-format
+msgid ""
+"The daily maximum of outgoing invoices with an automatically generated BBA "
+"Structured Communications has been exceeded!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr "自动生成结构化BBA传输已超出每日销售发票的最大值,请手动建立BBA结构化传输"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:150
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:121
+#, python-format
+msgid ""
+"The Partner should have a 3-7 digit Reference Number for the generation of "
+"BBA Structured Communications!\n"
+"Please correct the Partner record."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的EAN编码"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:108
+#: code:addons/l10n_be_invoice_bba/invoice.py:120
+#: code:addons/l10n_be_invoice_bba/invoice.py:134
+#: code:addons/l10n_be_invoice_bba/invoice.py:162
+#: code:addons/l10n_be_invoice_bba/invoice.py:172
+#: code:addons/l10n_be_invoice_bba/invoice.py:197
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Customer Reference"
+msgstr "客户参考号"
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_type:0
+msgid "Communication Type"
+msgstr "讯息类型"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:173
+#: code:addons/l10n_be_invoice_bba/invoice.py:198
+#, python-format
+msgid ""
+"The BBA Structured Communication has already been used!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Date"
+msgstr "事务处理日期"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_res_partner
+msgid "Partner"
+msgstr "合作伙伴"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:151
+#, python-format
+msgid ""
+"Unsupported Structured Communication Type Algorithm '%s' !\n"
+"Please contact your OpenERP support channel."
+msgstr "不支持的结构化传输算法类型\"%s\"!请联系你的OpenERP 维护人员"
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_algorithm:0
+msgid "Communication Algorithm"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:163
+#, python-format
+msgid ""
+"Empty BBA Structured Communication!\n"
+"Please fill in a unique BBA Structured Communication."
+msgstr ""

From 633ceff7fc812a5fb9d18671c893ff91ffccc665 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 13 Mar 2014 14:55:05 +0530
Subject: [PATCH 34/56] [IMP] : join group button is visible to public user if
 public user will click on join group will ask to login [IMP] : button color
 [ADD] : 'Mailing List' menu in footer

bzr revid: aja@tinyerp.com-20140313092505-yr2uwmxafudtdju9
---
 addons/website_mail_group/controllers/main.py     |  3 +++
 .../static/src/js/website_mail_group.js           |  4 +++-
 .../views/website_mail_group.xml                  | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index e4387ba547b..dc0acce7644 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -45,6 +45,9 @@ class MailGroup(http.Controller):
     def subscription(self, group_id=0, action=False ,**post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
+        public_uid = request.registry['website'].get_public_user(cr , uid, context)
+        if uid == public_uid:
+            return ['is_public']
         if action:
             group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
         else:
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
index 3b856d12684..651ed7fa6c3 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.js
@@ -4,12 +4,14 @@ $(document).ready(function () {
         var $link = $(ev.currentTarget);
         var href = $link.attr("href");
         var group_id = href.match(/subscription\/([0-9]+)/)[1];
-        var action = href.match(/action=(.*)/)[1] == 'follow' ? true : false;
+        var action = href.match(/action=(.*)/)[1] == 'subscribe' ? true : false;
         openerp.jsonRpc("/groups/subscription/", 'call', {
                     'group_id': parseInt(group_id),
                     'action' : action,
                 })
                 .then(function (data) {
+                    if(data[0])
+                        return window.location ='/web/login?redirect=/groups/';
                     if (action){
                         $('li#'+ group_id).toggleClass('hidden visible');
                         $('.unfollow_' + group_id).toggleClass('visible hidden');
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 6c6b23416ed..5000ca85a1d 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+    <template id="footer_mailing_list" inherit_id="website.layout" name="Footer Mailing List Link">
+        <xpath expr="//footer//div[@name='info']/ul" position="inside">
+            <li><a t-attf-href="/groups">Mailing List</a></li>
+        </xpath>
+    </template>
     <template id="mail_groups" name="My Groups">
         <t t-call="website.layout">
             <t t-set="head">
@@ -16,8 +21,8 @@
                         <div>
                             <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
                             <div t-esc="group.description" class="text-muted"/>
-                            <a groups="base.group_user" t-attf-class="btn btn-default js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=follow" t-attf-id="#{group.id}">Join Group</a>
-                            <a groups="base.group_user" t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unfollow" t-attf-id="#{group.id}">UnFollow</a>
+                            <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">Join Group</a>
+                            <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unsubscribe" t-attf-id="#{group.id}">Unsubscribe</a>
                         </div>
                     </div>
                 </div>
@@ -41,7 +46,7 @@
                         <ul class="nav nav-pills nav-stacked" id="group_follows">
                             <t t-foreach="groups" t-as="group">
                                 <li t-attf-class="#{group.message_is_follower and 'visible' or 'hidden'}" t-att-id="group.id">
-                                    <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                                    <a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/>
                                 </li>
                             </t>
                         </ul>
@@ -49,13 +54,13 @@
                     <div class="col-md-9">
                         <ul class="media-list">
                             <li t-foreach="thread_list" t-as="thread" class="media">
-                                <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" class="pull-left">
+                                <a t-attf-href="/groups/#{active_group.id}/message/#{ slug(thread) }" class="pull-left">
                                     <img class="img-rounded pull-right mt0" style="height: 40px"
                                         t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
                                 </a>
                                 <div class="media-body">
                                     <h4 class="media-heading">
-                                        <a t-attf-href="/groups/#{active_group.id}/message/#{thread.id}" t-esc="thread.subject"/>
+                                        <a t-attf-href="/groups/#{ slug(active_group) }/message/#{ slug(thread) }" t-esc="thread.subject"/>
                                         <br/>
                                         <small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small>
                                     </h4>

From 0308b7968c85798c382553925ea92e683c7ad86d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Mar 2014 10:32:02 +0100
Subject: [PATCH 35/56] [IMP] don't allow HTML formatting in non-HTML fields

bzr revid: xmo@openerp.com-20140313093202-02s734ucabvkckli
---
 .../website/static/src/js/website.editor.js   | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 3965e1c3d1a..06dd48fa68c 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -346,14 +346,40 @@
             requires: 'widget',
 
             init: function (editor) {
+                var specials = {
+                    // Can't find the correct ACL rule to only allow img tags
+                    image: { content: '*' },
+                    html: { text: '*' },
+                    monetary: {
+                        text: {
+                            selector: 'span.oe_currency_value',
+                            allowedContent: { }
+                        }
+                    }
+                };
+                _(specials).each(function (editable, type) {
+                    editor.widgets.add(type, {
+                        draggable: false,
+                        editables: editable,
+                        upcast: function (el) {
+                            return  el.attributes['data-oe-type'] === type;
+
+                        }
+                    });
+                });
                 editor.widgets.add('oeref', {
-                    editables: { text: '*' },
                     draggable: false,
-
+                    editables: {
+                        text: {
+                            selector: '*',
+                            allowedContent: { }
+                        },
+                    },
                     upcast: function (el) {
-                        var matches = el.attributes['data-oe-type'] && el.attributes['data-oe-type'] !== 'monetary';
-                        if (!matches) { return false; }
-
+                        var type = el.attributes['data-oe-type'];
+                        if (!type || (type in specials)) {
+                            return false;
+                        }
                         if (el.attributes['data-oe-original']) {
                             while (el.children.length) {
                                 el.children[0].remove();
@@ -363,16 +389,9 @@
                             ));
                         }
                         return true;
-                    },
-                });
-                editor.widgets.add('monetary', {
-                    editables: { text: 'span.oe_currency_value' },
-                    draggable: false,
-
-                    upcast: function (el) {
-                        return el.attributes['data-oe-type'] === 'monetary';
                     }
                 });
+
                 editor.widgets.add('icons', {
                     draggable: false,
 

From cd0434fb2a7cb0d8828485117b89255788c00aea Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Mar 2014 10:37:07 +0100
Subject: [PATCH 36/56] [IMP] context-sensitivity of toolbar commands (kinda,
 attempted)

bzr revid: xmo@openerp.com-20140313093707-gpaz7gmsd5zt2ck5
---
 addons/website/static/src/js/website.editor.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 06dd48fa68c..9e855e28569 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -106,6 +106,7 @@
                     },
                     canUndo: false,
                     editorFocus: true,
+                    context: 'a',
                 });
                 //noinspection JSValidateTypes
                 editor.addCommand('image', {
@@ -115,6 +116,7 @@
                     },
                     canUndo: false,
                     editorFocus: true,
+                    context: 'img',
                 });
 
                 editor.ui.addButton('Link', {
@@ -205,6 +207,7 @@
                     icon: '/website/static/src/img/bglink.png',
                     modes: { wysiwyg: true },
                     editorFocus: true,
+                    context: 'a',
                     panel: {
                         css: '/website/static/lib/bootstrap/css/bootstrap.css',
                         attributes: { 'role': 'listbox', 'aria-label': label },

From b1cd54f5e9854645137b50d6ca9969431a0f9cfa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 13 Mar 2014 10:38:22 +0100
Subject: [PATCH 37/56] [FIX] CSS of link style pane

bzr revid: xmo@openerp.com-20140313093822-kpkufmmya0e21my2
---
 addons/website/static/src/js/website.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 9e855e28569..c89bf9ec2fb 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -209,7 +209,7 @@
                     editorFocus: true,
                     context: 'a',
                     panel: {
-                        css: '/website/static/lib/bootstrap/css/bootstrap.css',
+                        css: '/web/static/lib/bootstrap/css/bootstrap.css',
                         attributes: { 'role': 'listbox', 'aria-label': label },
                     },
 

From b92001f1d8759d6695ab2e2b19d8a41d2e859b6c Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Thu, 13 Mar 2014 12:00:02 +0100
Subject: [PATCH 38/56] [IMP] Calendar - Add redirect to calendar module after
 the install of it

bzr revid: jke@openerp.com-20140313110002-m645txvytcrb40lr
---
 addons/calendar/calendar_data.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml
index 4435e8a4324..ff93a29a634 100644
--- a/addons/calendar/calendar_data.xml
+++ b/addons/calendar/calendar_data.xml
@@ -2,6 +2,17 @@
 <openerp>
     <data noupdate="1">
     
+        <!-- After installation of the module, open the related menu -->
+        <record id="action_client_calendar_menu" model="ir.actions.client">
+            <field name="name">Open Calendar</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('calendar.mail_menu_calendar')}"/>
+        </record>
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_calendar_menu"/>
+            <field name="state">open</field>
+        </record>
+
          <!-- Expense-related subtypes for messaging / Chatter -->
         <record id="calendar.subtype_invitation" model="mail.message.subtype">
             <field name="name">Invitation</field>
@@ -401,7 +412,7 @@
                             </div>
                             <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
                                 <strong style="margin-left:12px">Dear ${object.cn}</strong> ,<br/>
-                                <p style="margin-left:12px">this it a reminder for the event below : </p>
+                                <p style="margin-left:12px">That is a reminder for the event below : </p>
                             </div>
                             <div style="height: auto;margin-left:12px;margin-top:30px;">
                                 <table>

From 9496d823e9825be888ad83ae7ec34cfac3084113 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 14:05:56 +0100
Subject: [PATCH 39/56] [FIX] website: snippet dropdown options

bzr revid: chm@openerp.com-20140313130556-u3m9gbdjwi0zo2v1
---
 .../static/src/js/website.snippets.editor.js  |  9 ++++++--
 .../static/src/xml/website.snippets.xml       |  2 +-
 addons/website/views/snippets.xml             | 22 +++++++++----------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index bc7c6db15d1..8ff89466368 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -202,13 +202,17 @@
             var self = this;
             var snipped_event_flag;
             $("#wrapwrap").on('click', function (event) {
-                if (snipped_event_flag) {
+                if (snipped_event_flag || !event.srcElement) {
                     return;
                 }
                 snipped_event_flag = true;
 
                 setTimeout(function () {snipped_event_flag = false;}, 0);
-                var $target = $(event.srcElement || event.target);
+                var $target = $(event.srcElement);
+
+                if ($target.parents(".oe_overlay").length) {
+                    return;
+                }
 
                 if (!$target.is(website.snippet.globalSelector)) {
                     $target = $target.parents(website.snippet.globalSelector).first();
@@ -1445,6 +1449,7 @@
             if ($ul.find("li").length) {
                 $styles.removeClass("hidden");
             }
+            this.$overlay.find('[data-toggle="dropdown"]').dropdown();
         },
 
         get_parent_block: function () {
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 4a9769203ef..511876b116d 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -22,7 +22,7 @@
 
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
-            <div class="oe_overlay_options">
+            <div class="oe_overlay_options" contentEditable="false">
                 <div class="btn-group">
                     <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><i class="fa fa-upload"></i></a>
                     <div class="dropdown oe_options hidden btn-group">
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 000383a512c..f91bd969c70 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -922,17 +922,6 @@
         </li>
     </div>
 
-    <div data-snippet-option-id='carousel'
-        data-selector=".carousel">
-        <li class="divider"></li>
-        <li>
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
-        <li>
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
-    </div>
-
     <div data-snippet-option-id='carousel-style'
         data-selector="div[data-snippet-id='carousel']">
         <li class="dropdown-submenu" data-required="true">
@@ -945,6 +934,17 @@
         </li>
     </div>
 
+    <div data-snippet-option-id='carousel'
+        data-selector=".carousel">
+        <li class="divider"></li>
+        <li>
+            <a href="#" class="button js_add">Add Slide</a>
+        </li>
+        <li>
+            <a href="#" class="button js_remove">Remove Slide</a>
+        </li>
+    </div>
+
     <div data-snippet-option-id='margin-y'
         data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
     </div>

From ba63094b9b4cf8436b0a69944285ec94431da14b Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 13 Mar 2014 14:20:13 +0100
Subject: [PATCH 40/56] [FIX] website_sale,website_event: can't create product
 and event. Why: controller and route are strict mode, remove / at the end of
 the route

bzr revid: chm@openerp.com-20140313132013-2foflswtdd5fp8hb
---
 addons/website_event/controllers/main.py | 2 +-
 addons/website_sale/controllers/main.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index af7f77d080f..eb38e2dbe55 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -187,7 +187,7 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event.event_description_full", values)
 
-    @http.route('/event/add_event/', type='http', auth="user", multilang=True, methods=['POST'], website=True)
+    @http.route('/event/add_event', type='http', auth="user", multilang=True, methods=['POST'], website=True)
     def add_event(self, event_name="New Event", **kwargs):
         return self._add_event(event_name, request.context, **kwargs)
 
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 129643f0029..d8a314ad609 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -321,7 +321,7 @@ class Ecommerce(http.Controller):
                 context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
-    @http.route(['/shop/add_product/'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
     def add_product(self, name=None, category=0, **post):
         if not name:
             name = _("New Product")

From 808e55d25c6705677e08976b00e0b519b579eb25 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Thu, 13 Mar 2014 19:40:43 +0100
Subject: [PATCH 41/56] [FIX] Revert commit 9208 - Calendar is a module auto
 install. So we dont need to redirect

bzr revid: jke@openerp.com-20140313184043-8vy1252h3wpghx12
---
 addons/calendar/calendar_data.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml
index ff93a29a634..268c4b96bed 100644
--- a/addons/calendar/calendar_data.xml
+++ b/addons/calendar/calendar_data.xml
@@ -2,17 +2,6 @@
 <openerp>
     <data noupdate="1">
     
-        <!-- After installation of the module, open the related menu -->
-        <record id="action_client_calendar_menu" model="ir.actions.client">
-            <field name="name">Open Calendar</field>
-            <field name="tag">reload</field>
-            <field name="params" eval="{'menu_id': ref('calendar.mail_menu_calendar')}"/>
-        </record>
-        <record id="base.open_menu" model="ir.actions.todo">
-            <field name="action_id" ref="action_client_calendar_menu"/>
-            <field name="state">open</field>
-        </record>
-
          <!-- Expense-related subtypes for messaging / Chatter -->
         <record id="calendar.subtype_invitation" model="mail.message.subtype">
             <field name="name">Invitation</field>

From 55ec0feba2df2bf097e9e37b6231adc793e8b933 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 13 Mar 2014 20:48:01 +0100
Subject: [PATCH 42/56] [IMP] Subscribe data

bzr revid: fp@tinyerp.com-20140313194801-24f5f9s03rk663d6
---
 addons/website_mail/__openerp__.py                   |  1 +
 addons/website_mail/data/mail_groups.xml             | 12 ++++++++++++
 .../static/src/js/website_mail.editor.js             |  2 +-
 addons/website_mail/views/snippets.xml               |  6 ------
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 addons/website_mail/data/mail_groups.xml

diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py
index 8642f46f388..ec10f2268ca 100644
--- a/addons/website_mail/__openerp__.py
+++ b/addons/website_mail/__openerp__.py
@@ -32,6 +32,7 @@
         'views/website_mail.xml',
         'views/website_email_designer.xml',
         'views/email_template_view.xml',
+        'data/mail_groups.xml',
         'security/website_mail.xml',
     ],
     'qweb': [
diff --git a/addons/website_mail/data/mail_groups.xml b/addons/website_mail/data/mail_groups.xml
new file mode 100644
index 00000000000..0bc8d3e81d1
--- /dev/null
+++ b/addons/website_mail/data/mail_groups.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record model="mail.group" id="group_all_employees">
+            <field name="name">Newsletter</field>
+            <field name="public">public</field>
+            <field name="description">Public Newsletter.</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index bef6eedfef4..7a26920682b 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -9,7 +9,7 @@
             var self = this;
             return website.prompt({
                 id: "editor_new_subscribe_button",
-                window_title: _t("New Subscribe Button"),
+                window_title: _t("Add a Subscribe Button"),
                 select: _t("Mailing List"),
                 init: function (field) {
                     return website.session.model('mail.group')
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 23c2046ecff..75202fe99fd 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -478,18 +478,12 @@
             </table>
         </div>
     </div>
-
 </div>
 
-
 <div id="snippet_options" class="hidden">
-
     <t t-call="website.snippet_options"/>
-
 </div>
 
-
-
         </div>
     </div>
 

From 9bc57fdc08660ae426e0d5910af58ae3cbe432cb Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 14 Mar 2014 06:36:54 +0000
Subject: [PATCH 43/56] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140314063654-damk0l1vy2i2bk34
---
 addons/l10n_be_invoice_bba/i18n/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be_invoice_bba/i18n/zh_CN.po b/addons/l10n_be_invoice_bba/i18n/zh_CN.po
index f821806edcd..922af835626 100644
--- a/addons/l10n_be_invoice_bba/i18n/zh_CN.po
+++ b/addons/l10n_be_invoice_bba/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-13 06:16+0000\n"
+"X-Launchpad-Export-Date: 2014-03-14 06:36+0000\n"
 "X-Generator: Launchpad (build 16963)\n"
 
 #. module: l10n_be_invoice_bba

From b220dc926ef6e317aca7899b15c8f1a2a40ed9bd Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 14 Mar 2014 17:36:39 +0100
Subject: [PATCH 44/56] [FIX] website: can't see edit button because css with
 overflow hidden for all tag. Aplly css only on carousel, paralax and
 blockquote

bzr revid: chm@openerp.com-20140314163639-l086jn568rtti5mv
---
 addons/website/static/src/css/website.css  | 2 ++
 addons/website/static/src/css/website.sass | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 310f6b8156e..a6e4c3eb916 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -283,6 +283,8 @@ ul.nav-stacked > li > a {
 
 section, .carousel, .parallax, .row, .hr, .blockquote {
   min-height: 30px;
+}
+.carousel, .parallax, .blockquote {
   overflow: hidden;
 }
 
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 563dcae95ec..d6fbd0ac7bf 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -233,6 +233,7 @@ ul.nav-stacked > li > a
 
 section, .carousel, .parallax, .row, .hr, .blockquote
     min-height: 30px
+.carousel, .parallax, .blockquote
     overflow: hidden
 
 @media (max-width: 400px)

From 948799e259653a9e070b7e13409ab4d2ac1ff826 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 16 Mar 2014 05:42:24 +0000
Subject: [PATCH 45/56] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
---
 addons/project/i18n/zh_CN.po         | 16 ++++++++--------
 addons/sale/i18n/zh_CN.po            | 18 ++++++++++--------
 addons/web/i18n/ar.po                |  4 ++--
 addons/web/i18n/bg.po                |  4 ++--
 addons/web/i18n/bn.po                |  4 ++--
 addons/web/i18n/bs.po                |  4 ++--
 addons/web/i18n/ca.po                |  4 ++--
 addons/web/i18n/cs.po                |  6 +++---
 addons/web/i18n/da.po                |  4 ++--
 addons/web/i18n/de.po                |  4 ++--
 addons/web/i18n/en_AU.po             |  4 ++--
 addons/web/i18n/en_GB.po             |  4 ++--
 addons/web/i18n/es.po                |  4 ++--
 addons/web/i18n/es_CL.po             |  4 ++--
 addons/web/i18n/es_CR.po             |  4 ++--
 addons/web/i18n/es_DO.po             |  4 ++--
 addons/web/i18n/es_EC.po             |  4 ++--
 addons/web/i18n/es_MX.po             |  4 ++--
 addons/web/i18n/es_PE.po             |  4 ++--
 addons/web/i18n/et.po                |  4 ++--
 addons/web/i18n/eu.po                |  4 ++--
 addons/web/i18n/fa.po                |  4 ++--
 addons/web/i18n/fi.po                |  4 ++--
 addons/web/i18n/fr.po                |  4 ++--
 addons/web/i18n/fr_CA.po             |  4 ++--
 addons/web/i18n/gl.po                |  4 ++--
 addons/web/i18n/gu.po                |  4 ++--
 addons/web/i18n/he.po                |  4 ++--
 addons/web/i18n/hi.po                |  4 ++--
 addons/web/i18n/hr.po                |  4 ++--
 addons/web/i18n/hu.po                |  4 ++--
 addons/web/i18n/id.po                |  4 ++--
 addons/web/i18n/it.po                |  4 ++--
 addons/web/i18n/ja.po                |  4 ++--
 addons/web/i18n/ka.po                |  4 ++--
 addons/web/i18n/ko.po                |  4 ++--
 addons/web/i18n/lo.po                |  4 ++--
 addons/web/i18n/lt.po                |  4 ++--
 addons/web/i18n/lv.po                |  4 ++--
 addons/web/i18n/mk.po                |  4 ++--
 addons/web/i18n/mn.po                |  4 ++--
 addons/web/i18n/nb.po                |  4 ++--
 addons/web/i18n/nl.po                |  4 ++--
 addons/web/i18n/nl_BE.po             |  4 ++--
 addons/web/i18n/pl.po                |  4 ++--
 addons/web/i18n/pt.po                |  4 ++--
 addons/web/i18n/pt_BR.po             |  4 ++--
 addons/web/i18n/ro.po                |  4 ++--
 addons/web/i18n/ru.po                |  4 ++--
 addons/web/i18n/sk.po                |  4 ++--
 addons/web/i18n/sl.po                |  4 ++--
 addons/web/i18n/sq.po                |  4 ++--
 addons/web/i18n/sr@latin.po          |  4 ++--
 addons/web/i18n/sv.po                |  4 ++--
 addons/web/i18n/th.po                |  6 +++---
 addons/web/i18n/tr.po                |  4 ++--
 addons/web/i18n/uk.po                |  4 ++--
 addons/web/i18n/vi.po                |  4 ++--
 addons/web/i18n/zh_CN.po             |  4 ++--
 addons/web/i18n/zh_TW.po             |  4 ++--
 addons/web_calendar/i18n/ar.po       |  4 ++--
 addons/web_calendar/i18n/bg.po       |  4 ++--
 addons/web_calendar/i18n/bn.po       |  4 ++--
 addons/web_calendar/i18n/bs.po       |  4 ++--
 addons/web_calendar/i18n/ca.po       |  4 ++--
 addons/web_calendar/i18n/cs.po       |  4 ++--
 addons/web_calendar/i18n/da.po       |  4 ++--
 addons/web_calendar/i18n/de.po       |  4 ++--
 addons/web_calendar/i18n/en_AU.po    |  4 ++--
 addons/web_calendar/i18n/en_GB.po    |  4 ++--
 addons/web_calendar/i18n/es.po       |  4 ++--
 addons/web_calendar/i18n/es_CL.po    |  4 ++--
 addons/web_calendar/i18n/es_CR.po    |  4 ++--
 addons/web_calendar/i18n/es_DO.po    |  4 ++--
 addons/web_calendar/i18n/es_EC.po    |  4 ++--
 addons/web_calendar/i18n/es_MX.po    |  4 ++--
 addons/web_calendar/i18n/es_PE.po    |  4 ++--
 addons/web_calendar/i18n/et.po       |  4 ++--
 addons/web_calendar/i18n/eu.po       |  4 ++--
 addons/web_calendar/i18n/fa.po       |  4 ++--
 addons/web_calendar/i18n/fi.po       |  4 ++--
 addons/web_calendar/i18n/fr.po       |  4 ++--
 addons/web_calendar/i18n/fr_CA.po    |  4 ++--
 addons/web_calendar/i18n/gl.po       |  4 ++--
 addons/web_calendar/i18n/gu.po       |  4 ++--
 addons/web_calendar/i18n/hr.po       |  4 ++--
 addons/web_calendar/i18n/hu.po       |  4 ++--
 addons/web_calendar/i18n/id.po       |  4 ++--
 addons/web_calendar/i18n/it.po       |  4 ++--
 addons/web_calendar/i18n/ja.po       |  4 ++--
 addons/web_calendar/i18n/ka.po       |  4 ++--
 addons/web_calendar/i18n/ko.po       |  4 ++--
 addons/web_calendar/i18n/lt.po       |  4 ++--
 addons/web_calendar/i18n/mk.po       |  4 ++--
 addons/web_calendar/i18n/mn.po       |  4 ++--
 addons/web_calendar/i18n/nb.po       |  4 ++--
 addons/web_calendar/i18n/nl.po       |  4 ++--
 addons/web_calendar/i18n/nl_BE.po    |  4 ++--
 addons/web_calendar/i18n/pl.po       |  4 ++--
 addons/web_calendar/i18n/pt.po       |  4 ++--
 addons/web_calendar/i18n/pt_BR.po    |  4 ++--
 addons/web_calendar/i18n/ro.po       |  4 ++--
 addons/web_calendar/i18n/ru.po       |  4 ++--
 addons/web_calendar/i18n/sk.po       |  4 ++--
 addons/web_calendar/i18n/sl.po       |  4 ++--
 addons/web_calendar/i18n/sq.po       |  4 ++--
 addons/web_calendar/i18n/sr@latin.po |  4 ++--
 addons/web_calendar/i18n/sv.po       |  4 ++--
 addons/web_calendar/i18n/th.po       |  4 ++--
 addons/web_calendar/i18n/tr.po       |  4 ++--
 addons/web_calendar/i18n/uk.po       |  4 ++--
 addons/web_calendar/i18n/zh_CN.po    |  4 ++--
 addons/web_calendar/i18n/zh_TW.po    |  4 ++--
 addons/web_diagram/i18n/ar.po        |  4 ++--
 addons/web_diagram/i18n/bg.po        |  4 ++--
 addons/web_diagram/i18n/bn.po        |  4 ++--
 addons/web_diagram/i18n/bs.po        |  4 ++--
 addons/web_diagram/i18n/ca.po        |  4 ++--
 addons/web_diagram/i18n/cs.po        |  4 ++--
 addons/web_diagram/i18n/da.po        |  4 ++--
 addons/web_diagram/i18n/de.po        |  4 ++--
 addons/web_diagram/i18n/en_AU.po     |  4 ++--
 addons/web_diagram/i18n/en_GB.po     |  4 ++--
 addons/web_diagram/i18n/es.po        |  4 ++--
 addons/web_diagram/i18n/es_CL.po     |  4 ++--
 addons/web_diagram/i18n/es_CR.po     |  4 ++--
 addons/web_diagram/i18n/es_DO.po     |  4 ++--
 addons/web_diagram/i18n/es_EC.po     |  4 ++--
 addons/web_diagram/i18n/es_MX.po     |  4 ++--
 addons/web_diagram/i18n/es_PE.po     |  4 ++--
 addons/web_diagram/i18n/et.po        |  4 ++--
 addons/web_diagram/i18n/fa.po        |  4 ++--
 addons/web_diagram/i18n/fi.po        |  4 ++--
 addons/web_diagram/i18n/fr.po        |  4 ++--
 addons/web_diagram/i18n/gl.po        |  4 ++--
 addons/web_diagram/i18n/gu.po        |  4 ++--
 addons/web_diagram/i18n/hr.po        |  4 ++--
 addons/web_diagram/i18n/hu.po        |  4 ++--
 addons/web_diagram/i18n/id.po        |  4 ++--
 addons/web_diagram/i18n/it.po        |  4 ++--
 addons/web_diagram/i18n/ja.po        |  4 ++--
 addons/web_diagram/i18n/ka.po        |  4 ++--
 addons/web_diagram/i18n/ko.po        |  4 ++--
 addons/web_diagram/i18n/lt.po        |  4 ++--
 addons/web_diagram/i18n/mk.po        |  4 ++--
 addons/web_diagram/i18n/mn.po        |  4 ++--
 addons/web_diagram/i18n/nb.po        |  4 ++--
 addons/web_diagram/i18n/nl.po        |  4 ++--
 addons/web_diagram/i18n/nl_BE.po     |  4 ++--
 addons/web_diagram/i18n/pl.po        |  4 ++--
 addons/web_diagram/i18n/pt.po        |  4 ++--
 addons/web_diagram/i18n/pt_BR.po     |  4 ++--
 addons/web_diagram/i18n/ro.po        |  4 ++--
 addons/web_diagram/i18n/ru.po        |  4 ++--
 addons/web_diagram/i18n/sl.po        |  4 ++--
 addons/web_diagram/i18n/sq.po        |  4 ++--
 addons/web_diagram/i18n/sr@latin.po  |  4 ++--
 addons/web_diagram/i18n/sv.po        |  4 ++--
 addons/web_diagram/i18n/th.po        |  4 ++--
 addons/web_diagram/i18n/tr.po        |  4 ++--
 addons/web_diagram/i18n/zh_CN.po     |  4 ++--
 addons/web_diagram/i18n/zh_TW.po     |  4 ++--
 addons/web_gantt/i18n/ar.po          |  4 ++--
 addons/web_gantt/i18n/bg.po          |  4 ++--
 addons/web_gantt/i18n/bn.po          |  4 ++--
 addons/web_gantt/i18n/bs.po          |  4 ++--
 addons/web_gantt/i18n/ca.po          |  4 ++--
 addons/web_gantt/i18n/cs.po          |  4 ++--
 addons/web_gantt/i18n/da.po          |  4 ++--
 addons/web_gantt/i18n/de.po          |  4 ++--
 addons/web_gantt/i18n/en_AU.po       |  4 ++--
 addons/web_gantt/i18n/en_GB.po       |  4 ++--
 addons/web_gantt/i18n/es.po          |  4 ++--
 addons/web_gantt/i18n/es_CL.po       |  4 ++--
 addons/web_gantt/i18n/es_CR.po       |  4 ++--
 addons/web_gantt/i18n/es_DO.po       |  4 ++--
 addons/web_gantt/i18n/es_EC.po       |  4 ++--
 addons/web_gantt/i18n/es_MX.po       |  4 ++--
 addons/web_gantt/i18n/et.po          |  4 ++--
 addons/web_gantt/i18n/fa.po          |  4 ++--
 addons/web_gantt/i18n/fi.po          |  4 ++--
 addons/web_gantt/i18n/fr.po          |  4 ++--
 addons/web_gantt/i18n/gl.po          |  4 ++--
 addons/web_gantt/i18n/gu.po          |  4 ++--
 addons/web_gantt/i18n/he.po          |  4 ++--
 addons/web_gantt/i18n/hr.po          |  4 ++--
 addons/web_gantt/i18n/hu.po          |  4 ++--
 addons/web_gantt/i18n/it.po          |  4 ++--
 addons/web_gantt/i18n/ja.po          |  4 ++--
 addons/web_gantt/i18n/ka.po          |  4 ++--
 addons/web_gantt/i18n/ko.po          |  4 ++--
 addons/web_gantt/i18n/lo.po          |  4 ++--
 addons/web_gantt/i18n/lt.po          |  4 ++--
 addons/web_gantt/i18n/mk.po          |  4 ++--
 addons/web_gantt/i18n/mn.po          |  4 ++--
 addons/web_gantt/i18n/nb.po          |  4 ++--
 addons/web_gantt/i18n/nl.po          |  4 ++--
 addons/web_gantt/i18n/nl_BE.po       |  4 ++--
 addons/web_gantt/i18n/pl.po          |  4 ++--
 addons/web_gantt/i18n/pt.po          |  4 ++--
 addons/web_gantt/i18n/pt_BR.po       |  4 ++--
 addons/web_gantt/i18n/ro.po          |  4 ++--
 addons/web_gantt/i18n/ru.po          |  4 ++--
 addons/web_gantt/i18n/sl.po          |  4 ++--
 addons/web_gantt/i18n/sq.po          |  4 ++--
 addons/web_gantt/i18n/sr@latin.po    |  4 ++--
 addons/web_gantt/i18n/sv.po          |  4 ++--
 addons/web_gantt/i18n/th.po          |  4 ++--
 addons/web_gantt/i18n/tr.po          |  4 ++--
 addons/web_gantt/i18n/zh_CN.po       |  4 ++--
 addons/web_graph/i18n/ar.po          |  4 ++--
 addons/web_graph/i18n/bg.po          |  4 ++--
 addons/web_graph/i18n/bn.po          |  4 ++--
 addons/web_graph/i18n/bs.po          |  4 ++--
 addons/web_graph/i18n/ca.po          |  4 ++--
 addons/web_graph/i18n/cs.po          |  4 ++--
 addons/web_graph/i18n/da.po          |  4 ++--
 addons/web_graph/i18n/de.po          |  4 ++--
 addons/web_graph/i18n/en_AU.po       |  4 ++--
 addons/web_graph/i18n/en_GB.po       |  4 ++--
 addons/web_graph/i18n/es.po          |  4 ++--
 addons/web_graph/i18n/es_CL.po       |  4 ++--
 addons/web_graph/i18n/es_CR.po       |  4 ++--
 addons/web_graph/i18n/es_DO.po       |  4 ++--
 addons/web_graph/i18n/es_EC.po       |  4 ++--
 addons/web_graph/i18n/es_MX.po       |  4 ++--
 addons/web_graph/i18n/et.po          |  4 ++--
 addons/web_graph/i18n/fa.po          |  4 ++--
 addons/web_graph/i18n/fi.po          |  4 ++--
 addons/web_graph/i18n/fr.po          |  4 ++--
 addons/web_graph/i18n/fr_CA.po       |  4 ++--
 addons/web_graph/i18n/gl.po          |  4 ++--
 addons/web_graph/i18n/gu.po          |  4 ++--
 addons/web_graph/i18n/he.po          |  4 ++--
 addons/web_graph/i18n/hr.po          |  4 ++--
 addons/web_graph/i18n/hu.po          |  4 ++--
 addons/web_graph/i18n/it.po          |  4 ++--
 addons/web_graph/i18n/ja.po          |  4 ++--
 addons/web_graph/i18n/ka.po          |  4 ++--
 addons/web_graph/i18n/ko.po          |  4 ++--
 addons/web_graph/i18n/lt.po          |  4 ++--
 addons/web_graph/i18n/mk.po          |  4 ++--
 addons/web_graph/i18n/mn.po          |  4 ++--
 addons/web_graph/i18n/nb.po          |  4 ++--
 addons/web_graph/i18n/nl.po          |  4 ++--
 addons/web_graph/i18n/nl_BE.po       |  4 ++--
 addons/web_graph/i18n/pl.po          |  4 ++--
 addons/web_graph/i18n/pt.po          |  4 ++--
 addons/web_graph/i18n/pt_BR.po       |  4 ++--
 addons/web_graph/i18n/ro.po          |  4 ++--
 addons/web_graph/i18n/ru.po          |  4 ++--
 addons/web_graph/i18n/sl.po          |  4 ++--
 addons/web_graph/i18n/sq.po          |  4 ++--
 addons/web_graph/i18n/sr@latin.po    |  4 ++--
 addons/web_graph/i18n/sv.po          |  4 ++--
 addons/web_graph/i18n/th.po          |  4 ++--
 addons/web_graph/i18n/tr.po          |  4 ++--
 addons/web_graph/i18n/zh_CN.po       |  4 ++--
 addons/web_kanban/i18n/ar.po         |  4 ++--
 addons/web_kanban/i18n/bg.po         |  4 ++--
 addons/web_kanban/i18n/bn.po         |  4 ++--
 addons/web_kanban/i18n/bs.po         |  4 ++--
 addons/web_kanban/i18n/ca.po         |  4 ++--
 addons/web_kanban/i18n/cs.po         |  4 ++--
 addons/web_kanban/i18n/da.po         |  4 ++--
 addons/web_kanban/i18n/de.po         |  4 ++--
 addons/web_kanban/i18n/en_AU.po      |  4 ++--
 addons/web_kanban/i18n/en_GB.po      |  4 ++--
 addons/web_kanban/i18n/es.po         |  4 ++--
 addons/web_kanban/i18n/es_CL.po      |  4 ++--
 addons/web_kanban/i18n/es_CR.po      |  4 ++--
 addons/web_kanban/i18n/es_DO.po      |  4 ++--
 addons/web_kanban/i18n/es_EC.po      |  4 ++--
 addons/web_kanban/i18n/es_MX.po      |  4 ++--
 addons/web_kanban/i18n/et.po         |  4 ++--
 addons/web_kanban/i18n/fa.po         |  4 ++--
 addons/web_kanban/i18n/fi.po         |  4 ++--
 addons/web_kanban/i18n/fr.po         |  4 ++--
 addons/web_kanban/i18n/fr_CA.po      |  4 ++--
 addons/web_kanban/i18n/gl.po         |  4 ++--
 addons/web_kanban/i18n/gu.po         |  4 ++--
 addons/web_kanban/i18n/he.po         |  4 ++--
 addons/web_kanban/i18n/hr.po         |  4 ++--
 addons/web_kanban/i18n/hu.po         |  4 ++--
 addons/web_kanban/i18n/it.po         |  4 ++--
 addons/web_kanban/i18n/ja.po         |  4 ++--
 addons/web_kanban/i18n/ka.po         |  4 ++--
 addons/web_kanban/i18n/ko.po         |  4 ++--
 addons/web_kanban/i18n/lt.po         |  4 ++--
 addons/web_kanban/i18n/mk.po         |  4 ++--
 addons/web_kanban/i18n/mn.po         |  4 ++--
 addons/web_kanban/i18n/nb.po         |  4 ++--
 addons/web_kanban/i18n/nl.po         |  4 ++--
 addons/web_kanban/i18n/nl_BE.po      |  4 ++--
 addons/web_kanban/i18n/pl.po         |  4 ++--
 addons/web_kanban/i18n/pt.po         |  4 ++--
 addons/web_kanban/i18n/pt_BR.po      |  4 ++--
 addons/web_kanban/i18n/ro.po         |  4 ++--
 addons/web_kanban/i18n/ru.po         |  4 ++--
 addons/web_kanban/i18n/sl.po         |  4 ++--
 addons/web_kanban/i18n/sr@latin.po   |  4 ++--
 addons/web_kanban/i18n/sv.po         |  4 ++--
 addons/web_kanban/i18n/th.po         |  4 ++--
 addons/web_kanban/i18n/tr.po         |  4 ++--
 addons/web_kanban/i18n/zh_CN.po      |  4 ++--
 addons/web_kanban/i18n/zh_TW.po      |  4 ++--
 addons/web_view_editor/i18n/ar.po    |  4 ++--
 addons/web_view_editor/i18n/bs.po    |  4 ++--
 addons/web_view_editor/i18n/cs.po    |  4 ++--
 addons/web_view_editor/i18n/da.po    |  4 ++--
 addons/web_view_editor/i18n/de.po    |  4 ++--
 addons/web_view_editor/i18n/en_AU.po |  4 ++--
 addons/web_view_editor/i18n/en_GB.po |  4 ++--
 addons/web_view_editor/i18n/es.po    |  4 ++--
 addons/web_view_editor/i18n/es_DO.po |  4 ++--
 addons/web_view_editor/i18n/es_EC.po |  4 ++--
 addons/web_view_editor/i18n/es_MX.po |  4 ++--
 addons/web_view_editor/i18n/et.po    |  4 ++--
 addons/web_view_editor/i18n/fa.po    |  4 ++--
 addons/web_view_editor/i18n/fi.po    |  4 ++--
 addons/web_view_editor/i18n/fr.po    |  4 ++--
 addons/web_view_editor/i18n/he.po    |  4 ++--
 addons/web_view_editor/i18n/hr.po    |  4 ++--
 addons/web_view_editor/i18n/hu.po    |  4 ++--
 addons/web_view_editor/i18n/it.po    |  4 ++--
 addons/web_view_editor/i18n/ko.po    |  4 ++--
 addons/web_view_editor/i18n/lt.po    |  4 ++--
 addons/web_view_editor/i18n/lv.po    |  4 ++--
 addons/web_view_editor/i18n/mk.po    |  4 ++--
 addons/web_view_editor/i18n/mn.po    |  4 ++--
 addons/web_view_editor/i18n/nb.po    |  4 ++--
 addons/web_view_editor/i18n/nl.po    |  4 ++--
 addons/web_view_editor/i18n/nl_BE.po |  4 ++--
 addons/web_view_editor/i18n/pl.po    |  4 ++--
 addons/web_view_editor/i18n/pt.po    |  4 ++--
 addons/web_view_editor/i18n/pt_BR.po |  4 ++--
 addons/web_view_editor/i18n/ro.po    |  4 ++--
 addons/web_view_editor/i18n/ru.po    |  4 ++--
 addons/web_view_editor/i18n/sl.po    |  4 ++--
 addons/web_view_editor/i18n/sv.po    |  4 ++--
 addons/web_view_editor/i18n/th.po    |  4 ++--
 addons/web_view_editor/i18n/tr.po    |  4 ++--
 addons/web_view_editor/i18n/zh_CN.po |  4 ++--
 343 files changed, 702 insertions(+), 700 deletions(-)

diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index c0cfcde2834..ecc5aa4aea3 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-08-13 04:04+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2014-03-15 06:42+0000\n"
+"Last-Translator: Victor Yu <vivianyw@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 06:19+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: project
 #: view:project.project:0
@@ -671,7 +671,7 @@ msgstr "新任务"
 #. module: project
 #: field:project.config.settings,module_project_issue_sheet:0
 msgid "Invoice working time on issues"
-msgstr ""
+msgstr "依据问题工作时间开票"
 
 #. module: project
 #: view:project.project:0
@@ -828,7 +828,7 @@ msgstr "花费的时间"
 #: view:project.project:0
 #: view:project.task:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: project
 #: field:account.analytic.account,company_uom_id:0
@@ -958,7 +958,7 @@ msgstr "本项目和相关项目的任务实际花费的小时数合计"
 msgid ""
 "Follow this project to automatically track the events associated to tasks "
 "and issues of this project."
-msgstr ""
+msgstr "关注此项目的同时，追踪此项目的任务和问题关联的事件。"
 
 #. module: project
 #: view:project.task:0
@@ -1018,7 +1018,7 @@ msgstr "信息和通信历史记录"
 msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
-msgstr ""
+msgstr "开票或设定发票更新选项，到相关的合同："
 
 #. module: project
 #: field:project.task.delegate,state:0
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 0fbbcb6833d..a5ab6e3c64b 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-11-19 10:53+0000\n"
-"Last-Translator: Guipo Hao <hrlpool@sohu.com>\n"
+"PO-Revision-Date: 2014-03-15 07:15+0000\n"
+"Last-Translator: Victor Yu <vivianyw@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:04+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-16 05:42+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -247,7 +247,7 @@ msgstr "计量单位 "
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "错误的数据"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
@@ -1570,7 +1570,7 @@ msgstr "查找未开票明细"
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "会计.配置.设定"
 
 #. module: sale
 #: sql_constraint:sale.order:0
@@ -2080,7 +2080,7 @@ msgstr "产品销售单位"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr "销售订单草稿状态"
+msgstr "草稿状态的销售订单"
 
 #. module: sale
 #: field:sale.order,origin:0
@@ -2286,7 +2286,9 @@ msgstr ""
 msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
-msgstr "在挑选产品前，在 销售表单选择一个客户"
+msgstr ""
+"在挑选产品前，\n"
+" 在销售表单中选择一个客户。"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po
index 67184648649..f92fdd447a1 100644
--- a/addons/web/i18n/ar.po
+++ b/addons/web/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:01+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po
index 770bfbbd840..9f061d5d949 100644
--- a/addons/web/i18n/bg.po
+++ b/addons/web/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po
index 719be2041ad..8d66fd1f665 100644
--- a/addons/web/i18n/bn.po
+++ b/addons/web/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po
index f1c697869dd..f79c22012d2 100644
--- a/addons/web/i18n/bs.po
+++ b/addons/web/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index e0c88404aff..06889a511f6 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po
index 52f37e69406..46973b7a2c0 100644
--- a/addons/web/i18n/cs.po
+++ b/addons/web/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web
@@ -1610,7 +1610,7 @@ msgstr "Mažu databázi"
 #: code:addons/web/static/src/xml/base.xml:467
 #, python-format
 msgid "Powered by"
-msgstr ""
+msgstr "Založeno na"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 6d16ba2fb43..495acdd1014 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po
index bb67174627a..f9ee09441cb 100644
--- a/addons/web/i18n/de.po
+++ b/addons/web/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po
index 3bba3748933..d1255a88ac6 100644
--- a/addons/web/i18n/en_AU.po
+++ b/addons/web/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index b0376267387..1ab30702945 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index cf2335a5c1c..2c3918bcc06 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po
index e29f14c3404..a1a786fc05c 100644
--- a/addons/web/i18n/es_CL.po
+++ b/addons/web/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po
index fa318c2721a..5d37ed84799 100644
--- a/addons/web/i18n/es_CR.po
+++ b/addons/web/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "Language: es\n"
 
 #. module: web
diff --git a/addons/web/i18n/es_DO.po b/addons/web/i18n/es_DO.po
index a93b81ad86a..774ea3da1aa 100644
--- a/addons/web/i18n/es_DO.po
+++ b/addons/web/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index dff85970e44..96b74af7041 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_MX.po b/addons/web/i18n/es_MX.po
index 91c8a77e14f..8e99a250926 100644
--- a/addons/web/i18n/es_MX.po
+++ b/addons/web/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_PE.po b/addons/web/i18n/es_PE.po
index 51cc8a1ffc2..3353102c7e7 100644
--- a/addons/web/i18n/es_PE.po
+++ b/addons/web/i18n/es_PE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index b04f1eeb77c..6a916b1d602 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po
index 3f005bb8748..b613aff9bf7 100644
--- a/addons/web/i18n/eu.po
+++ b/addons/web/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 59bc4eb5e00..6350b1604b2 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index dd1524ff1de..58e91a8a9ed 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po
index 151333cb582..13323c40119 100644
--- a/addons/web/i18n/fr.po
+++ b/addons/web/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 6d6c0b62721..4995039d8d4 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po
index fc651dd112d..f26c4e665b3 100644
--- a/addons/web/i18n/gl.po
+++ b/addons/web/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
index 1caa713714c..0ba9b2b1468 100644
--- a/addons/web/i18n/gu.po
+++ b/addons/web/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/he.po b/addons/web/i18n/he.po
index d34d2dbf941..26a1c8f5962 100644
--- a/addons/web/i18n/he.po
+++ b/addons/web/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po
index 24a5d06d013..3ec7a6bbead 100644
--- a/addons/web/i18n/hi.po
+++ b/addons/web/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index dc8df85c668..73bc6181aa6 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po
index 4dfcbf9c09f..22f87738d11 100644
--- a/addons/web/i18n/hu.po
+++ b/addons/web/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index 69a773acf8b..65cfb2e754d 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index db318997a5d..068131c92a4 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index 723064188fd..75e354ad6fc 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po
index 2fd69805e01..fc1c920f97a 100644
--- a/addons/web/i18n/ka.po
+++ b/addons/web/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ko.po b/addons/web/i18n/ko.po
index 66368a9c196..8ca9fecdb69 100644
--- a/addons/web/i18n/ko.po
+++ b/addons/web/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lo.po b/addons/web/i18n/lo.po
index 335f7df338a..185804a40e9 100644
--- a/addons/web/i18n/lo.po
+++ b/addons/web/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 570a08070bd..7cc4df11960 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lv.po b/addons/web/i18n/lv.po
index adadab13ec7..8ce0d5dcf19 100644
--- a/addons/web/i18n/lv.po
+++ b/addons/web/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 6305755d96b..51e740c5fd8 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po
index e13c38c9afd..6d682eeadc6 100644
--- a/addons/web/i18n/mn.po
+++ b/addons/web/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po
index e010241762b..1375a926243 100644
--- a/addons/web/i18n/nb.po
+++ b/addons/web/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:03+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 879cde57ed2..de492027849 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:02+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po
index 520b3e6169b..f7d062e7bd4 100644
--- a/addons/web/i18n/nl_BE.po
+++ b/addons/web/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po
index dfd93b68d3a..734b3cbbd16 100644
--- a/addons/web/i18n/pl.po
+++ b/addons/web/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index ceeb55e83b0..02702624886 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index a5a9169c844..4e9f441befc 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index 5d615348ee1..58c672b45ad 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index f34fb396d44..0acc7bb3ec5 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po
index 9d6a5ba4340..c7229192916 100644
--- a/addons/web/i18n/sk.po
+++ b/addons/web/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po
index 37487135874..28d06e07ccd 100644
--- a/addons/web/i18n/sl.po
+++ b/addons/web/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po
index 68ae9312822..925ea5ea6bf 100644
--- a/addons/web/i18n/sq.po
+++ b/addons/web/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:52+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:01+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po
index f939bdf4cd0..64a327ea164 100644
--- a/addons/web/i18n/sr@latin.po
+++ b/addons/web/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index efc5282ce51..40b0a3bee94 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/th.po b/addons/web/i18n/th.po
index f1ee7f15ff4..2fc3f6a4fab 100644
--- a/addons/web/i18n/th.po
+++ b/addons/web/i18n/th.po
@@ -14,15 +14,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:147
 #, python-format
 msgid "Default language:"
-msgstr "ภาษาหลัก:"
+msgstr "ภาษาหลัก"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index b9ea7003525..61a1af167b4 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po
index ca088974d9a..a52394b625d 100644
--- a/addons/web/i18n/uk.po
+++ b/addons/web/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/vi.po b/addons/web/i18n/vi.po
index 456db1deb78..a69cd1b8a60 100644
--- a/addons/web/i18n/vi.po
+++ b/addons/web/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:04+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index eab723ca9ea..6b487c3470d 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po
index f6f44ba9679..fbe1c31e0e7 100644
--- a/addons/web/i18n/zh_TW.po
+++ b/addons/web/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ar.po b/addons/web_calendar/i18n/ar.po
index dd04b59ffc3..dbd949fd810 100644
--- a/addons/web_calendar/i18n/ar.po
+++ b/addons/web_calendar/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bg.po b/addons/web_calendar/i18n/bg.po
index 6cba43add02..a0583277ee8 100644
--- a/addons/web_calendar/i18n/bg.po
+++ b/addons/web_calendar/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bn.po b/addons/web_calendar/i18n/bn.po
index e2ed2058763..02793de94e1 100644
--- a/addons/web_calendar/i18n/bn.po
+++ b/addons/web_calendar/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/bs.po b/addons/web_calendar/i18n/bs.po
index 5ace6d4c937..5bf6a678882 100644
--- a/addons/web_calendar/i18n/bs.po
+++ b/addons/web_calendar/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ca.po b/addons/web_calendar/i18n/ca.po
index b3265e0b812..29f9791cfa0 100644
--- a/addons/web_calendar/i18n/ca.po
+++ b/addons/web_calendar/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/cs.po b/addons/web_calendar/i18n/cs.po
index 4e899d5cd97..9f366769715 100644
--- a/addons/web_calendar/i18n/cs.po
+++ b/addons/web_calendar/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/da.po b/addons/web_calendar/i18n/da.po
index 44e4c8f59e2..e04e69bda71 100644
--- a/addons/web_calendar/i18n/da.po
+++ b/addons/web_calendar/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index 5cb011c462e..fbb92237f61 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_AU.po b/addons/web_calendar/i18n/en_AU.po
index 93358638467..d4b83526832 100644
--- a/addons/web_calendar/i18n/en_AU.po
+++ b/addons/web_calendar/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/en_GB.po b/addons/web_calendar/i18n/en_GB.po
index 206513f3b5f..d84dc0df632 100644
--- a/addons/web_calendar/i18n/en_GB.po
+++ b/addons/web_calendar/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es.po b/addons/web_calendar/i18n/es.po
index c1cffb215da..c198423f13f 100644
--- a/addons/web_calendar/i18n/es.po
+++ b/addons/web_calendar/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CL.po b/addons/web_calendar/i18n/es_CL.po
index a57d3b3cf60..4de337db691 100644
--- a/addons/web_calendar/i18n/es_CL.po
+++ b/addons/web_calendar/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_CR.po b/addons/web_calendar/i18n/es_CR.po
index 462a5a2ab50..b58a1d0001e 100644
--- a/addons/web_calendar/i18n/es_CR.po
+++ b/addons/web_calendar/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "Language: es\n"
 
 #. module: web_calendar
diff --git a/addons/web_calendar/i18n/es_DO.po b/addons/web_calendar/i18n/es_DO.po
index cf76f28f547..27f63faf1a8 100644
--- a/addons/web_calendar/i18n/es_DO.po
+++ b/addons/web_calendar/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_EC.po b/addons/web_calendar/i18n/es_EC.po
index e674adcf26f..a3b553a64ce 100644
--- a/addons/web_calendar/i18n/es_EC.po
+++ b/addons/web_calendar/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_MX.po b/addons/web_calendar/i18n/es_MX.po
index 7d6cea95ac5..3f6c6706a2d 100644
--- a/addons/web_calendar/i18n/es_MX.po
+++ b/addons/web_calendar/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/es_PE.po b/addons/web_calendar/i18n/es_PE.po
index 7a898927d19..485a4245e83 100644
--- a/addons/web_calendar/i18n/es_PE.po
+++ b/addons/web_calendar/i18n/es_PE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index db5b6285d49..56a8d1c35f1 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/eu.po b/addons/web_calendar/i18n/eu.po
index 1ddfdeacdd2..2675ee5df5e 100644
--- a/addons/web_calendar/i18n/eu.po
+++ b/addons/web_calendar/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fa.po b/addons/web_calendar/i18n/fa.po
index f64e039248b..11c084f29a6 100644
--- a/addons/web_calendar/i18n/fa.po
+++ b/addons/web_calendar/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index b422da7541e..677ccebb69d 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr.po b/addons/web_calendar/i18n/fr.po
index e41b8252cb3..ce99491c669 100644
--- a/addons/web_calendar/i18n/fr.po
+++ b/addons/web_calendar/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fr_CA.po b/addons/web_calendar/i18n/fr_CA.po
index 1dac56e4b6b..322832d9321 100644
--- a/addons/web_calendar/i18n/fr_CA.po
+++ b/addons/web_calendar/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gl.po b/addons/web_calendar/i18n/gl.po
index 129d86bf914..fe6a1d190fc 100644
--- a/addons/web_calendar/i18n/gl.po
+++ b/addons/web_calendar/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/gu.po b/addons/web_calendar/i18n/gu.po
index 650d360535e..0a1109e1aba 100644
--- a/addons/web_calendar/i18n/gu.po
+++ b/addons/web_calendar/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hr.po b/addons/web_calendar/i18n/hr.po
index 4941ae7b647..386442f9d5e 100644
--- a/addons/web_calendar/i18n/hr.po
+++ b/addons/web_calendar/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/hu.po b/addons/web_calendar/i18n/hu.po
index 8dccc409a4c..59fcca8dc0d 100644
--- a/addons/web_calendar/i18n/hu.po
+++ b/addons/web_calendar/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/id.po b/addons/web_calendar/i18n/id.po
index 425fe0b6b3a..277b8ff25c7 100644
--- a/addons/web_calendar/i18n/id.po
+++ b/addons/web_calendar/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/it.po b/addons/web_calendar/i18n/it.po
index 118b27e7572..01fd2419cbb 100644
--- a/addons/web_calendar/i18n/it.po
+++ b/addons/web_calendar/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ja.po b/addons/web_calendar/i18n/ja.po
index 1fe80878635..a020fa611b8 100644
--- a/addons/web_calendar/i18n/ja.po
+++ b/addons/web_calendar/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ka.po b/addons/web_calendar/i18n/ka.po
index f51c87f2e27..d6b15deb994 100644
--- a/addons/web_calendar/i18n/ka.po
+++ b/addons/web_calendar/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ko.po b/addons/web_calendar/i18n/ko.po
index 4f77b51cb2f..bb13411ab06 100644
--- a/addons/web_calendar/i18n/ko.po
+++ b/addons/web_calendar/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/lt.po b/addons/web_calendar/i18n/lt.po
index f281254749c..17d8e638bca 100644
--- a/addons/web_calendar/i18n/lt.po
+++ b/addons/web_calendar/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mk.po b/addons/web_calendar/i18n/mk.po
index 88da0b630cd..2a6ca2367e7 100644
--- a/addons/web_calendar/i18n/mk.po
+++ b/addons/web_calendar/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/mn.po b/addons/web_calendar/i18n/mn.po
index 913ef997f90..53972abc6d3 100644
--- a/addons/web_calendar/i18n/mn.po
+++ b/addons/web_calendar/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nb.po b/addons/web_calendar/i18n/nb.po
index 73d2693af71..a2021e8a64b 100644
--- a/addons/web_calendar/i18n/nb.po
+++ b/addons/web_calendar/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index 7a12b559e16..fb362e37a74 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
index 3f1dd4126c1..6879208b20a 100644
--- a/addons/web_calendar/i18n/nl_BE.po
+++ b/addons/web_calendar/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pl.po b/addons/web_calendar/i18n/pl.po
index 5bfe489d724..05c8b9ced38 100644
--- a/addons/web_calendar/i18n/pl.po
+++ b/addons/web_calendar/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index c4145d96551..5f559d18108 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
index 12b03a26fe9..69204d4c9b3 100644
--- a/addons/web_calendar/i18n/pt_BR.po
+++ b/addons/web_calendar/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ro.po b/addons/web_calendar/i18n/ro.po
index 259d4af9e97..7330717a12f 100644
--- a/addons/web_calendar/i18n/ro.po
+++ b/addons/web_calendar/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/ru.po b/addons/web_calendar/i18n/ru.po
index c05bfa412a7..c008cd4c8d9 100644
--- a/addons/web_calendar/i18n/ru.po
+++ b/addons/web_calendar/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sk.po b/addons/web_calendar/i18n/sk.po
index fbd38361f81..a883a553bb0 100644
--- a/addons/web_calendar/i18n/sk.po
+++ b/addons/web_calendar/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po
index 0beb34d9597..1c4bd9b561e 100644
--- a/addons/web_calendar/i18n/sl.po
+++ b/addons/web_calendar/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sq.po b/addons/web_calendar/i18n/sq.po
index 9000520351c..a46c7260f98 100644
--- a/addons/web_calendar/i18n/sq.po
+++ b/addons/web_calendar/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sr@latin.po b/addons/web_calendar/i18n/sr@latin.po
index 96d91d4cf46..ad3e1dd7e51 100644
--- a/addons/web_calendar/i18n/sr@latin.po
+++ b/addons/web_calendar/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/sv.po b/addons/web_calendar/i18n/sv.po
index 8d30e7a079e..200498885b4 100644
--- a/addons/web_calendar/i18n/sv.po
+++ b/addons/web_calendar/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/th.po b/addons/web_calendar/i18n/th.po
index 031cf5121f0..5b011a4064c 100644
--- a/addons/web_calendar/i18n/th.po
+++ b/addons/web_calendar/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/tr.po b/addons/web_calendar/i18n/tr.po
index 3392cf4d71b..fbbb944d2bd 100644
--- a/addons/web_calendar/i18n/tr.po
+++ b/addons/web_calendar/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/uk.po b/addons/web_calendar/i18n/uk.po
index a595e1319e9..79710f71a5f 100644
--- a/addons/web_calendar/i18n/uk.po
+++ b/addons/web_calendar/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
index fd151ad7f8c..461b5be591f 100644
--- a/addons/web_calendar/i18n/zh_CN.po
+++ b/addons/web_calendar/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_calendar/i18n/zh_TW.po b/addons/web_calendar/i18n/zh_TW.po
index 62ee8aac6b1..af27ad97ebb 100644
--- a/addons/web_calendar/i18n/zh_TW.po
+++ b/addons/web_calendar/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:05+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ar.po b/addons/web_diagram/i18n/ar.po
index e098fd4037c..f51809830f7 100644
--- a/addons/web_diagram/i18n/ar.po
+++ b/addons/web_diagram/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bg.po b/addons/web_diagram/i18n/bg.po
index 096e17cd797..a2984162998 100644
--- a/addons/web_diagram/i18n/bg.po
+++ b/addons/web_diagram/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bn.po b/addons/web_diagram/i18n/bn.po
index a94862db83f..9e565fc1d94 100644
--- a/addons/web_diagram/i18n/bn.po
+++ b/addons/web_diagram/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
index 50105720772..e42e1cb739b 100644
--- a/addons/web_diagram/i18n/bs.po
+++ b/addons/web_diagram/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ca.po b/addons/web_diagram/i18n/ca.po
index a707d23218c..0d237593f2d 100644
--- a/addons/web_diagram/i18n/ca.po
+++ b/addons/web_diagram/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/cs.po b/addons/web_diagram/i18n/cs.po
index 238d8a1e102..e0832aa9539 100644
--- a/addons/web_diagram/i18n/cs.po
+++ b/addons/web_diagram/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/da.po b/addons/web_diagram/i18n/da.po
index db20550f37d..822c1da5acc 100644
--- a/addons/web_diagram/i18n/da.po
+++ b/addons/web_diagram/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/de.po b/addons/web_diagram/i18n/de.po
index bde90151750..ade55de901b 100644
--- a/addons/web_diagram/i18n/de.po
+++ b/addons/web_diagram/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_AU.po b/addons/web_diagram/i18n/en_AU.po
index ee1ba24821d..4d93da02fba 100644
--- a/addons/web_diagram/i18n/en_AU.po
+++ b/addons/web_diagram/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/en_GB.po b/addons/web_diagram/i18n/en_GB.po
index baa62175495..a77d753a3eb 100644
--- a/addons/web_diagram/i18n/en_GB.po
+++ b/addons/web_diagram/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es.po b/addons/web_diagram/i18n/es.po
index ce8db84cad2..42b60d49fa3 100644
--- a/addons/web_diagram/i18n/es.po
+++ b/addons/web_diagram/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CL.po b/addons/web_diagram/i18n/es_CL.po
index 0178af06296..79afb0692c8 100644
--- a/addons/web_diagram/i18n/es_CL.po
+++ b/addons/web_diagram/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_CR.po b/addons/web_diagram/i18n/es_CR.po
index 7ccdb21500e..cdecbdc43f7 100644
--- a/addons/web_diagram/i18n/es_CR.po
+++ b/addons/web_diagram/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "Language: es\n"
 
 #. module: web_diagram
diff --git a/addons/web_diagram/i18n/es_DO.po b/addons/web_diagram/i18n/es_DO.po
index 0c8d3115d2b..c900b5fe76f 100644
--- a/addons/web_diagram/i18n/es_DO.po
+++ b/addons/web_diagram/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_EC.po b/addons/web_diagram/i18n/es_EC.po
index b5a52eb8995..1d45982c910 100644
--- a/addons/web_diagram/i18n/es_EC.po
+++ b/addons/web_diagram/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_MX.po b/addons/web_diagram/i18n/es_MX.po
index e4a14e0c99e..9f631eb3162 100644
--- a/addons/web_diagram/i18n/es_MX.po
+++ b/addons/web_diagram/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/es_PE.po b/addons/web_diagram/i18n/es_PE.po
index 0c2473126ed..344818ed273 100644
--- a/addons/web_diagram/i18n/es_PE.po
+++ b/addons/web_diagram/i18n/es_PE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index 3212778c79f..91e82ff5f66 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fa.po b/addons/web_diagram/i18n/fa.po
index 7d0a87ff008..3026dcd92ae 100644
--- a/addons/web_diagram/i18n/fa.po
+++ b/addons/web_diagram/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fi.po b/addons/web_diagram/i18n/fi.po
index 4e2cb424048..634c345fd80 100644
--- a/addons/web_diagram/i18n/fi.po
+++ b/addons/web_diagram/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/fr.po b/addons/web_diagram/i18n/fr.po
index 88a25091843..fc1dd64af81 100644
--- a/addons/web_diagram/i18n/fr.po
+++ b/addons/web_diagram/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gl.po b/addons/web_diagram/i18n/gl.po
index fb181559208..39a1f1b9f80 100644
--- a/addons/web_diagram/i18n/gl.po
+++ b/addons/web_diagram/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/gu.po b/addons/web_diagram/i18n/gu.po
index 07069233045..a755ce3e54d 100644
--- a/addons/web_diagram/i18n/gu.po
+++ b/addons/web_diagram/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hr.po b/addons/web_diagram/i18n/hr.po
index b70eccad7c6..4a4bdbc3979 100644
--- a/addons/web_diagram/i18n/hr.po
+++ b/addons/web_diagram/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/hu.po b/addons/web_diagram/i18n/hu.po
index 656b43128d5..53b98831962 100644
--- a/addons/web_diagram/i18n/hu.po
+++ b/addons/web_diagram/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/id.po b/addons/web_diagram/i18n/id.po
index 281e69c170c..ac76dc91d3b 100644
--- a/addons/web_diagram/i18n/id.po
+++ b/addons/web_diagram/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/it.po b/addons/web_diagram/i18n/it.po
index c255369afbb..f1906c5773e 100644
--- a/addons/web_diagram/i18n/it.po
+++ b/addons/web_diagram/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ja.po b/addons/web_diagram/i18n/ja.po
index 34654f6f66f..58677f458e7 100644
--- a/addons/web_diagram/i18n/ja.po
+++ b/addons/web_diagram/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ka.po b/addons/web_diagram/i18n/ka.po
index 1331d47a660..234846c2808 100644
--- a/addons/web_diagram/i18n/ka.po
+++ b/addons/web_diagram/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ko.po b/addons/web_diagram/i18n/ko.po
index e745be6e531..47c7ab195a0 100644
--- a/addons/web_diagram/i18n/ko.po
+++ b/addons/web_diagram/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/lt.po b/addons/web_diagram/i18n/lt.po
index 95acba6d544..5eeeb28ae23 100644
--- a/addons/web_diagram/i18n/lt.po
+++ b/addons/web_diagram/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mk.po b/addons/web_diagram/i18n/mk.po
index ed0007d214e..9168e6d88fe 100644
--- a/addons/web_diagram/i18n/mk.po
+++ b/addons/web_diagram/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/mn.po b/addons/web_diagram/i18n/mn.po
index 933479b6ce7..3e89e4a8589 100644
--- a/addons/web_diagram/i18n/mn.po
+++ b/addons/web_diagram/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nb.po b/addons/web_diagram/i18n/nb.po
index bdf0030aa56..13f99f83753 100644
--- a/addons/web_diagram/i18n/nb.po
+++ b/addons/web_diagram/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl.po b/addons/web_diagram/i18n/nl.po
index 2113ca2023f..8c14f165aef 100644
--- a/addons/web_diagram/i18n/nl.po
+++ b/addons/web_diagram/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
index d6ab2df43ce..e27215a197c 100644
--- a/addons/web_diagram/i18n/nl_BE.po
+++ b/addons/web_diagram/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pl.po b/addons/web_diagram/i18n/pl.po
index fa33ef9aba2..4b0d8459bf9 100644
--- a/addons/web_diagram/i18n/pl.po
+++ b/addons/web_diagram/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index 5a954ecf88b..e2a5ffd4c0d 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
index 2ffdb0067b8..598dfda63e3 100644
--- a/addons/web_diagram/i18n/pt_BR.po
+++ b/addons/web_diagram/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ro.po b/addons/web_diagram/i18n/ro.po
index 39d9a86a191..76e4c911880 100644
--- a/addons/web_diagram/i18n/ro.po
+++ b/addons/web_diagram/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po
index 497b0d04ec8..7f687bcf68b 100644
--- a/addons/web_diagram/i18n/ru.po
+++ b/addons/web_diagram/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sl.po b/addons/web_diagram/i18n/sl.po
index ddfed94a449..880ad51f9dd 100644
--- a/addons/web_diagram/i18n/sl.po
+++ b/addons/web_diagram/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sq.po b/addons/web_diagram/i18n/sq.po
index e334dbd365c..fd608ff1875 100644
--- a/addons/web_diagram/i18n/sq.po
+++ b/addons/web_diagram/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sr@latin.po b/addons/web_diagram/i18n/sr@latin.po
index da6814f27e7..d4fd84308d2 100644
--- a/addons/web_diagram/i18n/sr@latin.po
+++ b/addons/web_diagram/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
index 315e6ccb186..a3653945326 100644
--- a/addons/web_diagram/i18n/sv.po
+++ b/addons/web_diagram/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/th.po b/addons/web_diagram/i18n/th.po
index 8cda71e3947..eff432a0df5 100644
--- a/addons/web_diagram/i18n/th.po
+++ b/addons/web_diagram/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/tr.po b/addons/web_diagram/i18n/tr.po
index 09b6d484cd2..71ee6bfb465 100644
--- a/addons/web_diagram/i18n/tr.po
+++ b/addons/web_diagram/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
index 913bc07900c..695715df877 100644
--- a/addons/web_diagram/i18n/zh_CN.po
+++ b/addons/web_diagram/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_diagram/i18n/zh_TW.po b/addons/web_diagram/i18n/zh_TW.po
index 64ad3c79896..540d255cc92 100644
--- a/addons/web_diagram/i18n/zh_TW.po
+++ b/addons/web_diagram/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ar.po b/addons/web_gantt/i18n/ar.po
index 4989064024d..7a5a7ff5e11 100644
--- a/addons/web_gantt/i18n/ar.po
+++ b/addons/web_gantt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bg.po b/addons/web_gantt/i18n/bg.po
index 0f8ad46e8a9..119c35b9060 100644
--- a/addons/web_gantt/i18n/bg.po
+++ b/addons/web_gantt/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bn.po b/addons/web_gantt/i18n/bn.po
index feead27e2a8..093960efa0b 100644
--- a/addons/web_gantt/i18n/bn.po
+++ b/addons/web_gantt/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
index 2c872beb060..3e129f75664 100644
--- a/addons/web_gantt/i18n/bs.po
+++ b/addons/web_gantt/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ca.po b/addons/web_gantt/i18n/ca.po
index 864b4b9daca..bdf4e808586 100644
--- a/addons/web_gantt/i18n/ca.po
+++ b/addons/web_gantt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/cs.po b/addons/web_gantt/i18n/cs.po
index 9d498deff0c..8b83cca8d4c 100644
--- a/addons/web_gantt/i18n/cs.po
+++ b/addons/web_gantt/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_gantt
diff --git a/addons/web_gantt/i18n/da.po b/addons/web_gantt/i18n/da.po
index 4c820a2c461..f961d3c05ea 100644
--- a/addons/web_gantt/i18n/da.po
+++ b/addons/web_gantt/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/de.po b/addons/web_gantt/i18n/de.po
index 97e340f05e9..aea0f55659b 100644
--- a/addons/web_gantt/i18n/de.po
+++ b/addons/web_gantt/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_AU.po b/addons/web_gantt/i18n/en_AU.po
index 7d9f5cb3f25..47d0a527609 100644
--- a/addons/web_gantt/i18n/en_AU.po
+++ b/addons/web_gantt/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/en_GB.po b/addons/web_gantt/i18n/en_GB.po
index 0d7d5eafac1..2fbe52d48ce 100644
--- a/addons/web_gantt/i18n/en_GB.po
+++ b/addons/web_gantt/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es.po b/addons/web_gantt/i18n/es.po
index 4156d286f8d..1f7a99e72e3 100644
--- a/addons/web_gantt/i18n/es.po
+++ b/addons/web_gantt/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CL.po b/addons/web_gantt/i18n/es_CL.po
index cef802e1d06..9bc637f632a 100644
--- a/addons/web_gantt/i18n/es_CL.po
+++ b/addons/web_gantt/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_CR.po b/addons/web_gantt/i18n/es_CR.po
index d07797a454f..4674b91865a 100644
--- a/addons/web_gantt/i18n/es_CR.po
+++ b/addons/web_gantt/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_DO.po b/addons/web_gantt/i18n/es_DO.po
index 73bebeff31a..580087040f6 100644
--- a/addons/web_gantt/i18n/es_DO.po
+++ b/addons/web_gantt/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_EC.po b/addons/web_gantt/i18n/es_EC.po
index c5b58f4f5ff..3737dc9a904 100644
--- a/addons/web_gantt/i18n/es_EC.po
+++ b/addons/web_gantt/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/es_MX.po b/addons/web_gantt/i18n/es_MX.po
index 7b3bfe11ea0..13cd1ddae4e 100644
--- a/addons/web_gantt/i18n/es_MX.po
+++ b/addons/web_gantt/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/et.po b/addons/web_gantt/i18n/et.po
index 59ab0ff0717..d4b2a5c416c 100644
--- a/addons/web_gantt/i18n/et.po
+++ b/addons/web_gantt/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fa.po b/addons/web_gantt/i18n/fa.po
index b401101fb25..5708a0980e6 100644
--- a/addons/web_gantt/i18n/fa.po
+++ b/addons/web_gantt/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fi.po b/addons/web_gantt/i18n/fi.po
index ccac39e12f6..25e4296045b 100644
--- a/addons/web_gantt/i18n/fi.po
+++ b/addons/web_gantt/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/fr.po b/addons/web_gantt/i18n/fr.po
index 16411a8a9b9..9b3e81022f7 100644
--- a/addons/web_gantt/i18n/fr.po
+++ b/addons/web_gantt/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gl.po b/addons/web_gantt/i18n/gl.po
index db4a3d06d19..f3e3a177e08 100644
--- a/addons/web_gantt/i18n/gl.po
+++ b/addons/web_gantt/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/gu.po b/addons/web_gantt/i18n/gu.po
index 0ee3cc1e161..f0d6b5b5810 100644
--- a/addons/web_gantt/i18n/gu.po
+++ b/addons/web_gantt/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/he.po b/addons/web_gantt/i18n/he.po
index ef11809cc40..f415a523c6c 100644
--- a/addons/web_gantt/i18n/he.po
+++ b/addons/web_gantt/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hr.po b/addons/web_gantt/i18n/hr.po
index 9cd49a68240..3bd136ac7d4 100644
--- a/addons/web_gantt/i18n/hr.po
+++ b/addons/web_gantt/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/hu.po b/addons/web_gantt/i18n/hu.po
index bc5564ed08a..9ff6bb347d1 100644
--- a/addons/web_gantt/i18n/hu.po
+++ b/addons/web_gantt/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/it.po b/addons/web_gantt/i18n/it.po
index 96c6d1051b2..ba541496439 100644
--- a/addons/web_gantt/i18n/it.po
+++ b/addons/web_gantt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ja.po b/addons/web_gantt/i18n/ja.po
index 965a039152c..1dfd09b0fa0 100644
--- a/addons/web_gantt/i18n/ja.po
+++ b/addons/web_gantt/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ka.po b/addons/web_gantt/i18n/ka.po
index 2905d787256..42eacc4dbc3 100644
--- a/addons/web_gantt/i18n/ka.po
+++ b/addons/web_gantt/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ko.po b/addons/web_gantt/i18n/ko.po
index e0711971946..d1f31017180 100644
--- a/addons/web_gantt/i18n/ko.po
+++ b/addons/web_gantt/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lo.po b/addons/web_gantt/i18n/lo.po
index dda38a1b5ef..0c36d238439 100644
--- a/addons/web_gantt/i18n/lo.po
+++ b/addons/web_gantt/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/lt.po b/addons/web_gantt/i18n/lt.po
index 7469620555d..34f187d9187 100644
--- a/addons/web_gantt/i18n/lt.po
+++ b/addons/web_gantt/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mk.po b/addons/web_gantt/i18n/mk.po
index f8eded51083..27ee6295df6 100644
--- a/addons/web_gantt/i18n/mk.po
+++ b/addons/web_gantt/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/mn.po b/addons/web_gantt/i18n/mn.po
index cd2de80b5b4..b021cf38b84 100644
--- a/addons/web_gantt/i18n/mn.po
+++ b/addons/web_gantt/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nb.po b/addons/web_gantt/i18n/nb.po
index bfcd5675eec..643d2c644bb 100644
--- a/addons/web_gantt/i18n/nb.po
+++ b/addons/web_gantt/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl.po b/addons/web_gantt/i18n/nl.po
index a5ed886619c..5d3d398cde5 100644
--- a/addons/web_gantt/i18n/nl.po
+++ b/addons/web_gantt/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/nl_BE.po b/addons/web_gantt/i18n/nl_BE.po
index 129f697c0d2..6b6c5b60e52 100644
--- a/addons/web_gantt/i18n/nl_BE.po
+++ b/addons/web_gantt/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pl.po b/addons/web_gantt/i18n/pl.po
index 5a924f6c503..f87ae762265 100644
--- a/addons/web_gantt/i18n/pl.po
+++ b/addons/web_gantt/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt.po b/addons/web_gantt/i18n/pt.po
index 5465bce746f..427c523b8b9 100644
--- a/addons/web_gantt/i18n/pt.po
+++ b/addons/web_gantt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
index 7260bc3ca58..3ad6c8a3fae 100644
--- a/addons/web_gantt/i18n/pt_BR.po
+++ b/addons/web_gantt/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ro.po b/addons/web_gantt/i18n/ro.po
index 3edad8d3c37..358e32dbc74 100644
--- a/addons/web_gantt/i18n/ro.po
+++ b/addons/web_gantt/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/ru.po b/addons/web_gantt/i18n/ru.po
index eeb66ebe0c0..f7301518a5d 100644
--- a/addons/web_gantt/i18n/ru.po
+++ b/addons/web_gantt/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sl.po b/addons/web_gantt/i18n/sl.po
index 5c19a5ce182..e0e5a579fcc 100644
--- a/addons/web_gantt/i18n/sl.po
+++ b/addons/web_gantt/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sq.po b/addons/web_gantt/i18n/sq.po
index a983312d591..86c52195aa3 100644
--- a/addons/web_gantt/i18n/sq.po
+++ b/addons/web_gantt/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sr@latin.po b/addons/web_gantt/i18n/sr@latin.po
index b518f17e88f..9cb29e6b749 100644
--- a/addons/web_gantt/i18n/sr@latin.po
+++ b/addons/web_gantt/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/sv.po b/addons/web_gantt/i18n/sv.po
index af11760dd8e..2104dd98490 100644
--- a/addons/web_gantt/i18n/sv.po
+++ b/addons/web_gantt/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/th.po b/addons/web_gantt/i18n/th.po
index a5ef8fced8c..cc78b394cf0 100644
--- a/addons/web_gantt/i18n/th.po
+++ b/addons/web_gantt/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/tr.po b/addons/web_gantt/i18n/tr.po
index 1c59704772c..e361d774f90 100644
--- a/addons/web_gantt/i18n/tr.po
+++ b/addons/web_gantt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_gantt/i18n/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
index 5b8e066f622..7cb2eec9c04 100644
--- a/addons/web_gantt/i18n/zh_CN.po
+++ b/addons/web_gantt/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_gantt
 #. openerp-web
diff --git a/addons/web_graph/i18n/ar.po b/addons/web_graph/i18n/ar.po
index 0b7a6301b4d..efe20513958 100644
--- a/addons/web_graph/i18n/ar.po
+++ b/addons/web_graph/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
index 75bc312d32e..de5de09bdcb 100644
--- a/addons/web_graph/i18n/bg.po
+++ b/addons/web_graph/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bn.po b/addons/web_graph/i18n/bn.po
index 73acb54d1b9..d05a91bd4ed 100644
--- a/addons/web_graph/i18n/bn.po
+++ b/addons/web_graph/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
index 34227dabfd0..356dd6ca5de 100644
--- a/addons/web_graph/i18n/bs.po
+++ b/addons/web_graph/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ca.po b/addons/web_graph/i18n/ca.po
index a7c0e09b6fe..e1d5af153a1 100644
--- a/addons/web_graph/i18n/ca.po
+++ b/addons/web_graph/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/cs.po b/addons/web_graph/i18n/cs.po
index 0c1e3bf466e..ef6895e739f 100644
--- a/addons/web_graph/i18n/cs.po
+++ b/addons/web_graph/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/da.po b/addons/web_graph/i18n/da.po
index 0070e52915b..d401a27e2b9 100644
--- a/addons/web_graph/i18n/da.po
+++ b/addons/web_graph/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/de.po b/addons/web_graph/i18n/de.po
index 08276aed21a..6cbeba9d1b1 100644
--- a/addons/web_graph/i18n/de.po
+++ b/addons/web_graph/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_AU.po b/addons/web_graph/i18n/en_AU.po
index e15f21f8eee..695f15b1fea 100644
--- a/addons/web_graph/i18n/en_AU.po
+++ b/addons/web_graph/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/en_GB.po b/addons/web_graph/i18n/en_GB.po
index 25b7e274801..d874233da0b 100644
--- a/addons/web_graph/i18n/en_GB.po
+++ b/addons/web_graph/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es.po b/addons/web_graph/i18n/es.po
index 1bb88ca218d..3cb73d1d8bb 100644
--- a/addons/web_graph/i18n/es.po
+++ b/addons/web_graph/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CL.po b/addons/web_graph/i18n/es_CL.po
index a44c4f54f8d..214d299e503 100644
--- a/addons/web_graph/i18n/es_CL.po
+++ b/addons/web_graph/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_CR.po b/addons/web_graph/i18n/es_CR.po
index 5231e8f9062..3eaa8b7a0e9 100644
--- a/addons/web_graph/i18n/es_CR.po
+++ b/addons/web_graph/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_DO.po b/addons/web_graph/i18n/es_DO.po
index 0875ad36388..36a2b86cbbe 100644
--- a/addons/web_graph/i18n/es_DO.po
+++ b/addons/web_graph/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_EC.po b/addons/web_graph/i18n/es_EC.po
index bb0f31530e7..fa5d6bd759f 100644
--- a/addons/web_graph/i18n/es_EC.po
+++ b/addons/web_graph/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/es_MX.po b/addons/web_graph/i18n/es_MX.po
index 34ae98a1e48..d0c2321ce0a 100644
--- a/addons/web_graph/i18n/es_MX.po
+++ b/addons/web_graph/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index 5c23c5d0171..9ff87f75c62 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fa.po b/addons/web_graph/i18n/fa.po
index 85366484e61..06b2a713ee9 100644
--- a/addons/web_graph/i18n/fa.po
+++ b/addons/web_graph/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index ea8723df3ee..47ec843f911 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr.po b/addons/web_graph/i18n/fr.po
index 032c7ca0c3f..56acb73ecaa 100644
--- a/addons/web_graph/i18n/fr.po
+++ b/addons/web_graph/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
index dfe08dbb8e5..c8212c862e0 100644
--- a/addons/web_graph/i18n/fr_CA.po
+++ b/addons/web_graph/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gl.po b/addons/web_graph/i18n/gl.po
index e7c68f4ddec..75f586110a3 100644
--- a/addons/web_graph/i18n/gl.po
+++ b/addons/web_graph/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/gu.po b/addons/web_graph/i18n/gu.po
index 2cfd8762b6b..c1d4fd958a8 100644
--- a/addons/web_graph/i18n/gu.po
+++ b/addons/web_graph/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/he.po b/addons/web_graph/i18n/he.po
index 3343a74461b..8771ca2ac8e 100644
--- a/addons/web_graph/i18n/he.po
+++ b/addons/web_graph/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hr.po b/addons/web_graph/i18n/hr.po
index 678b5627594..711e0fa7791 100644
--- a/addons/web_graph/i18n/hr.po
+++ b/addons/web_graph/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/hu.po b/addons/web_graph/i18n/hu.po
index 770c3627286..9dfdb8516a3 100644
--- a/addons/web_graph/i18n/hu.po
+++ b/addons/web_graph/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/it.po b/addons/web_graph/i18n/it.po
index 5469197035f..c3671ec8f94 100644
--- a/addons/web_graph/i18n/it.po
+++ b/addons/web_graph/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ja.po b/addons/web_graph/i18n/ja.po
index a54276493c0..8f3e8a00f66 100644
--- a/addons/web_graph/i18n/ja.po
+++ b/addons/web_graph/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ka.po b/addons/web_graph/i18n/ka.po
index 62905156a3d..a4953acd124 100644
--- a/addons/web_graph/i18n/ka.po
+++ b/addons/web_graph/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ko.po b/addons/web_graph/i18n/ko.po
index 18f374c9231..8486ff01c0b 100644
--- a/addons/web_graph/i18n/ko.po
+++ b/addons/web_graph/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/lt.po b/addons/web_graph/i18n/lt.po
index 3f4651370ea..2f37a47e928 100644
--- a/addons/web_graph/i18n/lt.po
+++ b/addons/web_graph/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mk.po b/addons/web_graph/i18n/mk.po
index e81b1ff911d..30ab0b0927e 100644
--- a/addons/web_graph/i18n/mk.po
+++ b/addons/web_graph/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/mn.po b/addons/web_graph/i18n/mn.po
index 33a084dad4d..e736d22e617 100644
--- a/addons/web_graph/i18n/mn.po
+++ b/addons/web_graph/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nb.po b/addons/web_graph/i18n/nb.po
index 2f11d249fc4..321f28a9f97 100644
--- a/addons/web_graph/i18n/nb.po
+++ b/addons/web_graph/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl.po b/addons/web_graph/i18n/nl.po
index e466ec85e3a..f3e30636d50 100644
--- a/addons/web_graph/i18n/nl.po
+++ b/addons/web_graph/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/nl_BE.po b/addons/web_graph/i18n/nl_BE.po
index b6a1da2b790..4ee999e893b 100644
--- a/addons/web_graph/i18n/nl_BE.po
+++ b/addons/web_graph/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pl.po b/addons/web_graph/i18n/pl.po
index 1307b9e00a5..0034b9b9204 100644
--- a/addons/web_graph/i18n/pl.po
+++ b/addons/web_graph/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt.po b/addons/web_graph/i18n/pt.po
index a5a9768466a..376bb8f588e 100644
--- a/addons/web_graph/i18n/pt.po
+++ b/addons/web_graph/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
index 7d3d50cca49..9f4572ed7d2 100644
--- a/addons/web_graph/i18n/pt_BR.po
+++ b/addons/web_graph/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ro.po b/addons/web_graph/i18n/ro.po
index 8787a7c8d73..63d04e9f375 100644
--- a/addons/web_graph/i18n/ro.po
+++ b/addons/web_graph/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/ru.po b/addons/web_graph/i18n/ru.po
index c8beaab41d6..108dfef5cb5 100644
--- a/addons/web_graph/i18n/ru.po
+++ b/addons/web_graph/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sl.po b/addons/web_graph/i18n/sl.po
index ba89edfba51..74f796a0191 100644
--- a/addons/web_graph/i18n/sl.po
+++ b/addons/web_graph/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sq.po b/addons/web_graph/i18n/sq.po
index 0ea68d2a07a..6c374ae47c9 100644
--- a/addons/web_graph/i18n/sq.po
+++ b/addons/web_graph/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sr@latin.po b/addons/web_graph/i18n/sr@latin.po
index 539ace093e9..76be580ec80 100644
--- a/addons/web_graph/i18n/sr@latin.po
+++ b/addons/web_graph/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
index d424ca1dbf9..f978cef13a1 100644
--- a/addons/web_graph/i18n/sv.po
+++ b/addons/web_graph/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/th.po b/addons/web_graph/i18n/th.po
index 9a4bb1c2aa4..d43ca8a862e 100644
--- a/addons/web_graph/i18n/th.po
+++ b/addons/web_graph/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/tr.po b/addons/web_graph/i18n/tr.po
index a32dfa621b9..61c623ffec7 100644
--- a/addons/web_graph/i18n/tr.po
+++ b/addons/web_graph/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index 38e2bccd035..978d2ae5598 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ar.po b/addons/web_kanban/i18n/ar.po
index 8c23c56f3e5..f337bc0b8a9 100644
--- a/addons/web_kanban/i18n/ar.po
+++ b/addons/web_kanban/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bg.po b/addons/web_kanban/i18n/bg.po
index 7b85bf29042..4f4a00e3157 100644
--- a/addons/web_kanban/i18n/bg.po
+++ b/addons/web_kanban/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bn.po b/addons/web_kanban/i18n/bn.po
index 5255af27cd9..6491f124ae7 100644
--- a/addons/web_kanban/i18n/bn.po
+++ b/addons/web_kanban/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
index e15fe4b1e2d..3918b829b75 100644
--- a/addons/web_kanban/i18n/bs.po
+++ b/addons/web_kanban/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ca.po b/addons/web_kanban/i18n/ca.po
index dcfd4e39427..df3b2b4674c 100644
--- a/addons/web_kanban/i18n/ca.po
+++ b/addons/web_kanban/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/cs.po b/addons/web_kanban/i18n/cs.po
index c41785f6136..1781c835f3e 100644
--- a/addons/web_kanban/i18n/cs.po
+++ b/addons/web_kanban/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: web_kanban
diff --git a/addons/web_kanban/i18n/da.po b/addons/web_kanban/i18n/da.po
index be8cc66c445..f35d1cbf1ea 100644
--- a/addons/web_kanban/i18n/da.po
+++ b/addons/web_kanban/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 44564bbd4f4..fd8a74b9a55 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_AU.po b/addons/web_kanban/i18n/en_AU.po
index 6f46a647246..cec220f0614 100644
--- a/addons/web_kanban/i18n/en_AU.po
+++ b/addons/web_kanban/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/en_GB.po b/addons/web_kanban/i18n/en_GB.po
index 80bf6bd65aa..be1dc806051 100644
--- a/addons/web_kanban/i18n/en_GB.po
+++ b/addons/web_kanban/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es.po b/addons/web_kanban/i18n/es.po
index 8745aa7293c..29c6e7c6889 100644
--- a/addons/web_kanban/i18n/es.po
+++ b/addons/web_kanban/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CL.po b/addons/web_kanban/i18n/es_CL.po
index ca46818404e..a5b3998d42a 100644
--- a/addons/web_kanban/i18n/es_CL.po
+++ b/addons/web_kanban/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_CR.po b/addons/web_kanban/i18n/es_CR.po
index 9049b7544df..25df2cb5cdf 100644
--- a/addons/web_kanban/i18n/es_CR.po
+++ b/addons/web_kanban/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_DO.po b/addons/web_kanban/i18n/es_DO.po
index 74fb555fe5e..cd6843b7058 100644
--- a/addons/web_kanban/i18n/es_DO.po
+++ b/addons/web_kanban/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_EC.po b/addons/web_kanban/i18n/es_EC.po
index 5b56747daf2..3e2149e9690 100644
--- a/addons/web_kanban/i18n/es_EC.po
+++ b/addons/web_kanban/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/es_MX.po b/addons/web_kanban/i18n/es_MX.po
index 7ef5a290531..fe9d0141986 100644
--- a/addons/web_kanban/i18n/es_MX.po
+++ b/addons/web_kanban/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index 5c6009ce367..8dcfb41064d 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index b031613e6f2..6eaa2bdc0b6 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fi.po b/addons/web_kanban/i18n/fi.po
index f3f8bfb2d2b..5fd09e920d6 100644
--- a/addons/web_kanban/i18n/fi.po
+++ b/addons/web_kanban/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr.po b/addons/web_kanban/i18n/fr.po
index b93ee73d4b5..8b9197242d3 100644
--- a/addons/web_kanban/i18n/fr.po
+++ b/addons/web_kanban/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
index 60dfae61e9f..e05bef70cc7 100644
--- a/addons/web_kanban/i18n/fr_CA.po
+++ b/addons/web_kanban/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gl.po b/addons/web_kanban/i18n/gl.po
index 1ec9bc1a1fa..e6e15f0f580 100644
--- a/addons/web_kanban/i18n/gl.po
+++ b/addons/web_kanban/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/gu.po b/addons/web_kanban/i18n/gu.po
index 408f83ab97c..edb71794e66 100644
--- a/addons/web_kanban/i18n/gu.po
+++ b/addons/web_kanban/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/he.po b/addons/web_kanban/i18n/he.po
index e482f787efc..29795dc2504 100644
--- a/addons/web_kanban/i18n/he.po
+++ b/addons/web_kanban/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hr.po b/addons/web_kanban/i18n/hr.po
index b2162e1712b..5705fce306f 100644
--- a/addons/web_kanban/i18n/hr.po
+++ b/addons/web_kanban/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/hu.po b/addons/web_kanban/i18n/hu.po
index f8c84453875..ac46ca8cbef 100644
--- a/addons/web_kanban/i18n/hu.po
+++ b/addons/web_kanban/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/it.po b/addons/web_kanban/i18n/it.po
index 43c86d50a8e..fbc2b6ace49 100644
--- a/addons/web_kanban/i18n/it.po
+++ b/addons/web_kanban/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ja.po b/addons/web_kanban/i18n/ja.po
index ed3c1e5b757..4e066bc9641 100644
--- a/addons/web_kanban/i18n/ja.po
+++ b/addons/web_kanban/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ka.po b/addons/web_kanban/i18n/ka.po
index f225fb5d2f1..62e41d3d6dd 100644
--- a/addons/web_kanban/i18n/ka.po
+++ b/addons/web_kanban/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ko.po b/addons/web_kanban/i18n/ko.po
index efab97366f1..53eb527eb14 100644
--- a/addons/web_kanban/i18n/ko.po
+++ b/addons/web_kanban/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/lt.po b/addons/web_kanban/i18n/lt.po
index ab3899aad71..36a65008353 100644
--- a/addons/web_kanban/i18n/lt.po
+++ b/addons/web_kanban/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mk.po b/addons/web_kanban/i18n/mk.po
index 45421e7db6a..d8f1ea4bf0d 100644
--- a/addons/web_kanban/i18n/mk.po
+++ b/addons/web_kanban/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/mn.po b/addons/web_kanban/i18n/mn.po
index 3271fc9609f..679f3e606c2 100644
--- a/addons/web_kanban/i18n/mn.po
+++ b/addons/web_kanban/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nb.po b/addons/web_kanban/i18n/nb.po
index badedfddfbd..9b252a1f234 100644
--- a/addons/web_kanban/i18n/nb.po
+++ b/addons/web_kanban/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 228bcecbf15..054065cb549 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/nl_BE.po b/addons/web_kanban/i18n/nl_BE.po
index d61a8c94e49..22d45529ef8 100644
--- a/addons/web_kanban/i18n/nl_BE.po
+++ b/addons/web_kanban/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pl.po b/addons/web_kanban/i18n/pl.po
index 96d8ca8ca13..53a09c39079 100644
--- a/addons/web_kanban/i18n/pl.po
+++ b/addons/web_kanban/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index c9ebabc9cf6..f9eacc2a677 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt_BR.po b/addons/web_kanban/i18n/pt_BR.po
index a00620c8e65..583d9025f82 100644
--- a/addons/web_kanban/i18n/pt_BR.po
+++ b/addons/web_kanban/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ro.po b/addons/web_kanban/i18n/ro.po
index f766af1a173..7a2d72b4767 100644
--- a/addons/web_kanban/i18n/ro.po
+++ b/addons/web_kanban/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po
index fe819240891..0e1e001c0a9 100644
--- a/addons/web_kanban/i18n/ru.po
+++ b/addons/web_kanban/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sl.po b/addons/web_kanban/i18n/sl.po
index ccbed123cf6..97bfd11c8ce 100644
--- a/addons/web_kanban/i18n/sl.po
+++ b/addons/web_kanban/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sr@latin.po b/addons/web_kanban/i18n/sr@latin.po
index 2d493eeb167..f2cb3ac2e7d 100644
--- a/addons/web_kanban/i18n/sr@latin.po
+++ b/addons/web_kanban/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
index 1a4e4519949..e9d1d651449 100644
--- a/addons/web_kanban/i18n/sv.po
+++ b/addons/web_kanban/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/th.po b/addons/web_kanban/i18n/th.po
index aab2857db3c..b5ea15a9b5c 100644
--- a/addons/web_kanban/i18n/th.po
+++ b/addons/web_kanban/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/tr.po b/addons/web_kanban/i18n/tr.po
index acf29c247c5..fbf668ee177 100644
--- a/addons/web_kanban/i18n/tr.po
+++ b/addons/web_kanban/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_CN.po b/addons/web_kanban/i18n/zh_CN.po
index 6b1af7e7bd0..34368044ba2 100644
--- a/addons/web_kanban/i18n/zh_CN.po
+++ b/addons/web_kanban/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_kanban/i18n/zh_TW.po b/addons/web_kanban/i18n/zh_TW.po
index 67f98d22281..f7791865771 100644
--- a/addons/web_kanban/i18n/zh_TW.po
+++ b/addons/web_kanban/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ar.po b/addons/web_view_editor/i18n/ar.po
index b5b611f1e3d..fa2d683781a 100644
--- a/addons/web_view_editor/i18n/ar.po
+++ b/addons/web_view_editor/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/bs.po b/addons/web_view_editor/i18n/bs.po
index 5491b9bcf35..b9e47b49ca1 100644
--- a/addons/web_view_editor/i18n/bs.po
+++ b/addons/web_view_editor/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/cs.po b/addons/web_view_editor/i18n/cs.po
index 31621044526..98996988176 100644
--- a/addons/web_view_editor/i18n/cs.po
+++ b/addons/web_view_editor/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/da.po b/addons/web_view_editor/i18n/da.po
index 167d9f98752..882ef8a5676 100644
--- a/addons/web_view_editor/i18n/da.po
+++ b/addons/web_view_editor/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/de.po b/addons/web_view_editor/i18n/de.po
index c5fa9d955cf..337a5a683bb 100644
--- a/addons/web_view_editor/i18n/de.po
+++ b/addons/web_view_editor/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_AU.po b/addons/web_view_editor/i18n/en_AU.po
index 829719da4f1..8c77fa8bb76 100644
--- a/addons/web_view_editor/i18n/en_AU.po
+++ b/addons/web_view_editor/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/en_GB.po b/addons/web_view_editor/i18n/en_GB.po
index e9f19d52177..2a2714693c8 100644
--- a/addons/web_view_editor/i18n/en_GB.po
+++ b/addons/web_view_editor/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es.po b/addons/web_view_editor/i18n/es.po
index e017668130a..a7835ada453 100644
--- a/addons/web_view_editor/i18n/es.po
+++ b/addons/web_view_editor/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_DO.po b/addons/web_view_editor/i18n/es_DO.po
index 196b4a6ad7c..1f0737ca838 100644
--- a/addons/web_view_editor/i18n/es_DO.po
+++ b/addons/web_view_editor/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_EC.po b/addons/web_view_editor/i18n/es_EC.po
index c6aa6e122cd..9b7a241fd91 100644
--- a/addons/web_view_editor/i18n/es_EC.po
+++ b/addons/web_view_editor/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/es_MX.po b/addons/web_view_editor/i18n/es_MX.po
index 77ab9df4862..4e219f905b4 100644
--- a/addons/web_view_editor/i18n/es_MX.po
+++ b/addons/web_view_editor/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index b7e434f21cb..f6fc91b0510 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index 8dfeb8d96ec..2a909d3e82b 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fi.po b/addons/web_view_editor/i18n/fi.po
index 6ae1be3dca6..26ce98340a6 100644
--- a/addons/web_view_editor/i18n/fi.po
+++ b/addons/web_view_editor/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fr.po b/addons/web_view_editor/i18n/fr.po
index b3aecd6f840..cbe3af78d98 100644
--- a/addons/web_view_editor/i18n/fr.po
+++ b/addons/web_view_editor/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/he.po b/addons/web_view_editor/i18n/he.po
index ef5670e2fb7..027ddbd7600 100644
--- a/addons/web_view_editor/i18n/he.po
+++ b/addons/web_view_editor/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hr.po b/addons/web_view_editor/i18n/hr.po
index a9245bfd1e6..f1a5dbe6078 100644
--- a/addons/web_view_editor/i18n/hr.po
+++ b/addons/web_view_editor/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/hu.po b/addons/web_view_editor/i18n/hu.po
index 9444e6425be..535584908b3 100644
--- a/addons/web_view_editor/i18n/hu.po
+++ b/addons/web_view_editor/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/it.po b/addons/web_view_editor/i18n/it.po
index 5a30a033228..35304df56df 100644
--- a/addons/web_view_editor/i18n/it.po
+++ b/addons/web_view_editor/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ko.po b/addons/web_view_editor/i18n/ko.po
index 40e48e33339..b87577a0326 100644
--- a/addons/web_view_editor/i18n/ko.po
+++ b/addons/web_view_editor/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index 1511cce777e..e012b5e79a9 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lv.po b/addons/web_view_editor/i18n/lv.po
index 02c4d444031..79a78dd8494 100644
--- a/addons/web_view_editor/i18n/lv.po
+++ b/addons/web_view_editor/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mk.po b/addons/web_view_editor/i18n/mk.po
index c2ca752f654..50992a6ae03 100644
--- a/addons/web_view_editor/i18n/mk.po
+++ b/addons/web_view_editor/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/mn.po b/addons/web_view_editor/i18n/mn.po
index a14c5f8812e..07cdaef96e3 100644
--- a/addons/web_view_editor/i18n/mn.po
+++ b/addons/web_view_editor/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nb.po b/addons/web_view_editor/i18n/nb.po
index 54d68526e39..1a9f99fba84 100644
--- a/addons/web_view_editor/i18n/nb.po
+++ b/addons/web_view_editor/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index 638799e2414..43e5d11fc69 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/nl_BE.po b/addons/web_view_editor/i18n/nl_BE.po
index 0e952e32338..c098de46242 100644
--- a/addons/web_view_editor/i18n/nl_BE.po
+++ b/addons/web_view_editor/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pl.po b/addons/web_view_editor/i18n/pl.po
index 810f2b01f10..76bda2cc253 100644
--- a/addons/web_view_editor/i18n/pl.po
+++ b/addons/web_view_editor/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 1d8bd020bf1..aa54ae77129 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:55+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt_BR.po b/addons/web_view_editor/i18n/pt_BR.po
index 586d7d33a63..414757a65ab 100644
--- a/addons/web_view_editor/i18n/pt_BR.po
+++ b/addons/web_view_editor/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ro.po b/addons/web_view_editor/i18n/ro.po
index cde73c5c9b0..87777beb038 100644
--- a/addons/web_view_editor/i18n/ro.po
+++ b/addons/web_view_editor/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/ru.po b/addons/web_view_editor/i18n/ru.po
index 926d6f999ed..45f82fe55f0 100644
--- a/addons/web_view_editor/i18n/ru.po
+++ b/addons/web_view_editor/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sl.po b/addons/web_view_editor/i18n/sl.po
index 0341fc03363..2116698efdd 100644
--- a/addons/web_view_editor/i18n/sl.po
+++ b/addons/web_view_editor/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/sv.po b/addons/web_view_editor/i18n/sv.po
index 965ba9f2da4..d95e8db549c 100644
--- a/addons/web_view_editor/i18n/sv.po
+++ b/addons/web_view_editor/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/th.po b/addons/web_view_editor/i18n/th.po
index 58fa3740e60..2a93fc19423 100644
--- a/addons/web_view_editor/i18n/th.po
+++ b/addons/web_view_editor/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index e4f46f7bca4..b1f3aa854ef 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/zh_CN.po b/addons/web_view_editor/i18n/zh_CN.po
index 8e1e59f51a9..edfec33a311 100644
--- a/addons/web_view_editor/i18n/zh_CN.po
+++ b/addons/web_view_editor/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 05:56+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:06+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: web_view_editor
 #. openerp-web

From fb64b578e87e8e14bb8fc169fc639f5be13ea8c2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 11:40:22 +0100
Subject: [PATCH 46/56] [IMP] Cleaning Archives

bzr revid: fp@tinyerp.com-20140316104022-fps64jlo8rpssf9m
---
 addons/website_mail_group/__init__.py         |   1 -
 addons/website_mail_group/__openerp__.py      |   5 +-
 addons/website_mail_group/controllers/main.py |  55 ++++----
 addons/website_mail_group/models/__init__.py  |   1 -
 .../website_mail_group/models/mail_group.py   |  25 ----
 .../static/src/css/website_mail_group.css     |   0
 .../views/website_mail_group.xml              | 132 ++++++++++--------
 .../views/website_mail_group_backend.xml      |   5 -
 8 files changed, 103 insertions(+), 121 deletions(-)
 delete mode 100644 addons/website_mail_group/models/__init__.py
 delete mode 100644 addons/website_mail_group/models/mail_group.py
 delete mode 100644 addons/website_mail_group/static/src/css/website_mail_group.css
 delete mode 100644 addons/website_mail_group/views/website_mail_group_backend.xml

diff --git a/addons/website_mail_group/__init__.py b/addons/website_mail_group/__init__.py
index 9f86759e32b..ee5959455ad 100644
--- a/addons/website_mail_group/__init__.py
+++ b/addons/website_mail_group/__init__.py
@@ -1,2 +1 @@
 import controllers
-import models
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index 5681dc31fd3..9ea12329775 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -4,15 +4,14 @@
     'summary': '',
     'version': '1.0',
     'description': """
-OpenERP Mail Group : Mailing List Archive
-==================
+OpenERP Mail Group : Mailing List Archives
+==========================================
 
         """,
     'author': 'OpenERP SA',
     'depends': ['website','mail'],
     'data': [
         'views/website_mail_group.xml',
-        'views/website_mail_group_backend.xml',
         'data/website_mail_group_data.xml',
         'security/website_mail_group.xml',
     ],
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index dc0acce7644..97cb4d03091 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -32,22 +32,14 @@ class MailGroup(http.Controller):
     def view(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        
         group_ids = group_obj.search(cr, uid, [], context=context)
-        values = {
-            'groups': group_obj.browse(cr, uid, group_ids, context),
-        }
+        values = {'groups': group_obj.browse(cr, uid, group_ids, context)}
         return request.website.render('website_mail_group.mail_groups', values)
 
-    @http.route([
-        "/groups/subscription/",
-    ], type='json', auth="public", website=True)
+    @http.route(["/groups/subscription/"], type='json', auth="user")
     def subscription(self, group_id=0, action=False ,**post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
-        public_uid = request.registry['website'].get_public_user(cr , uid, context)
-        if uid == public_uid:
-            return ['is_public']
         if action:
             group_obj.message_subscribe_users(cr, uid, [group_id], context=context)
         else:
@@ -55,41 +47,42 @@ class MailGroup(http.Controller):
         return []
 
     @http.route([
-        "/groups/<model('mail.group'):group>/",
-        "/groups/<model('mail.group'):group>/page/<int:page>/"
+        "/groups/<model('mail.group'):group>/<any(thread,list):mode>",
+        "/groups/<model('mail.group'):group>/<any(thread,list):mode>/page/<int:page>"
     ], type='http', auth="public", website=True)
-    def thread(self, group, page=1, **post):
+    def thread(self, group, mode='thread', page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
-        group_obj = request.registry.get('mail.group')
+
         thread_obj = request.registry.get('mail.message')
-        thread_ids = thread_obj.search(cr, uid, [('model','=','mail.group'), ('res_id','=',group.id), ('parent_id','=',False)])
-        group_ids = group_obj.search(cr, uid, [])
+        domain = [('model','=','mail.group'), ('res_id','=',group.id)]
+        if mode=='thread':
+            domain.append(('parent_id','=',False))
+        thread_count = thread_obj.search_count(cr, uid, domain, context=context)
         pager = request.website.pager(
-            url='/groups/%s/' % group.id,
-            total=len(thread_ids),
+            url='/groups/%s/%s' % (group.id, mode),
+            total=thread_count,
             page=page,
             step=self._thread_per_page,
         )
-        pager_begin = (page - 1) * self._thread_per_page
-        pager_end = page * self._thread_per_page
-        thread_ids = thread_ids[pager_begin:pager_end]
+        thread_ids = thread_obj.search(cr, uid, domain, limit=self._thread_per_page, offset=pager['offset'])
+
         values = {
-            'groups': group_obj.browse(cr, uid, group_ids, context),
-            'thread_list': thread_obj.browse(cr, uid, thread_ids, context),
-            'active_group': group,
+            'messages': thread_obj.browse(cr, uid, thread_ids, context),
+            'group': group,
             'pager': pager,
+            'mode': mode
         }
-        return request.website.render('website_mail_group.group_thread_list', values)
+        return request.website.render('website_mail_group.group_messages', values)
 
     @http.route([
         "/groups/<model('mail.group'):group>/message/<model('mail.message'):message>",
     ], type='http', auth="public", website=True)
-    def get_thread(self, group, message, **post):
+    def get_thread(self, group, message, mode='thread', page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
-        thread_obj = request.registry.get('mail.message')
-        child_ids = thread_obj.search(cr, uid, [('parent_id','=',message.id)], order='date')
         values = {
-            'main_thread': message,
-            'child_thread': thread_obj.browse(cr, uid, child_ids, context),
+            'message': message,
+            'group': group,
+            'mode': mode,
+            'page': page,
         }
-        return request.website.render('website_mail_group.group_thread', values)
+        return request.website.render('website_mail_group.group_message', values)
diff --git a/addons/website_mail_group/models/__init__.py b/addons/website_mail_group/models/__init__.py
deleted file mode 100644
index ea8be51acde..00000000000
--- a/addons/website_mail_group/models/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import mail_group
diff --git a/addons/website_mail_group/models/mail_group.py b/addons/website_mail_group/models/mail_group.py
deleted file mode 100644
index 66a7481fb52..00000000000
--- a/addons/website_mail_group/models/mail_group.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import osv, fields
-import uuid
-import time
-import datetime
diff --git a/addons/website_mail_group/static/src/css/website_mail_group.css b/addons/website_mail_group/static/src/css/website_mail_group.css
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 5000ca85a1d..2f660f4ef66 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -6,7 +6,7 @@
             <li><a t-attf-href="/groups">Mailing List</a></li>
         </xpath>
     </template>
-    <template id="mail_groups" name="My Groups">
+    <template id="mail_groups" name="Mailing Lists">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
@@ -19,7 +19,7 @@
                     <div class="col-md-3 mt32 mb64" t-foreach="groups" t-as="group">
                         <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
                         <div>
-                            <a t-attf-href="/groups/#{group.id}" t-esc="group.name"/>
+                            <a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/>
                             <div t-esc="group.description" class="text-muted"/>
                             <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">Join Group</a>
                             <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unsubscribe" t-attf-id="#{group.id}">Unsubscribe</a>
@@ -30,81 +30,103 @@
         </t>
     </template>
 
-    <template id="group_thread_list">
+    <template id="group_messages" name="Message Threads">
         <t t-call="website.layout">
             <section class="container">
-                <div class="row">
+                <div class="row mt8">
+                    <div class="col-md-5">
+                        <ol class="breadcrumb mb8">
+                            <li><a href="/groups">Mailing Lists</a></li>
+                            <li class="active" t-esc="group.name"/>
+                        </ol>
+                    </div>
                     <div class="col-md-5">
                         <t t-call="website.pager"/>
                     </div>
                 </div>
-            </section>
-
-            <section class="container">
+                <h1 class="mt8 mb32">
+                    <span t-field="group.name"/>
+                    <small>List Archive</small>
+                </h1>
                 <div class="row">
                     <div class="col-md-3">
-                        <ul class="nav nav-pills nav-stacked" id="group_follows">
-                            <t t-foreach="groups" t-as="group">
-                                <li t-attf-class="#{group.message_is_follower and 'visible' or 'hidden'}" t-att-id="group.id">
-                                    <a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/>
-                                </li>
-                            </t>
+                        <ul class="nav nav-pills nav-stacked" id="group_mode">
+                            <li t-attf-class="#{mode=='thread' and 'active' or ''}">
+                                <a t-attf-href="/groups/#{ slug(group) }/thread">By thread</a>
+                            </li>
+                            <li t-attf-class="#{mode=='list' and 'active' or ''}">
+                                <a t-attf-href="/groups/#{ slug(group) }/list">By date</a>
+                            </li>
                         </ul>
                     </div>
                     <div class="col-md-9">
-                        <ul class="media-list">
-                            <li t-foreach="thread_list" t-as="thread" class="media">
-                                <a t-attf-href="/groups/#{active_group.id}/message/#{ slug(thread) }" class="pull-left">
-                                    <img class="img-rounded pull-right mt0" style="height: 40px"
-                                        t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
-                                </a>
-                                <div class="media-body">
-                                    <h4 class="media-heading">
-                                        <a t-attf-href="/groups/#{ slug(active_group) }/message/#{ slug(thread) }" t-esc="thread.subject"/>
-                                        <br/>
-                                        <small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small>
-                                    </h4>
-                                </div>
-                            </li>
-                        </ul>
+                        <t t-call="website_mail_group.messages_short"/>
                     </div>
                 </div>
             </section>
         </t>
     </template>
 
-    <template id="group_thread">
+    <template id="group_message">
         <t t-call="website.layout">
-            <t t-set="head">
-                <link rel='stylesheet' href='/website_mail_group/static/src/css/website_mail_group.css'/>
-            </t>
-            <div class="row mt32">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-md-1">
-                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(main_thread.id)" style="width : 30px"/>
-                        </div>
-                        <div class="col-md-11">
-                            <div class="panel panel-default">
-                                <div class="panel-heading" t-esc="main_thread.subject"/>
-                                <div class="panel-body" t-raw="main_thread.body"/>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row" t-foreach="child_thread" t-as="message">
-                        <div class="col-md-1">
-                            <img class="img-rounded pull-right" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
-                        </div>
-                        <div class="col-md-11">
-                            <div class="panel panel-default">
-                                <div class="panel-heading" t-esc="message.subject"/>
-                                <div class="panel-body" t-raw="message.body"/>
-                            </div>
-                        </div>
+            <div class="container">
+                <div class="row mt8">
+                    <div class="col-md-5">
+                        <ol class="breadcrumb mb8">
+                            <li><a href="/groups">Mailing Lists</a></li>
+                            <li>
+                                <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">
+                                    <span t-field="group.name"/>
+                                </a>
+                            </li>
+                            <li class="active" t-esc="message.subject or 'Message'"/>
+                        </ol>
                     </div>
                 </div>
+
+                <h1 t-field="message.subject"/>
+                <img class="img-rounded pull-left" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
+                <h4 class="mt0 mb32">
+                     <span t-field="message.author_id.name"/>
+                    on <span t-field="message.date"/>
+                </h4>
+                <div t-raw="message.body"/>
+                <div t-if="message.child_ids">
+                    <h2 class="page-header">Follow ups</h2>
+                    <t t-set="messages" t-value="message.child_ids"/>
+                    <t t-call="website_mail_group.messages_short"/>
+                </div>
+                <div t-if="message.parent_id">
+                    <h2 class="page-header">Reference</h2>
+                    <t t-set="messages" t-value="[message.parent_id]"/>
+                    <t t-call="website_mail_group.messages_short"/>
+                </div>
+                <div class="text-center mb32 mt32">
+                    <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}" class="btn btn-lg btn-info">
+                        Back To List: <span t-field="group.name"/>
+                    </a>
+                </div>
             </div>
         </t>
     </template>
+
+    <template id="messages_short">
+        <ul class="media-list">
+            <li t-foreach="messages" t-as="thread" class="media">
+                <a t-attf-href="/groups/#{group.id}/message/#{ slug(thread) }?mode=#{mode}" class="pull-left">
+                    <img class="img-rounded pull-right mt0" style="height: 40px"
+                        t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
+                </a>
+                <div class="media-body">
+                    <h4 class="media-heading">
+                        <a t-attf-href="/groups/#{ slug(group) }/message/#{ slug(thread) }" t-esc="thread.subject"/>
+                        <br/>
+                        <small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small>
+                    </h4>
+                </div>
+            </li>
+        </ul>
+    </template>
+
 </data>
 </openerp>
diff --git a/addons/website_mail_group/views/website_mail_group_backend.xml b/addons/website_mail_group/views/website_mail_group_backend.xml
deleted file mode 100644
index cc8d30d080d..00000000000
--- a/addons/website_mail_group/views/website_mail_group_backend.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    </data>
-</openerp>

From 9d9e6007fe405a5544ce9f1934c1341021be0f9f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 12:02:40 +0100
Subject: [PATCH 48/56] [IMP] Clean CTA

bzr revid: fp@tinyerp.com-20140316110240-g9esx75vt2qmxcic
---
 .../views/website_mail_group.xml              | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 2f660f4ef66..9087ea38fbe 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -69,6 +69,9 @@
 
     <template id="group_message">
         <t t-call="website.layout">
+            <t t-set="head">
+                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
+            </t>
             <div class="container">
                 <div class="row mt8">
                     <div class="col-md-5">
@@ -101,10 +104,24 @@
                     <t t-set="messages" t-value="[message.parent_id]"/>
                     <t t-call="website_mail_group.messages_short"/>
                 </div>
-                <div class="text-center mb32 mt32">
-                    <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}" class="btn btn-lg btn-info">
-                        Back To List: <span t-field="group.name"/>
-                    </a>
+
+                <div class="jumbotron mt64">
+                    <h1>Join the discussion</h1>
+                    <p>
+                        Join this mailing list to follow or participate to this discussion.<br/>
+                        <span t-field="group.name"/>: <i t-field="group.description"/>
+                    </p>
+                    <p>
+                        <span t-if="group.message_is_follower" t-attf-class="btn btn-default disabled">
+                            Already subscribed
+                        </span>
+                        <a t-if="not group.message_is_follower"
+                          t-attf-class="btn btn-primary btn-lg js_group follow_#{group.id}"
+                          t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">
+                            Join The List
+                        </a> or <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">view archives</a>
+                    </p>
+
                 </div>
             </div>
         </t>

From 675a71b2b82459c4aea5d19550e834c953fa1e11 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 12:37:42 +0100
Subject: [PATCH 49/56] [IMP] attachments on messages

bzr revid: fp@tinyerp.com-20140316113742-odae0ph3a1qrqn12
---
 addons/website/models/website.py                |  2 +-
 addons/website_mail_group/controllers/main.py   |  5 ++++-
 .../views/website_mail_group.xml                | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index ffb10d8850d..7befdb48516 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -88,7 +88,7 @@ def slug(value):
     else:
         # assume name_search result tuple
         id, name = value
-    slugname = slugify(name)
+    slugname = slugify(name or '')
     if not slugname:
         return str(id)
     return "%s-%d" % (slugname, id)
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index 97cb4d03091..a6f3adcd522 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -66,8 +66,11 @@ class MailGroup(http.Controller):
         )
         thread_ids = thread_obj.search(cr, uid, domain, limit=self._thread_per_page, offset=pager['offset'])
 
+        messages = thread_obj.browse(cr, uid, thread_ids, context)
+        for m in messages:
+            print m.subject
         values = {
-            'messages': thread_obj.browse(cr, uid, thread_ids, context),
+            'messages': messages,
             'group': group,
             'pager': pager,
             'mode': mode
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 9087ea38fbe..d1f960d7c00 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -94,6 +94,23 @@
                     on <span t-field="message.date"/>
                 </h4>
                 <div t-raw="message.body"/>
+
+                <div class="row" t-if="message.attachment_ids">
+                    <h3 class="col-sm-12">Attachment(s):</h3>
+                    <div class="col-md-2 col-sm-3 text-center" t-foreach='message.attachment_ids' t-as='attachment'>
+                        <a t-att-href="'/mail/download_attachment?model=mail.message&amp;id='+str(message.id)+'&amp;method=download_attachment&amp;attachment_id='+str(attachment.id)" target="_blank">
+                            <t t-if="attachment.file_type == 'webimage'">
+                                <img t-att-src="'/web/binary/image?model=ir.attachment&amp;field=datas&amp;id=' + str(attachment.id) + '&amp;resize=100,80'"
+                                    class='oe_attachment_embedded'></img>
+                            </t>
+                            <t t-if="attachment.file_type != 'webimage'">
+                                <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"
+                                    class='oe_attachment_webimage'></img>
+                            </t>
+                            <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
+                        </a>
+                    </div>
+                </div>
                 <div t-if="message.child_ids">
                     <h2 class="page-header">Follow ups</h2>
                     <t t-set="messages" t-value="message.child_ids"/>

From d143e09ff5aab989b660c1f75af713433426be4c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 13:32:20 +0100
Subject: [PATCH 50/56] [IMP] Mailing List Fixes

bzr revid: fp@tinyerp.com-20140316123220-5hq7e3f6p7fzbr96
---
 addons/website_mail/views/snippets.xml        |  6 +-
 addons/website_mail_group/__openerp__.py      |  3 +-
 .../security/ir.model.access.csv              |  0
 .../security/website_mail_group.xml           | 12 ----
 .../static/src/js/website_mail_group.js       | 28 ----------
 .../views/website_mail_group.xml              | 56 ++++++++++++-------
 6 files changed, 40 insertions(+), 65 deletions(-)
 delete mode 100644 addons/website_mail_group/security/ir.model.access.csv
 delete mode 100644 addons/website_mail_group/security/website_mail_group.xml
 delete mode 100644 addons/website_mail_group/static/src/js/website_mail_group.js

diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 75202fe99fd..196ad39dac8 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -509,10 +509,10 @@
                       class="js_follow_email form-control"
                       placeholder="your email..."/>
                 <span class="input-group-btn">
-                    <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
-                    <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
+                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
                 </span>
-                <div class="alert alert-success hidden">Thanks for your subscription!</div>
+                <div class="alert alert-success hidden">thanks for your subscription!</div>
             </div>
 
         </div>
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index 9ea12329775..de47bfa4390 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -13,11 +13,10 @@ OpenERP Mail Group : Mailing List Archives
     'data': [
         'views/website_mail_group.xml',
         'data/website_mail_group_data.xml',
-        'security/website_mail_group.xml',
     ],
     'demo': [
         'data/website_mail_group_demo.xml'
     ],
-    'qweb': ['static/src/xml/*.xml'],
+    'qweb': [],
     'installable': True,
 }
diff --git a/addons/website_mail_group/security/ir.model.access.csv b/addons/website_mail_group/security/ir.model.access.csv
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/website_mail_group/security/website_mail_group.xml b/addons/website_mail_group/security/website_mail_group.xml
deleted file mode 100644
index 79d4390f6f9..00000000000
--- a/addons/website_mail_group/security/website_mail_group.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="ir.rule" id="mail.mail_group_public_and_joined">
-            <field name="name">Mail.group: access only public and joined groups</field>
-            <field name="model_id" ref="mail.model_mail_group"/>
-            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_create" eval="False"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
deleted file mode 100644
index 651ed7fa6c3..00000000000
--- a/addons/website_mail_group/static/src/js/website_mail_group.js
+++ /dev/null
@@ -1,28 +0,0 @@
-$(document).ready(function () {
-    $('a.js_group').on('click', function (ev) {
-        ev.preventDefault();
-        var $link = $(ev.currentTarget);
-        var href = $link.attr("href");
-        var group_id = href.match(/subscription\/([0-9]+)/)[1];
-        var action = href.match(/action=(.*)/)[1] == 'subscribe' ? true : false;
-        openerp.jsonRpc("/groups/subscription/", 'call', {
-                    'group_id': parseInt(group_id),
-                    'action' : action,
-                })
-                .then(function (data) {
-                    if(data[0])
-                        return window.location ='/web/login?redirect=/groups/';
-                    if (action){
-                        $('li#'+ group_id).toggleClass('hidden visible');
-                        $('.unfollow_' + group_id).toggleClass('visible hidden');
-                        $('.follow_' + group_id).toggleClass('hidden visible');
-                    }
-                    else {
-                        $('li#'+ group_id).toggleClass('visible hidden');
-                        $('.unfollow_' + group_id).toggleClass('hidden visible');
-                        $('.follow_' + group_id).toggleClass('visible hidden');
-                    }
-                });
-        return false;
-    });
-});
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index d1f960d7c00..9e4b41329b4 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -8,21 +8,32 @@
     </template>
     <template id="mail_groups" name="Mailing Lists">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
-            </t>
             <div class="container">
                 <h1>
                     Our Mailing Lists
                 </h1>
                 <div class="row">
-                    <div class="col-md-3 mt32 mb64" t-foreach="groups" t-as="group">
+                    <div class="col-sm-4" style="height: 140px" t-foreach="groups" t-as="group">
                         <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
                         <div>
-                            <a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/>
+                            <strong><a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/></strong>
                             <div t-esc="group.description" class="text-muted"/>
-                            <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">Join Group</a>
-                            <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unsubscribe" t-attf-id="#{group.id}">Unsubscribe</a>
+
+                            <div class="input-group js_follow"
+                                      t-att-data-id="group.id"
+                                      data-object="mail.group"
+                                      data-follow="off">
+                                <input
+                                      type="email"
+                                      name="email"
+                                      class="js_follow_email form-control"
+                                      placeholder="your email..."/>
+                                <span class="input-group-btn">
+                                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                                </span>
+                                <div class="alert alert-success hidden">You have been subscribed!</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -69,9 +80,6 @@
 
     <template id="group_message">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
-            </t>
             <div class="container">
                 <div class="row mt8">
                     <div class="col-md-5">
@@ -128,16 +136,24 @@
                         Join this mailing list to follow or participate to this discussion.<br/>
                         <span t-field="group.name"/>: <i t-field="group.description"/>
                     </p>
-                    <p>
-                        <span t-if="group.message_is_follower" t-attf-class="btn btn-default disabled">
-                            Already subscribed
-                        </span>
-                        <a t-if="not group.message_is_follower"
-                          t-attf-class="btn btn-primary btn-lg js_group follow_#{group.id}"
-                          t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">
-                            Join The List
-                        </a> or <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">view archives</a>
-                    </p>
+
+                    <div style="max-width: 400px">
+                        <div class="input-group js_follow"
+                                  t-att-data-id="group.id"
+                                  data-object="mail.group"
+                                  data-follow="off">
+                            <input
+                                  type="email"
+                                  name="email"
+                                  class="js_follow_email form-control"
+                                  placeholder="your email..."/>
+                            <span class="input-group-btn">
+                                <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                                <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                            </span>
+                            <div class="alert alert-success hidden">You have been subscribed!</div>
+                        </div>
+                    </div>
 
                 </div>
             </div>

From 21cb5da695d7dd99c8064d1c494557280727f32e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 16 Mar 2014 13:34:07 +0100
Subject: [PATCH 51/56] [IMP] removed unsed files

bzr revid: fp@tinyerp.com-20140316123407-snoyaoybyl45l6xl
---
 addons/website_mail_group/__openerp__.py      |   5 +-
 .../data/website_mail_group_data.xml          |   4 -
 .../data/website_mail_group_demo.xml          | 204 ------------------
 3 files changed, 2 insertions(+), 211 deletions(-)
 delete mode 100644 addons/website_mail_group/data/website_mail_group_data.xml
 delete mode 100644 addons/website_mail_group/data/website_mail_group_demo.xml

diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index de47bfa4390..5c9ff3190b6 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -9,10 +9,9 @@ OpenERP Mail Group : Mailing List Archives
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website','mail'],
+    'depends': ['website_mail'],
     'data': [
-        'views/website_mail_group.xml',
-        'data/website_mail_group_data.xml',
+        'views/website_mail_group.xml'
     ],
     'demo': [
         'data/website_mail_group_demo.xml'
diff --git a/addons/website_mail_group/data/website_mail_group_data.xml b/addons/website_mail_group/data/website_mail_group_data.xml
deleted file mode 100644
index b020c6a30ae..00000000000
--- a/addons/website_mail_group/data/website_mail_group_data.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<openerp>
-    <data>
-    </data>
-</openerp>
diff --git a/addons/website_mail_group/data/website_mail_group_demo.xml b/addons/website_mail_group/data/website_mail_group_demo.xml
deleted file mode 100644
index 2744986dcdd..00000000000
--- a/addons/website_mail_group/data/website_mail_group_demo.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="mail.group" id="group_community">
-            <field name="name">Community</field>
-            <field name="description">Community team</field>
-        </record>
-        <record model="mail.group" id="group_community">
-            <field name="message_follower_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
-        </record>
-        <record id="msg_group_community_1" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Discover OpenERP V8</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    Dear community,
-                </p><p>
-                    We are organizing a serie of events to showcase the new 
-                    features of OpenERP v8.The events are visible on 
-                    http://openerp.com/events
-                </p><p>
-                    The America Tour:
-                </p><p>
-                    3/11: New York:
-                    <a href="http://www.eventbrite.com/event/10576455463">
-                        http://www.eventbrite.com/event/10576455463
-                    </a>
-                </p><p>
-                    3/13: Montreal: 
-                    <a href="http://www.eventbrite.com/event/10577717237">
-                        http://www.eventbrite.com/event/10577717237
-                    </a>
-                </p><p>
-                    3/18: Los Angeles: 
-                    <a href="http://www.eventbrite.com/event/10577185647">
-                        http://www.eventbrite.com/event/10577185647
-                    </a>
-                </p><p>
-                    3/20: San Francisco: 
-                    <a href="http://www.eventbrite.com/event/10577185647">
-                        http://www.eventbrite.com/event/10577185647
-                    </a>
-                </p><p>
-                    4/10: Chicago:
-                    <a href="http://www.eventbrite.com/event/10577414331">
-                        http://www.eventbrite.com/event/10577414331
-                    </a>
-                </p><p>
-                    4/17: Miami:
-                    <a href="http://www.eventbrite.com/event/10577616937">
-                        http://www.eventbrite.com/event/10577616937
-                    </a>
-                </p><p>
-                    The European Tour:
-                </p><p>
-                    2/20: Gosselies - Belgium:
-                    <a href="http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783">
-                        http://www.eventbrite.com/e/inscription-avant-premiere-openerp-presentation-du-cms-ecommerce-gosselies-be-10408392783
-                    </a>
-                </p><p>
-                    2/21: Brussels - Belgium:
-                    <a href="http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143">
-                        http://www.eventbrite.com/e/presentation-of-the-website-builder-ecommerce-brussels-belgium-tickets-10313228143
-                    </a>
-                </p><p>
-                    3/10: Germany:
-                    <a href="http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071">
-                        http://www.eventbrite.com/e/exhibition-en-cebit-hannover-germany-registration-10615107071
-                    </a>
-                </p><p>
-                    3/18: Lisbon, Portugal:
-                    <a href="https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519">
-                        https://www.eventbrite.com/e/openerp-tour-discover-openerp-with-cms-ecommerce-lisbon-portugal-registration-10552736519
-                    </a>
-                </p><p>
-                    Please spread the news and lets meet there.
-                </p><p>
-                    Thanks,
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_2" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    Hi,
-                </p><p>
-                    is there any event scheduled for Africa in near future?
-                </p><p>
-                    Regards
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="parent_id" ref="msg_group_community_1"></field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_3" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: Discover OpenERP V8</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>Yes,<p>
-                <p>in Moroco. You can contact Yves-Pascal (ypm@xxxxxxxxxxx) for morinformation.</p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="parent_id" ref="msg_group_community_1"></field>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_4" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">OpenERP Marketing</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>Dear community,</p>
-                <p>
-                    Over the past years, we did not invest a lot in marketing. We put most
-                    our efforts in R&D and Sales departements (starting from 2010) and
-                    services (started in 2012).
-                </p><p>
-                    Things are changing and we are now ready to invest a lot in marketing
-                    activities. I just wrote a "very draft" internal document to discuss the
-                    brand positioning of OpenERP:
-                    <a href="http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb">http://pad.openerp.com/p/r.Zzg7LhlqI7elyigb</a>
-                </p><p>
-                    I would like to have your point of view on these marketing thoughts for
-                    OpenERP.
-                </p><p>
-                    Thanks,
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_5" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: OpenERP Marketing</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    I just posted my feedback request 
-                    about the OpenERP brand positioning on
-                    HN, you can react there:
-                    <a href="https://news.ycombinator.com/item?id=7243726">
-                        https://news.ycombinator.com/item?id=7243726
-                    </a>
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="parent_id" ref="msg_group_community_4"></field>
-            <field name="date" eval="(DateTime.today() - timedelta(days=4)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_group_community_6" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_community"/>
-            <field name="subject">Re: OpenERP Marketing</field>
-            <field name="body"><![CDATA[
-            <section data-snippet-id='text-block'>
-                <p>
-                    Hello,
-                </p><p>
-                    I don't think there can be only one positioning for OpenERP.
-                </p><p>
-                    Depending on the customer in front of me, I will present OpenERP as :
-                </p>
-                <ol>
-                    <li>an Apps-consuming platform (like a cell phone)</li>
-                    <li>an ERP (in its traditional meaning)</li>
-                    <li>a business apps development framework</li>
-                </ol>
-                <p>
-                    OpenERP answers a wide range of needs, so you need to differentiate 
-                    the positioning based on the 3 axis above. In each of those axis,
-                    the competition is different and arguments toward OpenERP will be
-                    different as well.
-                </p>
-            </section>
-            ]]></field>
-            <field name="type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="parent_id" ref="msg_group_community_4"></field>
-            <field name="date" eval="(DateTime.today() - timedelta(days=3)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-    </data>
-</openerp>

From 5cc7237f63cecba24cbc52146dcfb57145ec3892 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:12:28 +0100
Subject: [PATCH 52/56] [REM] useless jsonrpc tests and controllers

bzr revid: al@openerp.com-20140316141228-0c35ymruttd5mx2j
---
 addons/web/__openerp__.py         |   1 -
 addons/web/controllers/testing.py |   7 --
 addons/web/static/test/jsonrpc.js | 152 ------------------------------
 3 files changed, 160 deletions(-)
 delete mode 100644 addons/web/static/test/jsonrpc.js

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 72f1610177c..f1d7d7511c7 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -87,7 +87,6 @@ This module provides the core of the OpenERP Web Client.
         "static/test/data.js",
         "static/test/list-utils.js",
         "static/test/formats.js",
-        "static/test/jsonrpc.js",
         "static/test/rpc-misordered.js",
         "static/test/evals.js",
         "static/test/search.js",
diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index c99efed4294..a51b619d49f 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -157,10 +157,3 @@ class TestRunnerController(http.Controller):
                 # replace OS path separators (from join & normpath) by URI ones
                 yield path[len(root):].replace(os.path.sep, '/')
 
-    @http.route('/web/tests/set_session_value', type='json', auth="none")
-    def set_session_value(self, value):
-        request.session.some_test_value = value
-
-    @http.route('/web/tests/get_session_value', type='json', auth="none")
-    def get_session_value(self):
-        return request.session.some_test_value
diff --git a/addons/web/static/test/jsonrpc.js b/addons/web/static/test/jsonrpc.js
deleted file mode 100644
index 3b7140bacff..00000000000
--- a/addons/web/static/test/jsonrpc.js
+++ /dev/null
@@ -1,152 +0,0 @@
-(function() {
-
-var ropenerp = window.openerp;
-
-var openerp = ropenerp.declare($, _, QWeb2);
-
-ropenerp.testing.section('jsonrpc', {},
-function (test) {
-    test('basic-jsonrpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        return session.rpc("/gen_session_id", {}).then(function(result) {
-            ok(result.length > 0, "Result returned by /gen_session_id");
-        });
-    });
-    test('basic-jsonprpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}).then(function(result) {
-            ok(result.length > 0, "Result returned by /gen_session_id");
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('basic-jsonprpc2', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}, {force2step: true}).then(function(result) {
-            ok(result.length > 0, "Result returned by /gen_session_id");
-        });
-    });*/
-    test('session-jsonrpc', {asserts: 2}, function () {
-        var session = new openerp.Session();
-        var tmp = _.uniqueId("something");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-        });
-    });
-    test('session-jsonprpc', {asserts: 2}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        var tmp = _.uniqueId("something");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('session-jsonprpc2', {asserts: 2}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        var tmp = _.uniqueId("something");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}, {force2step: true}).then(function() {
-            ok(true, "set_session returned");
-            return session.rpc("/web/tests/get_session_value", {}, {force2step: true});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-        });
-    });*/
-    test('overridesession-jsonrpc', {asserts: 4}, function () {
-        var origin_session = new openerp.Session();
-        var origin_tmp = _.uniqueId("something");
-        var session = new openerp.Session(null, null, {override_session: true});
-        var tmp = _.uniqueId("something_else");
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp});
-        }).then(function(result) {
-            ok(true, "set_session on origin returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-            notEqual(result, origin_tmp, "Values in the different sessions should be different");
-        });
-    });
-    test('overridesession-jsonprpc', {asserts: 4}, function () {
-        var origin_session = new openerp.Session();
-        var origin_tmp = _.uniqueId("something");
-        var session = new openerp.Session(null, null, {override_session: true});
-        var tmp = _.uniqueId("something_else");
-        session.origin_server = false;
-        return session.rpc("/web/tests/set_session_value", {value: tmp}).then(function() {
-            ok(true, "set_session returned");
-            return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp});
-        }).then(function(result) {
-            ok(true, "set_session on origin returned");
-            return session.rpc("/web/tests/get_session_value", {});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-            notEqual(result, origin_tmp, "Values in the different sessions should be different");
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('overridesession-jsonprpc2', {asserts: 4}, function () {
-        var origin_session = new openerp.Session();
-        var origin_tmp = _.uniqueId("something");
-        var session = new openerp.Session(null, null, {override_session: true});
-        var tmp = _.uniqueId("something_else");
-        session.origin_server = false;
-        return session.rpc("/web/tests/set_session_value", {value: tmp}, {force2step: true}).then(function() {
-            ok(true, "set_session returned");
-            return origin_session.rpc("/web/tests/set_session_value", {value: origin_tmp});
-        }).then(function(result) {
-            ok(true, "set_session on origin returned");
-            return session.rpc("/web/tests/get_session_value", {}, {force2step: true});
-        }).then(function(result) {
-            equal(result, tmp, "Got the same value from the session");
-            notEqual(result, origin_tmp, "Values in the different sessions should be different");
-        });
-    });*/
-    test('timeout-jsonrpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        return session.rpc("/gen_session_id", {}, {timeout: 1}).then(function() {
-            ok(false, "the request incorrectly succeeded");
-            return $.when();
-        }, function(a, e) {
-            e.preventDefault();
-            ok(true, "the request correctly failed");
-            return $.when();
-        });
-    });
-    test('timeout-jsonprpc', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}, {timeout: 1}).then(function() {
-            ok(false, "the request incorrectly succeeded");
-            return $.when();
-        }, function(a, e) {
-            e.preventDefault();
-            ok(true, "the request correctly failed");
-            return $.when();
-        });
-    });
-    // desactivated because the phantomjs runner crash
-    /*test('timeout-jsonprpc2', {asserts: 1}, function () {
-        var session = new openerp.Session();
-        session.origin_server = false;
-        return session.rpc("/gen_session_id", {}, {force2step: true, timeout: 1}).then(function() {
-            ok(false, "the request incorrectly succeeded");
-            return $.when();
-        }, function(a, e) {
-            e.preventDefault();
-            ok(true, "the request correctly failed");
-            return $.when();
-        });
-    });*/
-});
-
-})();

From 5b21fc022536eefa8795a2848dee061647cc789a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:13:11 +0100
Subject: [PATCH 53/56] [REM] http useless controller

bzr revid: al@openerp.com-20140316141311-m0xqh386ax952va1
---
 openerp/http.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openerp/http.py b/openerp/http.py
index 128d5a91246..3fc4aeb60f2 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -1209,11 +1209,6 @@ class CommonController(Controller):
         """ Method used by client APIs to contact OpenERP. """
         return openerp.netsvc.dispatch_rpc(service, method, args)
 
-    @route('/gen_session_id', type='json', auth="none")
-    def gen_session_id(self):
-        nsession = root.session_store.new()
-        return nsession.sid
-
 root = None
 
 def wsgi_postload():

From e23ce631332f166003ee51b65b36b051026411e4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:23:02 +0100
Subject: [PATCH 54/56] [FIX] website tests crawler, admin password != super
 admin password

bzr revid: al@openerp.com-20140316142302-7xm0sputqgadihs0
---
 addons/website/tests/test_requests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/test_requests.py b/addons/website/tests/test_requests.py
index 9fb29b63c75..2a22ae04445 100644
--- a/addons/website/tests/test_requests.py
+++ b/addons/website/tests/test_requests.py
@@ -121,6 +121,6 @@ class URL(object):
 
 def load_tests(loader, base, _):
     base.addTest(CrawlSuite())
-    base.addTest(CrawlSuite('admin', tools.config['admin_passwd']))
+    base.addTest(CrawlSuite('admin', 'admin'))
     base.addTest(CrawlSuite('demo', 'demo'))
     return base

From 0772c99bcbca4b4ddac66cc81ab4781e397b87d8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 15:45:46 +0100
Subject: [PATCH 55/56] [FIX] website test, remove useless test, waitfor banner
 fix

bzr revid: al@openerp.com-20140316144546-agpgmlwxa532xxmb
---
 .../static/src/js/website.tour.test.admin.js  | 106 ------------------
 addons/website/tests/test_ui.py               |   2 +-
 2 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 addons/website/static/src/js/website.tour.test.admin.js

diff --git a/addons/website/static/src/js/website.tour.test.admin.js b/addons/website/static/src/js/website.tour.test.admin.js
deleted file mode 100644
index 01f4448abb2..00000000000
--- a/addons/website/static/src/js/website.tour.test.admin.js
+++ /dev/null
@@ -1,106 +0,0 @@
-(function () {
-    'use strict';
-
-    var website = openerp.website;
-
-    website.Tour.LoginEdit = website.Tour.extend({
-        id: 'login_edit',
-        name: "Try to log as admin and check editor",
-        path: '/',
-        init: function () {
-            var self = this;
-            self.steps = [
-                {
-                    title:     "click login",
-                    element:   '#top_menu a[href*="/web/login"]',
-                },
-                {
-                    title:     "insert login",
-                    element:   '.oe_login_form input[name="login"]',
-                    sampleText: "admin",
-                },
-                {
-                    title:     "insert password",
-                    waitFor:   '.oe_login_form input[name="login"][value!=""]',
-                    element:   '.oe_login_form input[name="password"]',
-                    sampleText: "admin",
-                },
-                {
-                    title:     "select 2 Standard tickets",
-                    waitFor:   '.oe_login_form input[name="password"][value!=""]',
-                    element:   '.oe_login_form button',
-                },
-                {
-                    title:     "go back to website from backend",
-                    element:   'a[data-action-model="ir.actions.act_url"]:contains("Website")',
-                },
-                {
-                    title:     'try to edit',
-                    waitNot:   '#wrap .carousel',
-                    element:   'button[data-action=edit]:visible',
-                },
-                {
-                    title:     'check edit mode',
-                    waitFor:   'button[data-action=save]:visible',
-                },
-                {
-                    title:     'check branding',
-                    waitFor:   '#wrap[data-oe-model="ir.ui.view"]',
-                },
-                {
-                    title:     'check rte',
-                    waitFor:   '#oe_rte_toolbar',
-                },
-                {
-                    title:     'check insert block button',
-                    element:   '[data-action="snippet"]:visible',
-                },
-                {
-                    title:     'add snippets',
-                    snippet:   '#snippet_structure .oe_snippet:first',
-                },
-                {
-                    title:     'try to save',
-                    waitFor:   '.oe_overlay_options .oe_options:visible',
-                    element:   'button[data-action=save]:visible',
-                },
-                {
-                    title:     'check saved',
-                    waitFor:   '#wrap div.carousel',
-                    element:   'button[data-action=edit]:visible',
-                },
-                {
-                    title:      'try to re-edit',
-                    waitFor:    'button[data-action=save]:visible',
-                    element:    '#wrap .carousel',
-                },
-                {
-                    title:      'remove snippet',
-                    element:    '.oe_snippet_remove',
-                },
-                {
-                    title:     'try to re-save',
-                    waitNot:   '#wrap .carousel',
-                    element:   'button[data-action=save]:visible',
-                },
-                {
-                    title:     "click admin",
-                    waitFor:   'button[data-action=edit]:visible',
-                    element:   'a:contains("Administrator")',
-                },
-                {
-                    title:     "click logout",
-                    element:   '#top_menu a[href*="/logout"]',
-                },
-                {
-                    title:     "check logout",
-                    waitFor:   '#top_menu a[href*="/web/login"]',
-                },
-            ];
-            return this._super();
-        },
-    });
-    // for test without editor bar
-    website.Tour.add(website.Tour.LoginEdit);
-
-}());
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index c9dd80ff885..54cd8a73a67 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -8,6 +8,6 @@ class TestUi(openerp.tests.HttpCase):
         self.phantom_js("/", "console.log('ok')", "openerp.website.editor", login='admin')
 
     def test_04_admin_tour_banner(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour", login='admin')
+        self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour.tours.banner", login='admin')
 
 # vim:et:

From eac51857318b751cfeabcb5583557da855003f17 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 16 Mar 2014 17:06:34 +0100
Subject: [PATCH 56/56] [IMP] phantom tests - phantomjs more verbose - revert
 to dumber console.log relay, dont try to be smart, just display it - json is
 only optionally parsed for errors stack dumps

bzr revid: al@openerp.com-20140316160634-hh7br4mbg01xcrpk
---
 openerp/tests/common.py      | 26 ++++++++++++++------------
 openerp/tests/phantomtest.js | 12 +++++++-----
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index 4dcd2938ffe..378191377fb 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -212,7 +212,8 @@ class HttpCase(TransactionCase):
                 # OSError, and no errno/strerror/filename, only a pair of
                 # unnamed arguments (matching errno and strerror)
                 err, _ = e.args
-                if err == errno.EINTR: continue
+                if err == errno.EINTR:
+                    continue
                 raise
 
             if ready:
@@ -224,24 +225,24 @@ class HttpCase(TransactionCase):
             # process lines
             if '\n' in buf:
                 line, buf = buf.split('\n', 1)
-
                 line = str(line)
-                if 'CoreText' in line:
-                    continue
+
+                # relay everything from console.log, even 'ok' or 'error...' lines
+                _logger.debug("phantomjs: %s", line)
+
                 if line == "ok":
                     break
                 if line.startswith("error"):
-                    line_ = line[6:]
-                    try: line_ = json.loads(line_)
-                    except ValueError: pass
+                    line_ = self.line[6:]
+                    # when error occurs the execution stack may be sent as as JSON
+                    try:
+                        line_ = json.loads(line_)
+                    except ValueError: 
+                        pass
                     self.fail(line_ or "phantomjs test failed")
 
-                try: line = json.loads(line)
-                except ValueError: pass
-                _logger.info("phantomjs: %s", line)
-
     def phantom_run(self, cmd, timeout):
-        _logger.debug('executing `%s`', ' '.join(cmd))
+        _logger.debug('phantom_run executing %s', ' '.join(cmd))
         try:
             phantom = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         except OSError:
@@ -252,6 +253,7 @@ class HttpCase(TransactionCase):
             # kill phantomjs if phantom.exit() wasn't called in the test
             if phantom.poll() is None:
                 phantom.terminate()
+            _logger.debug("phantom_run execution finished")
 
     def phantom_jsfile(self, jsfile, timeout=30, **kw):
         options = {
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
index 86176402627..63a3b2e33ff 100644
--- a/openerp/tests/phantomtest.js
+++ b/openerp/tests/phantomtest.js
@@ -113,20 +113,22 @@ function PhantomTest() {
                 console.log('loaded', url, status);
                 // process ready
                 waitFor(function() {
-                    console.log("waiting for: calling page evaluate");
+                    console.log("PhantomTest.run: wait for condition: " + ready);
                     return self.page.evaluate(function (ready) {
-                        console.log("waiting for", ready);
                         var r = false;
                         try {
-                            console.log("waiting for: page evaluating ", ready);
+                            console.log("page.evaluate eval expr:", ready);
                             r = !!eval(ready);
-                        } catch(ex) { }
-                        console.log("waiting for: returning from page evaluate");
+                        } catch(ex) { 
+                        }
+                        console.log("page.evaluate eval result:", r);
                         return r;
                     }, ready);
                 // run test
                 }, function() {
+                    console.log("PhantomTest.run: condition statified, executing: " + code);
                     self.page.evaluate(function (code) { return eval(code); }, code);
+                    console.log("PhantomTest.run: execution launched, waiting for console.log('ok')...");
                 });
             }
         });