15 files changed, 1232 insertions, 326 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 6872b921435..94e36d60419 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -159,7 +159,7 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
 }
 
 .db_container {
-    width: 15%;
+    width: 196px;
     background: #666666;
 }
 
@@ -801,13 +801,15 @@ label.error {
     -moz-border-radius-topright: 7px;
     border-top-right-radius: 7px;
 }
-.openerp .oe-listview table.oe-listview-content tfoot td:first-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:first-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:first-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child th:first-child {
     -webkit-border-bottom-left-radius: 7px;
     -moz-border-radius-bottomleft: 7px;
     border-bottom-left-radius: 7px;
 }
-.openerp .oe-listview table.oe-listview-content tfoot td:last-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child th:last-child,
+.openerp .oe-listview table.oe-listview-content tfoot tr:last-child td:last-child,
 .openerp .oe-listview table.oe-listview-content tbody:last-child tr:last-child td:last-child {
     -webkit-border-bottom-right-radius: 7px;
     -moz-border-radius-bottomright: 7px;
@@ -844,7 +846,7 @@ label.error {
 .openerp .oe_frame.oe_forms {
     clear: both;
 }
-.openerp table.oe_frame td {
+.openerp table.oe_frame {
     color: #4c4c4c;
 }
 .openerp td.oe_form_frame_cell {
@@ -872,7 +874,6 @@ label.error {
 }
 
 .openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help {
-    text-align: right;
     margin: 3px 0 0 10px;
 }
 .openerp label.oe_label_help span {
@@ -883,6 +884,18 @@ label.error {
     top: -4px;
     padding: 0 2px;
 }
+.openerp .oe_align_left {
+    text-align: left;
+}
+.openerp .oe_align_right {
+    text-align: right;
+}
+.openerp .oe_align_center {
+    text-align: center;
+}
+.openerp .oe_forms .oe_form_paragraph {
+    margin: 3px 0 0 0;
+}
 
 /* Inputs */
 .openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea {
@@ -1075,7 +1088,7 @@ label.error {
     list-style: none;
 }
 .openerp .oe-view-manager-logs li:before {
-    content: '→ ';
+    content: '\2192 ';
 }
 .openerp .oe-view-manager-logs a {
     text-decoration: none;
@@ -1408,3 +1421,31 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
     border-color: rgba(0,0,0,0);
     border-left-color: #B5B9FF;
 }
+.openerp .oe_view_editor {
+    border-collapse: collapse;
+    padding: 0;
+    align: left;
+    width: 100%;
+}
+.openerp .oe_view_editor_colum{
+    font-size: 90%;
+    font-weight: normal;
+    padding: 0;
+    border-bottom: 1px solid #CFCCCC;
+}
+.openerp .oe_view_editor_row:hover{
+    background-color: #F3F3F3;
+}
+.openerp .oe_view_editor_tree_grid{
+    text-align: left;
+    white-space: nowrap;
+    border-collapse: collapse;
+    width: 100%;
+}
+.openerp .oe_view_editor_tree_grid a:hover {
+    color: blue;
+}
+.openerp .oe_view_editor_tree_grid a {
+    display: block;
+}
+
diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css
index 1fb3b22aa45..e5d1c9a910c 100644
--- a/addons/web/static/src/css/data_import.css
+++ b/addons/web/static/src/css/data_import.css
@@ -11,6 +11,22 @@
 .openerp .oe_import_grid-row .oe_import_grid-cell {
     border-bottom: 1px solid #E3E3E3;
 }
+
+.openerp .oe-import-no-result .oe-import-result {
+    display: none;
+}
+.openerp .oe-import fieldset {
+    cursor: pointer;
+}
+.openerp .oe-import fieldset legend:before {
+    content: '\25BC  ';
+}
+.openerp .oe-import fieldset.oe-closed legend:before {
+    content: '\25B6  ';
+}
+.openerp .oe-import fieldset.oe-closed table {
+    display: none;
+}
 .openerp .separator.horizontal {
     font-weight: bold;
     border-bottom-width: 1px;
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index f41185be0c6..5fba5f4d8d4 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -59,7 +59,7 @@ openerp.web = function(instance) {
     openerp.web.formats(instance);
     openerp.web.chrome(instance);
     openerp.web.data(instance);
-    var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import"];
+    var files = ["views","search","list","form","list_editable","web_mobile","view_tree","data_export","data_import","view_editor"];
     for(var i=0; i<files.length; i++) {
         if(openerp.web[files[i]]) {
             openerp.web[files[i]](instance);
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index bdb8e23c20b..d85942feead 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -29,11 +29,11 @@ openerp.web.Notification =  openerp.web.Widget.extend(/** @lends openerp.web.Not
     warn: function(title, text) {
         this.$element.notify('create', 'oe_notification_alert', {
             title: title,
-            text: text,
+            text: text
         }, {
-            expires: false,
+            expires: false
         });
-    },
+    }
 
 });
 
@@ -136,10 +136,10 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
     }
 });
 
-openerp.web.CrashManager = openerp.web.SessionAware.extend({
-    init: function(parent) {
-        this._super((parent || {}).session);
-        this.session.on_rpc_error.add(this.on_rpc_error);
+openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
+    init: function() {
+        this._super();
+        openerp.connection.on_rpc_error.add(this.on_rpc_error);
     },
     on_rpc_error: function(error) {
         this.error = error;
@@ -195,10 +195,20 @@ openerp.web.Loading =  openerp.web.Widget.extend(/** @lends openerp.web.Loading#
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.count = 0;
+        this.blocked_ui = false;
         this.session.on_rpc_request.add_first(this.on_rpc_event, 1);
         this.session.on_rpc_response.add_last(this.on_rpc_event, -1);
     },
     on_rpc_event : function(increment) {
+        var self = this;
+        if (!this.count && increment === 1) {
+            // Block UI after 3s
+            this.long_running_timer = setTimeout(function () {
+                self.blocked_ui = true;
+                $.blockUI();
+            }, 3000);
+        }
+
         this.count += increment;
         if (this.count) {
             //this.$element.html(QWeb.render("Loading", {}));
@@ -206,6 +216,12 @@ openerp.web.Loading =  openerp.web.Widget.extend(/** @lends openerp.web.Loading#
             this.$element.show();
             this.widget_parent.$element.addClass('loading');
         } else {
+            clearTimeout(this.long_running_timer);
+            // Don't unblock if blocked by somebody else
+            if (self.blocked_ui) {
+                this.blocked_ui = false;
+                $.unblockUI();
+            }
             this.$element.fadeOut();
             this.widget_parent.$element.removeClass('loading');
         }
@@ -343,7 +359,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
         self.$option_id.find("form[name=create_db_form]").validate({
             submitHandler: function (form) {
                 var fields = $(form).serializeArray();
-                $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
+                $.blockUI();
                 self.rpc("/web/database/create", {'fields': fields}, function(result) {
                     if (result.error) {
                         $.unblockUI();
@@ -392,7 +408,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
             .html(QWeb.render("BackupDB", self))
             .find("form[name=backup_db_form]").validate({
             submitHandler: function (form) {
-                $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
+                $.blockUI();
                 self.session.get_file({
                     form: form,
                     error: function (body) {
@@ -413,7 +429,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database
 
        	self.$option_id.find("form[name=restore_db_form]").validate({
             submitHandler: function (form) {
-                $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
+                $.blockUI();
                 $(form).ajaxSubmit({
                     url: '/web/database/restore',
                     type: 'POST',
@@ -943,17 +959,15 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this._super(null, element_id);
         openerp.webclient = this;
 
-        QWeb.add_template("/web/static/src/xml/base.xml");
         var params = {};
         if(jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
             this.$element.addClass("kitten-mode-activated");
         }
         this.$element.html(QWeb.render("Interface", params));
 
-        this.notification = new openerp.web.Notification();
-        this.session = new openerp.web.Session();
+        this.notification = new openerp.web.Notification(this);
         this.loading = new openerp.web.Loading(this,"oe_loading");
-        this.crashmanager =  new openerp.web.CrashManager(this);
+        this.crashmanager =  new openerp.web.CrashManager();
 
         this.header = new openerp.web.Header(this);
         this.login = new openerp.web.Login(this);
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 1b6a6302f72..951e6e2b01f 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -237,8 +237,8 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
      * registry was created.
      *
      * An object path is simply a dotted name from the openerp root to the
-     * object pointed to (e.g. ``"openerp.web.Session"`` for an OpenERP
-     * session object).
+     * object pointed to (e.g. ``"openerp.web.Connection"`` for an OpenERP
+     * connection object).
      *
      * @constructs openerp.web.Registry
      * @param {Object} mapping a mapping of keys to object-paths
@@ -338,9 +338,9 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(/** @lends openerp.web.Ca
     }
 });
 
-openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Session# */{
+openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
     /**
-     * @constructs openerp.web.Session
+     * @constructs openerp.web.Connection
      * @extends openerp.web.CallbackEnabled
      *
      * @param {String} [server] JSON-RPC endpoint hostname
@@ -364,7 +364,9 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
         // TODO: session should have an optional name indicating that they'll
         //       be saved to (and revived from) cookies
         this.name = 'session';
+        this.do_load_qweb(['/web/webclient/qweb']);
     },
+
     start: function() {
         this.session_restore();
     },
@@ -484,9 +486,11 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
             self.user_context = result.context;
             self.db = result.db;
             self.session_save();
+            self.on_session_valid();
             return true;
         }).then(success_callback);
     },
+    login: function() { this.session_login.apply(this, arguments); },
     /**
      * Reloads uid and session_id from local storage, if they exist
      */
@@ -574,6 +578,7 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
                 self.rpc('/web/webclient/jslist', {"mods": modules}, function(files) {
                     self.do_load_js(file_list.concat(files));
                 });
+                self.rpc('/web/webclient/qweblist', {"mods": modules}, self.do_load_qweb);
                 openerp._modules_loaded = true;
             });
         });
@@ -607,6 +612,12 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
             this.on_modules_loaded();
         }
     },
+    do_load_qweb: function(files) {
+        var self = this;
+        _.each(files, function(file) {
+            openerp.web.qweb.add_template(file);
+        });
+    },
     on_modules_loaded: function() {
         for(var j=0; j<this.module_list.length; j++) {
             var mod = this.module_list[j];
@@ -713,36 +724,6 @@ openerp.web.Session = openerp.web.CallbackEnabled.extend( /** @lends openerp.web
     }
 });
 
-openerp.web.SessionAware = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.SessionAware# */{
-    /**
-     * Utility class that any class is allowed to extend to easy common manipulations.
-     *
-     * It provides rpc calls, callback on all methods preceded by "on_" or "do_" and a
-     * logging facility.
-     *
-     * @constructs openerp.web.SessionAware
-     * @extends openerp.web.CallbackEnabled
-     *
-     * @param {openerp.web.Session} session
-     */
-    init: function(session) {
-        this._super();
-        this.session = session;
-    },
-    /**
-     * Performs a JSON-RPC call
-     *
-     * @param {String} url endpoint url
-     * @param {Object} data RPC parameters
-     * @param {Function} success RPC call success callback
-     * @param {Function} error RPC call error callback
-     * @returns {jQuery.Deferred} deferred object for the RPC call
-     */
-    rpc: function(url, data, success, error) {
-        return this.session.rpc(url, data, success, error);
-    }
-});
-
 /**
  * Base class for all visual components. Provides a lot of functionalities helpful
  * for the management of a part of the DOM.
@@ -753,8 +734,6 @@ openerp.web.SessionAware = openerp.web.CallbackEnabled.extend(/** @lends openerp
  *     destroyed too).
  * - Insertion in DOM.
  *
- * Widget also extends SessionAware for ease of use.
- *
  * Guide to create implementations of the Widget class:
  * ==============================================
  *
@@ -795,7 +774,7 @@ openerp.web.SessionAware = openerp.web.CallbackEnabled.extend(/** @lends openerp
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widget# */{
+openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.Widget# */{
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -814,7 +793,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
      * Construct the widget and set its parent if a parent is given.
      *
      * @constructs openerp.web.Widget
-     * @extends openerp.web.SessionAware
+     * @extends openerp.web.CallbackEnabled
      *
      * @param {openerp.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling stop(), the current instance will be
@@ -825,7 +804,8 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
      * for new components this argument should not be provided any more.
      */
     init: function(parent, /** @deprecated */ element_id) {
-        this._super((parent || {}).session);
+        this._super();
+        this.session = openerp.connection;
         // if given an element_id, try to get the associated DOM element and save
         // a reference in this.$element. Else just generate a unique identifier.
         this.element_id = element_id;
@@ -964,7 +944,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        this._super(url, data). then(function() {
+        openerp.connection.rpc(url, data). then(function() {
             if (!self.widget_is_stopped)
                 def.resolve.apply(def, arguments);
         }, function() {
@@ -1040,12 +1020,21 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.we
     }
 });
 
+if ($.blockUI) {
+    $.blockUI.defaults.baseZ = 1100;
+    $.blockUI.defaults.message = '<img src="/web/static/src/img/throbber2.gif">';
+}
+
+/** Configure default qweb */
 openerp.web._t = new openerp.web.TranslationDataBase().build_translation_function();
 openerp.web.qweb = new QWeb2.Engine();
 openerp.web.qweb.debug = (window.location.search.indexOf('?debug') !== -1);
+openerp.web.qweb.default_dict = {
+    '_' : _
+}
 openerp.web.qweb.format_text_node = function(s) {
     // Note that 'this' is the Qweb Node of the text
-    var translation = this.node.parentElement.attributes['t-translation'];
+    var translation = this.node.parentNode.attributes['t-translation'];
     if (translation && translation.value === 'off') {
         return s;
     }
@@ -1057,6 +1046,9 @@ openerp.web.qweb.format_text_node = function(s) {
     return tr === ts ? s : tr;
 }
 
+/** Setup default connection */
+openerp.connection = new openerp.web.Connection();
+
 };
 
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 069506586ad..f4509c82a81 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -32,7 +32,7 @@ openerp.web.DataGroup =  openerp.web.Widget.extend( /** @lends openerp.web.DataG
      * @constructs openerp.web.DataGroup
      * @extends openerp.web.Widget
      *
-     * @param {openerp.web.Session} session Current OpenERP session
+     * @param {openerp.web.Widget} parent widget
      * @param {String} model name of the model managed by this DataGroup
      * @param {Array} domain search domain for this DataGroup
      * @param {Object} context context of the DataGroup's searches
@@ -785,11 +785,15 @@ openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
     on_unlink: function(ids) {}
 });
 
-openerp.web.Model = openerp.web.SessionAware.extend({
-    init: function(session, model_name) {
-        this._super(session);
+openerp.web.Model = openerp.web.CallbackEnabled.extend({
+    init: function(_, model_name) {
+        this._super();
         this.model_name = model_name;
     },
+    rpc: function() {
+        var c = openerp.connection;
+        return c.rpc.apply(c, arguments);
+    },
     get_func: function(method_name) {
         var self = this;
         return function() {
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 711e790dfaa..355c6c1b493 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -80,8 +80,8 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         this.toggle_import_button(false);
         this.$element.find('#csvfile').change(this.on_autodetect_data);
         this.$element.find('fieldset').change(this.on_autodetect_data);
-        this.$element.find('fieldset legend').click(function() {
-            $(this).next().toggle();
+        this.$element.delegate('fieldset legend', 'click', function() {
+            $(this).parent().toggleClass('oe-closed');
         });
         this.ready.push(new openerp.web.DataSet(this, this.model).call(
             'fields_get', [], function (fields) {
@@ -194,9 +194,11 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
                           : with_headers ? results.records.slice(1)
                           : results.records
             }));
+            this.$element.find('fieldset').addClass('oe-closed');
         } else if (results['error']) {
             result_node.append(QWeb.render('ImportView.error', {
                 'error': results['error']}));
+            this.$element.find('fieldset').removeClass('oe-closed');
         } else if (results['success']) {
             if (this.widget_parent.widget_parent.active_view == "list") {
                 this.widget_parent.reload_content();
@@ -204,6 +206,11 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
             this.stop();
             return;
         }
+        this.$element.find('form').removeClass('oe-import-no-result');
+
+        this.$element.delegate('.oe-m2o-drop-down-button', 'click', function () {
+            $(this).prev('input').focus();
+        });
 
         var self = this;
         this.ready.then(function () {
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 3ab972f7a86..ca540844b7f 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -27,14 +27,8 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
             return _.sprintf('%d', value);
         case 'float':
             var precision = descriptor.digits ? descriptor.digits[1] : 2;
-            var int_part = Math.floor(value);
-            var dec_part = _.sprintf(
-                    '%.' + precision + 'f',
-                    Math.abs(value) % 1).substring(2);
-            return _.sprintf('%d%s%s',
-                    int_part,
-                    openerp.web._t.database.parameters.decimal_point,
-                    dec_part);
+            return _.sprintf('%.' + precision + 'f', value)
+                .replace('.', openerp.web._t.database.parameters.decimal_point);
         case 'float_time':
             return _.sprintf("%02d:%02d",
                     Math.floor(value),
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c7aa1e3cfe3..18e035a40b8 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -63,6 +63,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         rows.push(row);
         var filters = [];
         _.each(items, function (item) {
+            if (item.attrs.invisible === '1') { return; }
             if (filters.length && item.tag !== 'filter') {
                 row.push(
                     new openerp.web.search.FilterGroup(
@@ -432,6 +433,7 @@ openerp.web.search.Widget = openerp.web.Widget.extend( /** @lends openerp.web.se
      * @param view the ancestor view of this widget
      */
     init: function (view) {
+        this._super(view);
         this.view = view;
     },
     /**
@@ -472,10 +474,8 @@ openerp.web.search.Widget = openerp.web.Widget.extend( /** @lends openerp.web.se
         this._super();
     },
     render: function (defaults) {
-        return QWeb.render(
-            this.template, _.extend(this, {
-                defaults: defaults
-        }));
+        // FIXME
+        return this._super(_.extend(this, {defaults: defaults}));
     }
 });
 openerp.web.search.add_expand_listener = function($root) {
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
new file mode 100644
index 00000000000..71cda6fcc47
--- /dev/null
+++ b/addons/web/static/src/js/view_editor.js
@@ -0,0 +1,516 @@
+openerp.web.view_editor = function(openerp) {
+var QWeb = openerp.web.qweb;
+openerp.web.ViewEditor =   openerp.web.Widget.extend({
+    init: function(parent, element_id, dataset, view, options) {
+        this._super(parent);
+        this.element_id = element_id
+        this.parent = parent
+        this.dataset = dataset;
+        this.model = dataset.model;
+        this.xml_id = 0;
+    },
+    start: function() {
+        this.init_view_editor();
+    },
+    init_view_editor: function() {
+        var self = this;
+        var action = {
+            name:'ViewEditor',
+            context:this.session.user_context,
+            domain: [["model", "=", this.dataset.model]],
+            res_model : 'ir.ui.view',
+            views : [[false, 'list']],
+            type: 'ir.actions.act_window',
+            target: "current",
+            limit : 80,
+            auto_search : true,
+            flags: {
+                sidebar: false,
+                deletable: false,
+                views_switcher: false,
+                action_buttons:false,
+                search_view:false,
+                pager:false,
+                radio: true
+            },
+        };
+        this.view_edit_dialog = new openerp.web.Dialog(this, {
+            modal: true,
+            title: 'ViewEditor',
+            width: 750,
+            height: 500,
+            buttons: {
+                "Create": function(){
+                    //to do
+                },
+                "Edit": function(){
+                    self.xml_id=0;
+                    self.get_data();
+                },
+                "Close": function(){
+                    self.view_edit_dialog.close();
+                }
+            },
+        });
+        this.view_edit_dialog.start().open();
+        var action_manager = new openerp.web.ActionManager(this);
+        action_manager.appendTo(this.view_edit_dialog);
+        action_manager.do_action(action);
+    },
+    check_attr: function(xml, tag, level) {
+        var obj = {'child_id': [], 'id': this.xml_id++, 'level': level+1, 'att_list': [], 'name': ""};
+        var render_name = "<" + tag;
+        obj.att_list.push(tag);
+        $(xml).each(function() {
+            _.each(this.attributes, function(attrs){
+                if (tag != 'button') {
+                    if (attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index") {
+                        render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;
+                    }
+                } else {
+                    if (attrs.nodeName == "name") {
+                        render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';
+                    }
+                }
+                obj.att_list.push( [attrs.nodeName,attrs.nodeValue] );
+            });
+            render_name+= ">";
+        });
+        obj.name = render_name;
+        return obj;
+    },
+    save_object: function(val, parent_list, child_obj_list) {
+        var self = this;
+        var check_id = parent_list[0];
+        var p_list = parent_list.slice(1);
+        if (val.child_id.length != 0) {
+            _.each(val.child_id, function(val, key) {
+                if (val.id == check_id) {
+                    if (p_list.length!=0) {
+                        self.save_object(val, p_list, child_obj_list);
+                    } else {
+                        val.child_id = child_obj_list;
+                        return false;
+                    }
+                }
+            });
+        } else {
+            val.child_id = child_obj_list;
+        }
+    },
+    xml_node_create: function(xml, root, parent_list, parent_id, main_object){
+        var self = this;
+        var child_obj_list = [];
+        var children_list = $(xml).filter(root).children();
+        var parents = $(children_list[0]).parents().get();
+        _.each(children_list, function (child_node) {
+            child_obj_list.push(self.check_attr(child_node,child_node.tagName.toLowerCase(),parents.length));
+        });
+        if (children_list.length != 0) {
+            if (parents.length <= parent_list.length) {
+                parent_list.splice(parents.length - 1);
+            }
+            parent_list.push(parent_id);
+            self.save_object(main_object[0], parent_list.slice(1), child_obj_list);
+        }
+        for (var i = 0; i < children_list.length; i++) {
+            self.xml_node_create
+            (children_list[i], children_list[i].tagName.toLowerCase(),
+                parent_list, child_obj_list[i].id, main_object);
+        }
+        return main_object;
+    },
+    parse_xml: function(arch, view_id) {
+        var root = $(arch).filter(":first")[0];
+        var tag = root.tagName.toLowerCase();
+        var obj ={'child_id':[],'id':this.xml_id++,'level':0,'att_list':[],'name':"<view view_id='"+view_id+"'>"};
+        var root_object = this.check_attr(root,tag,0);
+        obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], [])
+        return [obj];
+    },
+    get_data: function() {
+        var self = this;
+        var view_arch_list = [];
+        self.main_view_id =((this.view_edit_dialog.$element.find("input[name='radiogroup']:checked").parent()).parent()).attr('data-id');
+        var ve_dataset = new openerp.web.DataSet(this, 'ir.ui.view');
+        ve_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function (arch) {
+            one_object = self.parse_xml(arch[0].arch,self.main_view_id);
+            self.main_view_type = arch[0].type
+            view_arch_list.push({"view_id" : self.main_view_id, "arch" : arch[0].arch});
+            dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null);
+            dataset.read_slice([], {domain : [['inherit_id','=', parseInt(self.main_view_id)]]}, function (result) {
+                _.each(result, function(res) {
+                    view_arch_list.push({"view_id":res.id,"arch":res.arch});
+                    self.inherit_view(one_object, res);
+                });
+                return self.edit_view({"main_object": one_object,
+                         "parent_child_id": self.parent_child_list(one_object, []),
+                         "arch": view_arch_list});
+            });
+        });
+    },
+    parent_child_list : function(one_object, p_list) {
+        var self = this;
+        _.each(one_object , function(element){
+            if(element.child_id.length != 0){
+                p_list.push({"key":element.id,"value":_.pluck(element.child_id, 'id')});
+                self.parent_child_list(element.child_id, p_list);
+            }
+        });
+        return p_list;
+    },
+    inherit_view : function(one_object, result) {
+        var self = this;
+        var root = $(result.arch).filter('*');
+        var xml_list = [];
+        if (root[0].tagName.toLowerCase() == "data") {
+            xml_list = $(root[0]).children();
+        } else {
+            xml_list.push(root[0]);
+        }
+        _.each(xml_list , function(xml){
+            var parent_id;
+            var check_list = [];
+            var xpath_object = self.parse_xml(xml,result.id);
+            if (xml.tagName.toLowerCase() == "xpath" ) {
+                var part_expr = _.without($(xml).attr('expr').split("/"),"");
+                _.each(part_expr,function(part){
+                    check_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"),""));
+                });
+            } else {
+                var temp = [];
+                _.each(xpath_object[0].child_id[0].att_list, function(list){
+                    if(!_.include(list, "position")){
+                        temp.push(list);
+                    }
+                });
+                check_list = [_.flatten(temp)];
+            }
+            self.full_path_search(check_list ,one_object ,xpath_object);
+        });
+    },
+    full_path_search: function(check_list ,val ,xpath_object) {
+        var self = this;
+        if(xpath_object.length!=0){
+            var check = check_list[0];
+            var obj;
+            switch (check.length) {
+                case 2:
+                    if(parseInt(check[1])){
+                        var list_1 = _.select(val,function(element){
+                            var main_list = _.flatten(element.att_list);
+                            return _.include(main_list, check[0]);
+                        });
+                        obj = val[_.indexOf(val,list_1[parseInt(check[1])-1])];
+                    } else {
+                        obj = _.detect(val, function(element){
+                            var main_list = _.flatten(element.att_list);
+                            return _.include(main_list, check[0]);
+                        });
+                    }
+                    break;
+                case 3:
+                    obj = _.detect(val,function(element){
+                        var main_list = _.flatten(element.att_list);
+                        check = _.uniq(check);
+                        var insert = _.intersection(main_list,check);
+                        if(insert.length == check.length ){return element;}
+                    });
+                    break;
+                case 1:
+                    var list_1 = _.select(val,function(element){
+                        var main_list = _.flatten(element.att_list);
+                        return _.include(main_list, check[0]);
+                    });
+                    if(list_1.length != 0){
+                        (check_list.length == 1)? obj = list_1[0] : check_list.shift();
+                    }
+                    break;
+            }
+            if(obj) {
+                check_list.shift();
+                if (check_list.length !=0){
+                    self.full_path_search(check_list ,obj.child_id ,xpath_object);
+                } else {
+                    var level = obj.level+1;
+                    self.increase_level(xpath_object[0], level)
+                    obj.child_id.push(xpath_object[0]);
+                    xpath_object.pop();
+                    return;
+                }
+            }
+            else {
+                _.each(val,function(element){
+                    self.full_path_search(check_list ,element.child_id ,xpath_object);
+                });
+            }
+        }
+    },
+    increase_level: function(val, level) {
+        var self = this;
+        val.level = level;
+        _.each(val.child_id, function(val, key) {
+            self.increase_level(val, level + 1);
+        });
+    },
+    edit_view: function(one_object) {
+        var self = this;
+        this.edit_xml_dialog = new openerp.web.Dialog(this,{
+            modal: true,
+            title: 'View Editor',
+            width: 750,
+            height: 500,
+            buttons: {
+                "Inherited View": function(){
+                    //todo
+                },
+                "Preview": function(){
+                    var action = {
+                        context:self.session.user_context,
+                        res_model : self.model,
+                        views : [[self.main_view_id, self.main_view_type]],
+                        type: 'ir.actions.act_window',
+                        target: "new",
+                        flags: {
+                            sidebar: false,
+                            views_switcher: false,
+                            action_buttons:false,
+                            search_view:false,
+                            pager:false,
+                        },
+                    };
+                    var action_manager = new openerp.web.ActionManager(self);
+                    action_manager.do_action(action);
+                },
+                "Close": function(){
+                    self.edit_xml_dialog.close();
+                }
+            }
+        });
+        this.edit_xml_dialog.start().open();
+        this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {
+            'data': one_object['main_object'],
+        }));
+        this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").click(function() {
+            self.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected');
+            $(this).addClass('ui-selected');
+        });
+        this.edit_xml_dialog.$element.find("img[id^='parentimg-']").click(function() {
+            if ($(this).attr('src') == '/web/static/src/img/collapse.gif') {
+                $(this).attr('src', '/web/static/src/img/expand.gif');
+                self.on_expand(this);
+            } else {
+                $(this).attr('src', '/web/static/src/img/collapse.gif');
+                var id = this.id.split('-')[1];
+                self.on_collapse(this,one_object['parent_child_id'], one_object['main_object']);
+            }
+        });
+        this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() {
+            var side = $(this).closest("tr[id^='viewedit-']")
+            var id_tr = (side.attr('id')).split('-')[1];
+            var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); ;
+            var level = parseInt(side.attr('level'));
+            var list_shift =[];
+            var last_tr;
+            var cur_tr = side;
+            list_shift.push(side);
+            var next_tr;
+            var ls = side;
+            var view_id;
+            var view_xml_id;
+            while(1){
+                ls = ls.prev();
+               if((self.edit_xml_dialog.$element.find(ls).find('a').text()).search("view_id") != -1
+                     && parseInt(ls.attr('level')) < level){
+                    view_id = parseInt(($(ls).find('a').text()).replace(/[^0-9]+/g,''));
+                    view_xml_id = (ls.attr('id')).split('-')[1];
+                    break;
+                }
+            }
+            switch (this.id) {
+                case "side-add":
+                    break;
+                case "side-remove":
+                    break;
+                case "side-edit":
+                    break;
+                case "side-up":
+                    while (1) {
+                        var prev_tr = cur_tr.prev();
+                        if(level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) {
+                           last_tr = prev_tr;
+                           break;
+                        }
+                        cur_tr = prev_tr;
+                    }
+                    if (img) {
+                        while (1) {
+                            next_tr = side.next();
+                            if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) {
+                                break;
+                            } else {
+                                list_shift.push(next_tr);
+                                side = next_tr;
+                            }
+                        }
+                    }
+                    if (last_tr.length != 0  && parseInt(last_tr.attr('level')) == level &&
+                        (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
+                        _.each(list_shift, function(rec) {
+                             $(last_tr).before(rec);
+                        });
+                        self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "up");
+                    }
+                break;
+            case "side-down":
+                if (img) {
+                    while (1) {
+                        next_tr = cur_tr.next();
+                        if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) {
+                            last_tr = next_tr;
+                            break;
+                        } else {
+                            list_shift.push(next_tr);
+                            cur_tr = next_tr;
+                        }
+                   }
+                }
+                else {
+                    last_tr = cur_tr.next();
+                }
+                if((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1){
+                    return;
+                }
+                if (last_tr.length != 0 &&  parseInt(last_tr.attr('level')) == level) {
+                    var last_tr_id = (last_tr.attr('id')).split('-')[1];
+                    img = last_tr.find("img[id='parentimg-" + last_tr_id + "']").attr('src');
+                    if (img) {
+                        self.edit_xml_dialog.$element.find("img[id='parentimg-" + last_tr_id + "']").
+                                                        attr('src', '/web/static/src/img/expand.gif');
+                        while (1) {
+                            var next_tr = last_tr.next();
+                            if (next_tr.attr('level') <= level || next_tr.length == 0) break;
+                            next_tr.hide();
+                            last_tr = next_tr;
+                        }
+                    }
+                    list_shift.reverse();
+                    _.each(list_shift, function(rec) {
+                       $(last_tr).after(rec);
+                    });
+                    self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down");
+                }
+                break;
+            }
+        });
+    },
+    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct){
+        var self = this;
+        var arch = _.detect(one_object['arch'],function(element){
+            return element.view_id == view_id;
+        });
+        var obj = self.get_view_object(view_xml_id, one_object['main_object'], []);
+        if(($(arch.arch).filter("data")).length != 0 && view_xml_id != 0){
+            var check_list = _.flatten(obj[0].child_id[0].att_list);
+            arch.arch = _.detect($(arch.arch).children(), function(xml_child){
+                var temp_obj = self.check_attr(xml_child, xml_child.tagName.toLowerCase());
+                var main_list = _.flatten(temp_obj.att_list);
+                check_list = _.uniq(check_list);
+                var insert = _.intersection(main_list,check_list);
+                if(insert.length == check_list.length ){return xml_child;}
+            });
+        }
+        return self.get_node(arch.arch, obj[0].child_id[0], parseInt(id_tr), [], parseInt(level),
+            parseInt(view_id), arch, move_direct);
+    },
+
+    get_view_object: function(view_xml_id, one_object,result){
+        var self = this;
+        if(result.length==0){
+            var check = _.detect(one_object , function(obj){
+                return view_xml_id==obj.id;
+            });
+            if(check){result.push(check);};
+            _.each(one_object, function(obj){
+               self.get_view_object(view_xml_id, obj.child_id, result);
+            });
+        }
+        return result;
+    },
+    get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){
+        var self = this;
+        var children_list =  $(arch1).children();
+        var list_obj_xml = _.zip(children_list,obj.child_id);
+        if (id) {
+            if (obj.id == id) {
+                var id;
+                var parent = $(arch1).parents();
+                var index = _.indexOf(child_list, obj)
+                var re_insert_obj = child_list.splice(index, 1);
+                if (move_direct == "down") {
+                    var next = $(arch1).next();
+                    $(next).after(arch1);
+                    child_list.splice(index+1, 0, re_insert_obj[0]);
+                } else {
+                    var prev = $(arch1).prev();
+                    $(prev).before(arch1);
+                    child_list.splice(index-1, 0, re_insert_obj[0]);
+                }
+                parent = parent[parent.length-1];
+                var convert_to_utf = self.xml2Str(parent);
+                if (convert_to_utf) {
+                    convert_to_utf = convert_to_utf.replace('xmlns="http://www.w3.org/1999/xhtml"', "");
+                    convert_to_utf = '<?xml version="1.0"?>' + convert_to_utf;
+                    arch.arch = convert_to_utf;
+                    dataset = new openerp.web.DataSet(this, 'ir.ui.view');
+                        dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
+                    });
+                }
+            }
+            if (obj.level <= level) {
+                _.each(list_obj_xml, function(child_node) {
+                    self.get_node(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct);
+                });
+            }
+        }
+    },
+    xml2Str: function(xmlNode) {
+       try {
+          return (new XMLSerializer()).serializeToString(xmlNode);
+      }
+      catch (e) {
+         try {
+            return xmlNode.xml;
+         }
+         catch (e) {
+            return false;
+         }
+       }
+
+    },
+    on_expand: function(expand_img){
+        var level = parseInt($(expand_img).closest("tr[id^='viewedit-']").attr('level'));
+        var cur_tr = $(expand_img).closest("tr[id^='viewedit-']");
+        while (1) {
+            var nxt_tr = cur_tr.next();
+            if (parseInt(nxt_tr.attr('level')) > level){
+                cur_tr = nxt_tr;
+                nxt_tr.hide();
+            } else return nxt_tr;
+        }
+    },
+    on_collapse: function(collapse_img, parent_child_id, id, main_object) {
+        var self = this;
+        var id = collapse_img.id.split('-')[1];
+        var datas = _.detect(parent_child_id,function(res) {
+            return res.key == id;
+        });
+        _.each(datas.value, function(rec) {
+            var tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+rec+"']");
+            tr.find("img[id='parentimg-"+rec+"']").attr('src','/web/static/src/img/expand.gif');
+            tr.show();
+        });
+    }
+
+});
+};
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 2946df7166c..603e2abb008 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -10,6 +10,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
      * view should be displayed (if there is one active).
      */
     searchable: false,
+    readonly : false,
     form_template: "FormView",
     identifier_prefix: 'formview-',
     /**
@@ -37,7 +38,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.dirty_for_user = false;
         this.default_focus_field = null;
         this.default_focus_button = null;
-        this.registry = openerp.web.form.widgets;
+        this.registry = this.readonly ? openerp.web.form.readonly : openerp.web.form.widgets;
         this.has_been_loaded = $.Deferred();
         this.$form_header = null;
         this.translatable_fields = [];
@@ -89,7 +90,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             this.fields_view = data;
             var frame = new (this.registry.get_object('frame'))(this, this.fields_view.arch);
 
-            this.rendered = QWeb.render(this.form_template, { 'frame': frame, 'view': this });
+            this.rendered = QWeb.render(this.form_template, { 'frame': frame, 'widget': this });
         }
         this.$element.html(this.rendered);
         _.each(this.widgets, function(w) {
@@ -101,21 +102,11 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             self.on_pager_action(action);
         });
 
-        this.$form_header.find('button.oe_form_button_save').click(this.do_save);
-        this.$form_header.find('button.oe_form_button_cancel').click(this.do_cancel);
+        this.$form_header.find('button.oe_form_button_save').click(this.do_save_then_readonly);
         this.$form_header.find('button.oe_form_button_new').click(this.on_button_new);
         this.$form_header.find('button.oe_form_button_duplicate').click(this.on_button_duplicate);
-        this.$form_header.find('button.oe_form_button_toggle').click(function () {
-            self.translatable_fields = [];
-            self.widgets = {};
-            self.fields = {};
-            self.$form_header.find('button').unbind('click');
-            self.registry = self.registry === openerp.web.form.widgets
-                    ? openerp.web.form.readonly
-                    : openerp.web.form.widgets;
-            self.on_loaded(self.fields_view);
-            self.reload();
-        });
+        this.$form_header.find('button.oe_form_button_delete').click(this.on_button_delete);
+        this.$form_header.find('button.oe_form_button_toggle').click(this.on_toggle_readonly);
 
         if (this.options.sidebar && this.options.sidebar_id) {
             this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id);
@@ -127,6 +118,23 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         }
         this.has_been_loaded.resolve();
     },
+    on_toggle_readonly: function() {
+        var self = this;
+        self.translatable_fields = [];
+        self.widgets = {};
+        self.fields = {};
+        self.$form_header.find('button').unbind('click');
+        self.readonly = !self.readonly;
+        self.registry = self.readonly ? openerp.web.form.readonly : openerp.web.form.widgets;
+        self.on_loaded(self.fields_view);
+        return self.reload();
+    },
+    do_set_readonly: function() {
+        return this.readonly ? $.Deferred().resolve() : this.on_toggle_readonly();
+    },
+    do_set_editable: function() {
+        return !this.readonly ? $.Deferred().resolve() : this.on_toggle_readonly();
+    },
     do_show: function () {
         var promise;
         if (this.dataset.index === null) {
@@ -162,6 +170,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             this.$form_header.find('.oe_form_on_update').show();
             this.$form_header.find('button.oe_form_button_new').show();
         }
+        this.$form_header.find('.oe_form_on_readonly').toggle(this.readonly);
+        this.$form_header.find('.oe_form_on_editable').toggle(!this.readonly);
         this.dirty_for_user = false;
         this.datarecord = record;
         for (var f in this.fields) {
@@ -342,14 +352,16 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         $.when(this.has_been_loaded).then(function() {
             if (self.can_be_discarded()) {
                 var keys = _.keys(self.fields_view.fields);
-                if (keys.length) {
-                    self.dataset.default_get(keys).then(self.on_record_loaded).then(function() {
+                $.when(self.do_set_editable()).then(function() {
+                    if (keys.length) {
+                        self.dataset.default_get(keys).then(self.on_record_loaded).then(function() {
+                            def.resolve();
+                        });
+                    } else {
+                        self.on_record_loaded({});
                         def.resolve();
-                    });
-                } else {
-                    self.on_record_loaded({});
-                    def.resolve();
-                }
+                    }
+                });
             }
         });
         return def.promise();
@@ -361,7 +373,20 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             if (self.can_be_discarded()) {
                 self.dataset.call('copy', [self.datarecord.id, {}, self.dataset.context]).then(function(new_id) {
                     return self.on_created({ result : new_id });
-                }).then(function() {
+                }).then(self.do_set_editable).then(function() {
+                    def.resolve();
+                });
+            }
+        });
+        return def.promise();
+    },
+    on_button_delete: function() {
+        var self = this;
+        var def = $.Deferred();
+        $.when(this.has_been_loaded).then(function() {
+            if (self.can_be_discarded() && self.datarecord.id) {
+                self.dataset.unlink([self.datarecord.id]).then(function() {
+                    self.on_pager_action('next');
                     def.resolve();
                 });
             }
@@ -379,6 +404,9 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
      * @param {Function} success callback on save success
      * @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new record, should that record be inserted at the start of the dataset (by default, records are added at the end)
      */
+    do_save_then_readonly: function(success, prepend_on_create) {
+        return this.do_save(success, prepend_on_create).then(this.do_set_readonly);
+    },
     do_save: function(success, prepend_on_create) {
         var self = this;
         var action = function() {
@@ -426,10 +454,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         this.mutating_lock = this.mutating_lock.pipe(action, action);
         return this.mutating_lock;
     },
-    switch_readonly: function() {
-    },
-    switch_editable: function() {
-    },
     on_invalid: function() {
         var msg = "<ul>";
         _.each(this.fields, function(f) {
@@ -487,9 +511,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     on_action: function (action) {
         console.debug('Executing action', action);
     },
-    do_cancel: function () {
-        console.debug("Cancelling form");
-    },
     reload: function() {
         var self = this;
         var act = function() {
@@ -715,6 +736,16 @@ openerp.web.form.Widget = openerp.web.Widget.extend(/** @lends openerp.web.form.
         this.invisible = this.modifiers['invisible'] === true;
         this.classname = 'oe_form_' + this.type;
 
+        this.align = parseFloat(this.node.attrs.align);
+        if (isNaN(this.align) || this.align === 1) {
+            this.align = 'right';
+        } else if (this.align === 0) {
+            this.align = 'left';
+        } else {
+            this.align = 'center';
+        }
+
+
         this.width = this.node.attrs.width;
     },
     start: function() {
@@ -1044,8 +1075,7 @@ openerp.web.form.WidgetLabel = openerp.web.form.Widget.extend({
 
         this._super(view, node);
 
-        // TODO fme: support for attrs.align
-        if (this.node.tag == 'label' && (this.node.attrs.colspan || (this.string && this.string.length > 32))) {
+        if (this.node.tag == 'label' && (this.align === 'left' || this.node.attrs.colspan || (this.string && this.string.length > 32))) {
             this.template = "WidgetParagraph";
             this.colspan = parseInt(this.node.attrs.colspan || 1, 10);
         } else {
@@ -1170,6 +1200,10 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
 
 openerp.web.form.FieldChar = openerp.web.form.Field.extend({
     template: 'FieldChar',
+    init: function (view, node) {
+        this._super(view, node);
+        this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
+    },
     start: function() {
         this._super.apply(this, arguments);
         this.$element.find('input').change(this.on_ui_change);
@@ -1419,11 +1453,7 @@ openerp.web.form.FieldBoolean = openerp.web.form.Field.extend({
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-        this.$element.find('input').click(function() {
-            if ($(this).is(':checked') != self.value) {
-                self.on_ui_change();
-            }
-        });
+        this.$element.find('input').click(self.on_ui_change);
     },
     set_value: function(value) {
         this._super.apply(this, arguments);
@@ -1632,6 +1662,11 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
                         } else {
                             $("#" + self.cm_id + " .oe_m2o_menu_item_mandatory").addClass("oe-m2o-disabled-cm");
                         }
+                        if (!self.readonly) {
+                            $("#" + self.cm_id + " .oe_m2o_menu_item_noreadonly").removeClass("oe-m2o-disabled-cm");
+                        } else {
+                            $("#" + self.cm_id + " .oe_m2o_menu_item_noreadonly").addClass("oe-m2o-disabled-cm");
+                        }
                         return true;
                     }, menuStyle: {width: "200px"}
                 });
@@ -1651,6 +1686,8 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
             }
         });
         this.$drop_down.click(function() {
+            if (self.readonly)
+                return;
             if (self.$input.autocomplete("widget").is(":visible")) {
                 self.$input.autocomplete("close");
             } else {
@@ -1811,7 +1848,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
             self.original_value = undefined;
             self._change_int_ext_value(rval);
         };
-        if(typeof(value) === "number") {
+        if (value && !(value instanceof Array)) {
             var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
             dataset.name_get([value], function(data) {
                 real_set_value(data[0]);
@@ -1857,6 +1894,10 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
     },
     focus: function () {
         this.$input.focus();
+    },
+    update_dom: function() {
+        this._super.apply(this, arguments);
+        this.$input.attr('disabled', this.readonly);
     }
 });
 
@@ -1910,7 +1951,8 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
     multi_selection: false,
     init: function(view, node) {
         this._super(view, node);
-        this.is_started = $.Deferred();
+        this.is_loaded = $.Deferred();
+        this.initial_is_loaded = this.is_loaded;
         this.is_setted = $.Deferred();
         this.form_last_update = $.Deferred();
         this.init_form_last_update = this.form_last_update;
@@ -1928,8 +1970,18 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
             self.on_ui_change();
         });
 
+        this.is_setted.then(function() {
+            self.load_views();
+        });
+    },
+    is_readonly: function() {
+        return this.readonly || this.force_readonly;
+    },
+    load_views: function() {
+        var self = this;
+        
         var modes = this.node.attrs.mode;
-        modes = !!modes ? modes.split(",") : ["tree", "form"];
+        modes = !!modes ? modes.split(",") : ["tree"];
         var views = [];
         _.each(modes, function(mode) {
             var view = {
@@ -1942,25 +1994,38 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
             }
             if(view.view_type === "list") {
                 view.options.selectable = self.multi_selection;
+                if (self.is_readonly()) {
+                    view.options.addable = null;
+                    view.options.deletable = null;
+                }
             } else if (view.view_type === "form") {
                 view.options.not_interactible_on_create = true;
             }
             views.push(view);
         });
         this.views = views;
-
+        
         this.viewmanager = new openerp.web.ViewManager(this, this.dataset, views);
         this.viewmanager.registry = openerp.web.views.clone({
             list: 'openerp.web.form.One2ManyListView',
-            form: 'openerp.web.form.One2ManyFormView'
+            form: 'openerp.web.FormView'
         });
         var once = $.Deferred().then(function() {
             self.init_form_last_update.resolve();
         });
+        var def = $.Deferred().then(function() {
+            self.initial_is_loaded.resolve();
+        });
         this.viewmanager.on_controller_inited.add_last(function(view_type, controller) {
             if (view_type == "list") {
                 controller.o2m = self;
+                if (self.is_readonly())
+                    controller.set_editable(false);
             } else if (view_type == "form") {
+                if (self.is_readonly()) {
+                    controller.on_toggle_readonly();
+                    $(controller.$element.find(".oe_form_buttons")[0]).children().remove();
+                }
                 controller.on_record_loaded.add_last(function() {
                     once.resolve();
                 });
@@ -1971,33 +2036,40 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
             } else if (view_type == "graph") {
                 self.reload_current_view()
             }
-            self.is_started.resolve();
+            def.resolve();
         });
-        this.viewmanager.on_mode_switch.add_first(function() {
-            self.save_form_view();
+        this.viewmanager.on_mode_switch.add_first(function(n_mode, b, c, d, e) {
+            $.when(self.save_form_view()).then(function() {
+                if(n_mode === "list")
+                    setTimeout(function() {self.reload_current_view();}, 0);
+            });
         });
         this.is_setted.then(function() {
             setTimeout(function () {
                 self.viewmanager.appendTo(self.$element);
             }, 0);
         });
+        return def;
     },
     reload_current_view: function() {
         var self = this;
-        var view = self.viewmanager.views[self.viewmanager.active_view].controller;
-        if(self.viewmanager.active_view === "list") {
-            view.reload_content();
-        } else if (self.viewmanager.active_view === "form") {
-            if (this.dataset.index === null && this.dataset.ids.length >= 1) {
-                this.dataset.index = 0;
-            }
-            var act = function() {
-                return view.do_show();
+        self.is_loaded = self.is_loaded.pipe(function() {
+            var view = self.viewmanager.views[self.viewmanager.active_view].controller;
+            if(self.viewmanager.active_view === "list") {
+                return view.reload_content();
+            } else if (self.viewmanager.active_view === "form") {
+                if (self.dataset.index === null && self.dataset.ids.length >= 1) {
+                    self.dataset.index = 0;
+                }
+                var act = function() {
+                    return view.do_show();
+                }
+                self.form_last_update = self.form_last_update.pipe(act, act);
+                return self.form_last_update;
+            } else if (self.viewmanager.active_view === "graph") {
+                return view.do_search(self.build_domain(), self.dataset.get_context(), []);
             }
-            this.form_last_update = this.form_last_update.pipe(act, act);;
-        } else if (self.viewmanager.active_view === "graph") {
-            view.do_search(this.build_domain(), this.dataset.get_context(), []);
-        }
+        });
     },
     set_value: function(value) {
         value = value || [];
@@ -2054,9 +2126,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
         if (this.dataset.index === null && this.dataset.ids.length > 0) {
             this.dataset.index = 0;
         }
-        $.when(this.is_started).then(function() {
-            self.reload_current_view();
-        });
+        self.reload_current_view();
         this.is_setted.resolve();
     },
     get_value: function() {
@@ -2120,7 +2190,18 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
     },
     update_dom: function() {
         this._super.apply(this, arguments);
-        this.$element.toggleClass('disabled', this.readonly);
+        var self = this;
+        if (this.previous_readonly !== this.readonly) {
+            this.previous_readonly = this.readonly;
+            if (this.viewmanager) {
+                this.is_loaded = this.is_loaded.pipe(function() {
+                    self.viewmanager.stop();
+                    return $.when(self.load_views()).then(function() {
+                        self.reload_current_view();
+                    });
+                });
+            }
+        }
     }
 });
 
@@ -2131,9 +2212,6 @@ openerp.web.form.One2ManyDataSet = openerp.web.BufferedDataSet.extend({
     }
 });
 
-openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({
-});
-
 openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
     do_add_record: function () {
         if (this.options.editable) {
@@ -2172,7 +2250,8 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
             read_function: function() {
                 return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments);
             },
-            form_view_options: {'not_interactible_on_create':true}
+            form_view_options: {'not_interactible_on_create':true},
+            readonly: self.o2m.is_readonly()
         });
         pop.on_write.add(function(id, data) {
             self.o2m.dataset.write(id, data, {}, function(r) {
@@ -2188,7 +2267,9 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({
     init: function(view, node) {
         this._super(view, node);
         this.list_id = _.uniqueId("many2many");
-        this.is_started = $.Deferred();
+        this.is_loaded = $.Deferred();
+        this.initial_is_loaded = this.is_loaded;
+        this.is_setted = $.Deferred();
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -2200,18 +2281,10 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({
         this.dataset.on_unlink.add_last(function(ids) {
             self.on_ui_change();
         });
-
-        this.list_view = new openerp.web.form.Many2ManyListView(this, this.dataset, false, {
-                    'addable': 'Add',
-                    'selectable': self.multi_selection
-            });
-        this.list_view.m2m_field = this;
-        this.list_view.on_loaded.add_last(function() {
-            self.is_started.resolve();
+        
+        this.is_setted.then(function() {
+            self.load_view();
         });
-        setTimeout(function () {
-            self.list_view.appendTo($("#" + self.list_id));
-        }, 0);
     },
     set_value: function(value) {
         value = value || [];
@@ -2221,16 +2294,56 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({
         this._super(value);
         this.dataset.set_ids(value);
         var self = this;
-        $.when(this.is_started).then(function() {
-            self.list_view.reload_content();
-        });
+        self.reload_content();
+        this.is_setted.resolve();
     },
     get_value: function() {
         return [commands.replace_with(this.dataset.ids)];
     },
     validate: function() {
         this.invalid = false;
-        // TODO niv
+    },
+    is_readonly: function() {
+        return this.readonly || this.force_readonly;
+    },
+    load_view: function() {
+        var self = this;
+        this.list_view = new openerp.web.form.Many2ManyListView(this, this.dataset, false, {
+                    'addable': self.is_readonly() ? null : 'Add',
+                    'deletable': self.is_readonly() ? false : true,
+                    'selectable': self.multi_selection
+            });
+        this.list_view.m2m_field = this;
+        var loaded = $.Deferred();
+        this.list_view.on_loaded.add_last(function() {
+            self.initial_is_loaded.resolve();
+            loaded.resolve();
+        });
+        setTimeout(function () {
+            self.list_view.appendTo($("#" + self.list_id));
+        }, 0);
+        return loaded;
+    },
+    reload_content: function() {
+        var self = this;
+        this.is_loaded = this.is_loaded.pipe(function() {
+            return self.list_view.reload_content();
+        });
+    },
+    update_dom: function() {
+        this._super.apply(this, arguments);
+        var self = this;
+        if (this.previous_readonly !== this.readonly) {
+            this.previous_readonly = this.readonly;
+            if (this.list_view) {
+                this.is_loaded = this.is_loaded.pipe(function() {
+                    self.list_view.stop();
+                    return $.when(self.load_view()).then(function() {
+                        self.reload_content();
+                    });
+                });
+            }
+        }
     }
 });
 
@@ -2334,10 +2447,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             this.searchview.stop();
         }
         this.searchview = new openerp.web.SearchView(this,
-                this.dataset, false, {
-                    "selectable": !this.options.disable_multiple_selection,
-                    "deletable": false
-                });
+                this.dataset, false, {});
         this.searchview.on_search.add(function(domains, contexts, groupbys) {
             if (self.initial_ids) {
                 self.do_search(domains.concat([[["id", "in", self.initial_ids]], self.domain]),
@@ -2364,7 +2474,9 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             });
             self.view_list = new openerp.web.form.SelectCreateListView(self,
                     self.dataset, false,
-                    _.extend({'deletable': false}, self.options.list_view_options || {}));
+                    _.extend({'deletable': false,
+                        'selectable': !self.options.disable_multiple_selection
+                    }, self.options.list_view_options || {}));
             self.view_list.popup = self;
             self.view_list.appendTo($("#" + self.element_id + "_view_list")).pipe(function() {
                 self.view_list.do_show();
@@ -2483,6 +2595,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
      * - read_function
      * - parent_view
      * - form_view_options
+     * - readonly
      */
     show_element: function(model, row_id, context, options) {
         this.model = model;
@@ -2522,7 +2635,13 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
             this.view_form.set_embedded_view(this.options.alternative_form_view);
         }
         this.view_form.appendTo(this.$element.find("#" + this.element_id + "_view_form"));
+        var once = $.Deferred().then(function() {
+            if (self.options.readonly) {
+                self.view_form.on_toggle_readonly();
+            }
+        });
         this.view_form.on_loaded.add_last(function() {
+            once.resolve();
             var $buttons = self.view_form.$element.find(".oe_form_buttons");
             $buttons.html(QWeb.render("FormOpenPopup.form.buttons"));
             var $nbutton = $buttons.find(".oe_formopenpopup-form-save");
@@ -2535,6 +2654,10 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
             $cbutton.click(function() {
                 self.stop();
             });
+            if (self.options.readonly) {
+                $nbutton.hide();
+                $cbutton.text(_t("Close"));
+            }
             self.view_form.do_show();
         });
         this.dataset.on_write.add(this.on_write);
@@ -2817,17 +2940,21 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
     }
 });
 
-openerp.web.form.WidgetNotebookReadonly = openerp.web.form.WidgetNotebook.extend({
-    template: 'WidgetNotebook.readonly'
-});
 openerp.web.form.FieldReadonly = openerp.web.form.Field.extend({
 
 });
 openerp.web.form.FieldCharReadonly = openerp.web.form.FieldReadonly.extend({
     template: 'FieldChar.readonly',
+    init: function(view, node) {
+        this._super(view, node);
+        this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
+    },
     set_value: function (value) {
         this._super.apply(this, arguments);
         var show_value = openerp.web.format_value(value, this, '');
+        if (this.password) {
+            show_value = new Array(show_value.length + 1).join('*');
+        }
         this.$element.find('div').text(show_value);
         return show_value;
     }
@@ -2855,7 +2982,7 @@ openerp.web.form.FieldUrlReadonly = openerp.web.form.FieldURIReadonly.extend({
 });
 openerp.web.form.FieldBooleanReadonly = openerp.web.form.FieldCharReadonly.extend({
     set_value: function (value) {
-        this._super(value ? '\u2714' : '\u2718');
+        this._super(value ? '\u2611' : '\u2610');
     }
 });
 openerp.web.form.FieldSelectionReadonly = openerp.web.form.FieldReadonly.extend({
@@ -2890,9 +3017,17 @@ openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldCharReadonly.exte
         self.update_dom();
         self.on_value_changed();
         var real_set_value = function(rval) {
-            self.$element.find('div').text(rval ? rval[1] : '');
+            self.value = rval;
+            var div = $(self.$element.find('div'));
+            div.html('<a href="javascript:void(0)"></a>');
+            var a = $(div.find("a"));
+            a.text(rval ? rval[1] : '');
+            a.click(function() {
+                var pop = new openerp.web.form.FormOpenPopup(self.view);
+                pop.show_element(self.field.relation, self.value[0],self.build_context(), {readonly:true});
+            });
         };
-        if(typeof(value) === "number") {
+        if (value && !(value instanceof Array)) {
             var dataset = new openerp.web.DataSetStatic(
                     this, this.field.relation, self.build_context());
             dataset.name_get([value], function(data) {
@@ -2937,8 +3072,14 @@ openerp.web.form.widgets = new openerp.web.Registry({
     'binary': 'openerp.web.form.FieldBinaryFile',
     'statusbar': 'openerp.web.form.FieldStatus'
 });
+
+openerp.web.form.FieldMany2ManyReadonly = openerp.web.form.FieldMany2Many.extend({
+    force_readonly: true
+});
+openerp.web.form.FieldOne2ManyReadonly = openerp.web.form.FieldOne2Many.extend({
+    force_readonly: true
+});
 openerp.web.form.readonly = openerp.web.form.widgets.clone({
-    'notebook': 'openerp.web.form.WidgetNotebookReadonly',
     'char': 'openerp.web.form.FieldCharReadonly',
     'email': 'openerp.web.form.FieldEmailReadonly',
     'url': 'openerp.web.form.FieldUrlReadonly',
@@ -2948,6 +3089,9 @@ openerp.web.form.readonly = openerp.web.form.widgets.clone({
     'datetime': 'openerp.web.form.FieldCharReadonly',
     'selection' : 'openerp.web.form.FieldSelectionReadonly',
     'many2one': 'openerp.web.form.FieldMany2OneReadonly',
+    'many2many' : 'openerp.web.form.FieldMany2ManyReadonly',
+    'one2many' : 'openerp.web.form.FieldOne2ManyReadonly',
+    'one2many_list' : 'openerp.web.form.FieldOne2ManyReadonly',
     'boolean': 'openerp.web.form.FieldBooleanReadonly',
     'float': 'openerp.web.form.FieldCharReadonly',
     'integer': 'openerp.web.form.FieldCharReadonly',
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index d09ec1d3035..e891a6c7db7 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -11,7 +11,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         // whether the column headers should be displayed
         'header': true,
         // display addition button, with that label
-        'addable': _t("New"),
+        'addable': _t("Create"),
         // whether the list view can be sorted, note that once a view has been
         // sorted it can not be reordered anymore
         'sortable': true,
@@ -201,8 +201,15 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         this.setup_columns(this.fields_view.fields, grouped);
 
         this.$element.html(QWeb.render("ListView", this));
-
         // Head hook
+        this.$element.find('.all-record-selector').click(function(){
+            self.$element.find('.oe-record-selector input').prop('checked',
+                self.$element.find('.all-record-selector').prop('checked')  || false);
+            var selection = self.groups.get_selection();
+            $(self.groups).trigger(
+                'selected', [selection.ids, selection.records]);
+        });
+
         this.$element.find('.oe-list-add')
                 .click(this.do_add_record)
                 .attr('disabled', grouped && this.options.editable);
@@ -424,10 +431,13 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     },
     /**
      * re-renders the content of the list view
+     *
+     * @returns {$.Deferred} promise to content reloading
      */
     reload_content: function () {
         var self = this;
         this.records.reset();
+        var reloaded = $.Deferred();
         this.$element.find('.oe-listview-content').append(
             this.groups.render(function () {
                 if (self.dataset.index == null) {
@@ -438,7 +448,9 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                     }
                 }
                 self.compute_aggregates();
+                reloaded.resolve();
             }));
+        return reloaded.promise();
     },
     /**
      * Handler for the result of eval_domain_and_context, actually perform the
@@ -512,6 +524,17 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             return field.name === name;
         });
         if (!action) { return; }
+
+        var c = new openerp.web.CompoundContext();
+        c.set_eval_context(_.extend({
+            active_id: id,
+            active_ids: [id],
+            active_model: this.dataset.model
+        }, this.records.get(id).toContext()));
+        if (action.context) {
+            c.add(action.context);
+        }
+        action.context = c;
         this.do_execute_action(action, this.dataset, id, callback);
     },
     /**
@@ -1201,6 +1224,10 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
         var options = { offset: page * limit, limit: limit };
         //TODO xmo: investigate why we need to put the setTimeout
         setTimeout(function() {dataset.read_slice(fields, options , function (records) {
+            // FIXME: ignominious hacks, parents (aka form view) should not send two ListView#reload_content concurrently
+            if (self.records.length) {
+                self.records.reset(null, {silent: true});
+            }
             if (!self.datagroup.openable) {
                 view.configure_pager(dataset);
             } else {
@@ -1430,6 +1457,25 @@ var Record = openerp.web.Class.extend(/** @lends Record# */{
         }
 
         return {data: form_data};
+    },
+    /**
+     * Converts the current record to a format expected by context evaluations
+     * (identical to record.attributes, except m2o fields are their integer
+     * value rather than a pair)
+     */
+    toContext: function () {
+        var output = {}, attrs = this.attributes;
+        for(var k in attrs) {
+            var val = attrs[k];
+            if (typeof val !== 'object') {
+                output[k] = val;
+            } else if (val instanceof Array) {
+                output[k] = val[0];
+            } else {
+                throw new Error("Can't convert value " + val + " to context");
+            }
+        }
+        return output;
     }
 });
 Record.include(Events);
@@ -1541,7 +1587,8 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
      * @param {Array} [records]
      * @returns this
      */
-    reset: function (records) {
+    reset: function (records, options) {
+        options = options || {};
         _(this._proxies).each(function (proxy) {
             proxy.reset();
         });
@@ -1552,7 +1599,9 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
         if (records) {
             this.add(records);
         }
-        this.trigger('reset', this);
+        if (!options.silent) {
+            this.trigger('reset', this);
+        }
         return this;
     },
     /**
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 4cc081a6266..dba0a1abba4 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -78,6 +78,17 @@ openerp.web.list_editable = function (openerp) {
             // tree/@editable takes priority on everything else if present.
             this.options.editable = data.arch.attrs.editable || this.options.editable;
             return this._super(data, grouped);
+        },
+        /**
+         * Ensures the editable list is saved (saves any pending edition if
+         * needed, or tries to)
+         *
+         * Returns a deferred to the end of the saving.
+         *
+         * @returns {$.Deferred}
+         */
+        ensure_saved: function () {
+            return this.groups.ensure_saved();
         }
     });
 
@@ -86,6 +97,18 @@ openerp.web.list_editable = function (openerp) {
         new_record: function () {
             // TODO: handle multiple children
             this.children[null].new_record();
+        },
+        /**
+         * Ensures descendant editable List instances are all saved if they have
+         * pending editions.
+         *
+         * @returns {$.Deferred}
+         */
+        ensure_saved: function () {
+            return $.when.apply(null,
+                _.invoke(
+                    _.values(this.children),
+                    'ensure_saved'));
         }
     });
 
@@ -254,9 +277,11 @@ openerp.web.list_editable = function (openerp) {
          * sibling if asked.
          *
          * @param {Boolean} [edit_next=false] should the next row become editable
+         * @returns {$.Deferred}
          */
         save_row: function (edit_next) {
-            var self = this;
+            //noinspection JSPotentiallyInvalidConstructorUsage
+            var self = this, done = $.Deferred();
             this.edition_form.do_save(function (result) {
                 if (result.created && !self.edition_id) {
                     self.records.add({id: result.result},
@@ -267,28 +292,44 @@ openerp.web.list_editable = function (openerp) {
                     next_record = self.records.at(
                             self.records.indexOf(edited_record) + 1);
 
-                self.handle_onwrite(self.edition_id);
-                self.cancel_pending_edition().then(function () {
-                    $(self).trigger('saved', [self.dataset]);
-                    if (!edit_next) {
-                        return;
-                    }
-                    if (result.created) {
-                        self.new_record();
-                        return;
-                    }
-                    var next_record_id;
-                    if (next_record) {
-                        next_record_id = next_record.get('id');
-                        self.dataset.index = _(self.dataset.ids)
-                                .indexOf(next_record_id);
-                    } else {
-                        self.dataset.index = 0;
-                        next_record_id = self.records.at(0).get('id');
-                    }
-                    self.edit_record(next_record_id);
-                });
-            }, this.options.editable === 'top');
+                $.when(
+                    self.handle_onwrite(self.edition_id),
+                    self.cancel_pending_edition().then(function () {
+                        $(self).trigger('saved', [self.dataset]);
+                        if (!edit_next) {
+                            return;
+                        }
+                        if (result.created) {
+                            self.new_record();
+                            return;
+                        }
+                        var next_record_id;
+                        if (next_record) {
+                            next_record_id = next_record.get('id');
+                            self.dataset.index = _(self.dataset.ids)
+                                    .indexOf(next_record_id);
+                        } else {
+                            self.dataset.index = 0;
+                            next_record_id = self.records.at(0).get('id');
+                        }
+                        self.edit_record(next_record_id);
+                    })).then(function () {
+                        done.resolve();
+                    });
+            }, this.options.editable === 'top').fail(function () {
+                done.reject();
+            });
+            return done.promise();
+        },
+        /**
+         * If the current list is being edited, ensures it's saved
+         */
+        ensure_saved: function () {
+            if (this.edition) {
+                return this.save_row();
+            }
+            //noinspection JSPotentiallyInvalidConstructorUsage
+            return $.Deferred().resolve().promise();
         },
         /**
          * Cancels the edition of the row for the current dataset index
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index f402a51bf7e..62928401492 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -2,21 +2,21 @@
  * OpenERP web library
  *---------------------------------------------------------*/
 
-openerp.web.views = function(db) {
+openerp.web.views = function(session) {
 
-var _t = db.web._t;
+var _t = session.web._t;
 
 /**
  * Registry for all the client actions key: tag value: widget
  */
-db.web.client_actions = new db.web.Registry();
+session.web.client_actions = new session.web.Registry();
 
 /**
  * Registry for all the main views
  */
-db.web.views = new db.web.Registry();
+session.web.views = new session.web.Registry();
 
-db.web.ActionManager = db.web.Widget.extend({
+session.web.ActionManager = session.web.Widget.extend({
     identifier_prefix: "actionmanager",
     init: function(parent) {
         this._super(parent);
@@ -93,20 +93,20 @@ db.web.ActionManager = db.web.Widget.extend({
     ir_actions_act_window: function (action, on_close) {
         if (action.target === 'new') {
             if (this.dialog == null) {
-                this.dialog = new db.web.Dialog(this, { title: action.name, width: '80%' });
+                this.dialog = new session.web.Dialog(this, { title: action.name, width: '80%' });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
                 this.dialog.start();
             } else {
                 this.dialog_viewmanager.stop();
             }
-            this.dialog_viewmanager = new db.web.ViewManagerAction(this, action);
+            this.dialog_viewmanager = new session.web.ViewManagerAction(this, action);
             this.dialog_viewmanager.appendTo(this.dialog.$element);
             this.dialog.open();
         } else  {
             this.dialog_stop();
             this.content_stop();
-            this.inner_viewmanager = new db.web.ViewManagerAction(this, action);
+            this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
             this.url_update(action);
         }
@@ -124,7 +124,7 @@ db.web.ActionManager = db.web.Widget.extend({
         if (this.dialog && action.context) {
             var model = action.context.active_model;
             if (model === 'base.module.upgrade' || model === 'base.setup.installer' || model === 'base.module.upgrade') {
-                db.webclient.do_reload();
+                session.webclient.do_reload();
             }
         }
         this.dialog_stop();
@@ -140,7 +140,7 @@ db.web.ActionManager = db.web.Widget.extend({
     },
     ir_actions_client: function (action) {
         this.content_stop();
-        var ClientWidget = db.web.client_actions.get_object(action.tag);
+        var ClientWidget = session.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this);
     },
     ir_actions_report_xml: function(action) {
@@ -164,12 +164,12 @@ db.web.ActionManager = db.web.Widget.extend({
     }
 });
 
-db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
+session.web.ViewManager =  session.web.Widget.extend(/** @lends session.web.ViewManager# */{
     identifier_prefix: "viewmanager",
     template: "ViewManager",
     /**
-     * @constructs db.web.ViewManager
-     * @extends db.web.Widget
+     * @constructs session.web.ViewManager
+     * @extends session.web.Widget
      *
      * @param parent
      * @param dataset
@@ -185,10 +185,10 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         this.views_src = _.map(views, function(x) {return x instanceof Array? {view_id: x[0], view_type: x[1]} : x;});
         this.views = {};
         this.flags = this.flags || {};
-        this.registry = db.web.views;
+        this.registry = session.web.views;
     },
     render: function() {
-        return db.web.qweb.render(this.template, {
+        return session.web.qweb.render(this.template, {
             self: this,
             prefix: this.element_id,
             views: this.views_src});
@@ -271,6 +271,10 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
                 }
             }
         }
+        $.when(view_promise).then(function () {
+            self.$element.find('.oe_view_title:first').text(
+                    self.display_title());
+        });
         return view_promise;
     },
     /**
@@ -284,7 +288,7 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
         if (this.searchview) {
             this.searchview.stop();
         }
-        this.searchview = new db.web.SearchView(
+        this.searchview = new session.web.SearchView(
                 this, this.dataset,
                 view_id, search_defaults, this.flags.search_view === false);
 
@@ -331,16 +335,24 @@ db.web.ViewManager =  db.web.Widget.extend(/** @lends db.web.ViewManager# */{
     /**
      * Called by children view after executing an action
      */
-    on_action_executed: function () {}
+    on_action_executed: function () {},
+    display_title: function () {
+        var view = this.views[this.active_view];
+        if (view) {
+            // ick
+            return view.controller.fields_view.arch.attrs.string;
+        }
+        return '';
+    }
 });
 
-db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{
+session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepnerp.web.ViewManagerAction# */{
     template:"ViewManagerAction",
     /**
-     * @constructs db.web.ViewManagerAction
-     * @extends db.web.ViewManager
+     * @constructs session.web.ViewManagerAction
+     * @extends session.web.ViewManager
      *
-     * @param {db.web.ActionManager} parent parent object/widget
+     * @param {session.web.ActionManager} parent parent object/widget
      * @param {Object} action descriptor for the action this viewmanager needs to manage its views.
      */
     init: function(parent, action) {
@@ -350,7 +362,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
         this._super(parent, null, action.views);
         this.session = parent.session;
         this.action = action;
-        var dataset = new db.web.DataSetSearch(this, action.res_model, action.context, action.domain);
+        var dataset = new session.web.DataSetSearch(this, action.res_model, action.context, action.domain);
         if (action.res_id) {
             dataset.ids.push(action.res_id);
             dataset.index = 0;
@@ -400,12 +412,12 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
 
         this.$element.find('.oe_get_xml_view').click(function () {
             // TODO: add search view?
-            $('<pre>').text(db.web.json_node_to_xml(
+            $('<pre>').text(session.web.json_node_to_xml(
                 self.views[self.active_view].controller.fields_view.arch, true))
                     .dialog({ width: '95%'});
         });
         if (this.action.help && !this.flags.low_profile) {
-            var Users = new db.web.DataSet(self, 'res.users'),
+            var Users = new session.web.DataSet(self, 'res.users'),
                 header = this.$element.find('.oe-view-manager-header');
             header.delegate('blockquote button', 'click', function() {
                 var $this = $(this);
@@ -444,6 +456,16 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
                 if (!self.action.name && fvg) {
                     self.$element.find('.oe_view_title').text(fvg.arch.attrs.string || fvg.name);
                 }
+
+                var $title = self.$element.find('.oe_view_title'),
+                    $search_prefix = $title.find('span');
+                if (controller.searchable !== false) {
+                    if (!$search_prefix.length) {
+                        $title.prepend('<span>' + _t("Search:") + '</span>');
+                    }
+                } else {
+                    $search_prefix.remove();
+                }
         });
     },
     shortcut_check : function(view) {
@@ -451,7 +473,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
         var grandparent = this.widget_parent && this.widget_parent.widget_parent;
         // display shortcuts if on the first view for the action
         var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle');
-        if (!(grandparent instanceof db.web.WebClient) ||
+        if (!(grandparent instanceof session.web.WebClient) ||
             !(view.view_type === this.views_src[0].view_type
                 && view.view_id === this.views_src[0].view_id)) {
             $shortcut_toggle.hide();
@@ -488,7 +510,7 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
      * Intercept do_action resolution from children views
      */
     on_action_executed: function () {
-        return new db.web.DataSet(this, 'res.log')
+        return new session.web.DataSet(this, 'res.log')
                 .call('get', [], this.do_display_log);
     },
     /**
@@ -512,10 +534,13 @@ db.web.ViewManagerAction = db.web.ViewManager.extend(/** @lends oepnerp.web.View
                     return false;
                 });
         });
+    },
+    display_title: function () {
+        return this.action.name;
     }
 });
 
-db.web.Sidebar = db.web.Widget.extend({
+session.web.Sidebar = session.web.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent, element_id);
         this.items = {};
@@ -524,7 +549,7 @@ db.web.Sidebar = db.web.Widget.extend({
     start: function() {
         this._super(this);
         var self = this;
-        this.$element.html(db.web.qweb.render('Sidebar'));
+        this.$element.html(session.web.qweb.render('Sidebar'));
         this.$element.find(".toggle-sidebar").click(function(e) {
             self.do_toggle();
         });
@@ -544,7 +569,7 @@ db.web.Sidebar = db.web.Widget.extend({
             {
                 label: _t("Manage Views"),
                 callback: this.call_default_on_sidebar,
-                title: _t("Manage views of the current object"),
+                title: _t("Manage views of the current object")
             }, {
                 label: _t("Edit Workflow"),
                 callback: this.call_default_on_sidebar,
@@ -553,7 +578,7 @@ db.web.Sidebar = db.web.Widget.extend({
             }, {
                 label: _t("Customize Object"),
                 callback: this.call_default_on_sidebar,
-                title: _t("Manage views of the current object"),
+                title: _t("Manage views of the current object")
             }
         ]);
 
@@ -561,10 +586,10 @@ db.web.Sidebar = db.web.Widget.extend({
         this.add_items('other', [ 
             {
                 label: _t("Import"),
-                callback: this.call_default_on_sidebar,
+                callback: this.call_default_on_sidebar
             }, {
                 label: _t("Export"),
-                callback: this.call_default_on_sidebar,
+                callback: this.call_default_on_sidebar
             }, {
                 label: _t("Translate"),
                 callback: this.call_default_on_sidebar,
@@ -601,10 +626,10 @@ db.web.Sidebar = db.web.Widget.extend({
 
         if(!$section) {
             section_id = _.uniqueId(this.element_id + '_section_' + code + '_');
-            var $section = $(db.web.qweb.render("Sidebar.section", {
+            var $section = $(session.web.qweb.render("Sidebar.section", {
                 section_id: section_id,
                 name: name,
-                classname: 'oe_sidebar_' + code,
+                classname: 'oe_sidebar_' + code
             }));
             $section.appendTo(this.$element.find('div.sidebar-actions'));
             this.sections[code] = $section;
@@ -633,7 +658,7 @@ db.web.Sidebar = db.web.Widget.extend({
                 this.items[items[i].element_id] = items[i];
             }
 
-            var $items = $(db.web.qweb.render("Sidebar.section.items", {items: items}));
+            var $items = $(session.web.qweb.render("Sidebar.section.items", {items: items}));
 
             $items.find('a.oe_sidebar_action_a').click(function() {
                 var item = self.items[$(this).attr('id')];
@@ -687,7 +712,7 @@ db.web.Sidebar = db.web.Widget.extend({
     }
 });
 
-db.web.TranslateDialog = db.web.Dialog.extend({
+session.web.TranslateDialog = session.web.Dialog.extend({
     dialog_title: _t("Translations"),
     init: function(view) {
         // TODO fme: should add the language to fields_view_get because between the fields view get
@@ -707,14 +732,14 @@ db.web.TranslateDialog = db.web.Dialog.extend({
         this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name });
         this.languages = null;
         this.languages_loaded = $.Deferred();
-        (new db.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
+        (new session.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
             [['translatable', '=', '1']])).read_slice(['code', 'name'], { sort: 'id' }, this.on_languages_loaded);
     },
     start: function() {
         var self = this;
         this._super();
         $.when(this.languages_loaded).then(function() {
-            self.$element.html(db.web.qweb.render('TranslateDialog', { widget: self }));
+            self.$element.html(session.web.qweb.render('TranslateDialog', { widget: self }));
             self.$element.tabs();
             if (!(self.view.translatable_fields && self.view.translatable_fields.length)) {
                 self.hide_tabs('fields');
@@ -819,7 +844,7 @@ db.web.TranslateDialog = db.web.Dialog.extend({
     }
 });
 
-db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
+session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
     template: "EmptyComponent",
     set_default_options: function(options) {
         this.options = options || {};
@@ -833,7 +858,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     },
     open_translate_dialog: function(field) {
         if (!this.translate_dialog) {
-            this.translate_dialog = new db.web.TranslateDialog(this).start();
+            this.translate_dialog = new session.web.TranslateDialog(this).start();
         }
         this.translate_dialog.open(field);
     },
@@ -845,7 +870,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
      * @param {String} [action_data.special=null] special action handlers (currently: only ``'cancel'``)
      * @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
      * @param {Object} [action_data.context=null] additional action context, to add to the current context
-     * @param {db.web.DataSet} dataset a dataset object used to communicate with the server
+     * @param {session.web.DataSet} dataset a dataset object used to communicate with the server
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
@@ -857,12 +882,12 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
                 return self.widget_parent.on_action_executed.apply(null, arguments);
             }
         };
-        var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
+        var context = new session.web.CompoundContext(dataset.get_context(), action_data.context || {});
         
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
-                var ncontext = new db.web.CompoundContext(context);
+                var ncontext = new session.web.CompoundContext(context);
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,
@@ -899,7 +924,7 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     /**
      * Directly set a view to use instead of calling fields_view_get. This method must
      * be called before start(). When an embedded view is set, underlying implementations
-     * of db.web.View must use the provided view instead of any other one.
+     * of session.web.View must use the provided view instead of any other one.
      *
      * @param embedded_view A view.
      */
@@ -917,7 +942,8 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     },
     on_sidebar_manage_views: function() {
         if (this.fields_view && this.fields_view.arch) {
-            $('<xmp>' + db.web.json_node_to_xml(this.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600});
+            var view_editor = new session.web.ViewEditor(this, this.$element, this.dataset, this.fields_view.arch);
+            view_editor.start();
         } else {
             this.do_warn("Manage Views", "Could not find current view declaration");
         }
@@ -929,11 +955,11 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
         console.log('Todo');
     },
     on_sidebar_import: function() {
-        var import_view = new db.web.DataImport(this, this.dataset);
+        var import_view = new session.web.DataImport(this, this.dataset);
         import_view.start();
     },
     on_sidebar_export: function() {
-        var export_view = new db.web.DataExport(this, this.dataset);
+        var export_view = new session.web.DataExport(this, this.dataset);
         export_view.start();
     },
     on_sidebar_translate: function() {
@@ -943,19 +969,19 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
     }
 });
 
-db.web.json_node_to_xml = function(node, single_quote, indent) {
+session.web.json_node_to_xml = function(node, human_readable, indent) {
     // For debugging purpose, this function will convert a json node back to xml
     // Maybe usefull for xml view editor
+    indent = indent || 0;
+    var sindent = (human_readable ? (new Array(indent + 1).join('\t')) : ''),
+        r = sindent + '<' + node.tag,
+        cr = human_readable ? '\n' : '';
 
     if (typeof(node) === 'string') {
-        return node;
-    }
-    else if (typeof(node.tag) !== 'string' || !node.children instanceof Array || !node.attrs instanceof Object) {
+        return sindent + node;
+    } else if (typeof(node.tag) !== 'string' || !node.children instanceof Array || !node.attrs instanceof Object) {
         throw("Node a json node");
     }
-    indent = indent || 0;
-    var sindent = new Array(indent + 1).join('\t'),
-        r = sindent + '<' + node.tag;
     for (var attr in node.attrs) {
         var vattr = node.attrs[attr];
         if (typeof(vattr) !== 'string') {
@@ -963,19 +989,19 @@ db.web.json_node_to_xml = function(node, single_quote, indent) {
             vattr = JSON.stringify(vattr);
         }
         vattr = vattr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-        if (single_quote) {
+        if (human_readable) {
             vattr = vattr.replace(/&quot;/g, "'");
         }
         r += ' ' + attr + '="' + vattr + '"';
     }
     if (node.children && node.children.length) {
-        r += '>\n';
+        r += '>' + cr;
         var childs = [];
         for (var i = 0, ii = node.children.length; i < ii; i++) {
-            childs.push(db.web.json_node_to_xml(node.children[i], single_quote, indent + 1));
+            childs.push(session.web.json_node_to_xml(node.children[i], human_readable, indent + 1));
         }
-        r += childs.join('\n');
-        r += '\n' + sindent + '</' + node.tag + '>';
+        r += childs.join(cr);
+        r += cr + sindent + '</' + node.tag + '>';
         return r;
     } else {
         return r + '/>';
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 7720ae2d38b..1fc98ba34ee 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -415,6 +415,9 @@
     <tr>
         <td class="view-manager-main-content">
             <div class="oe-view-manager-header">
+                <h2 class="oe_view_title" t-if="self.flags.display_title !== false">
+                    <t t-esc="self.display_title()"/>
+                </h2>
                 <div class="oe_vm_switch">
                     <t t-if="views.length != 1" t-foreach="views" t-as="view">
                         <button type="button" t-att-data-view-type="view.view_type">
@@ -452,9 +455,6 @@
         <button t-if="self.session.debug" class="oe_get_xml_view">
             View#<span></span>
         </button>
-        <h2 class="oe_view_title" t-if="self.flags.display_title !== false">
-            <t t-if="self.flags.display_title !== false" t-esc="self.action.name"/>
-        </h2>
     </t>
     <t t-jquery=".oe-view-manager-header" t-operation="after">
         <ul class="oe-view-manager-logs"></ul>
@@ -473,8 +473,6 @@
         <h2><t t-esc="name"/></h2>
     </div>
 </t>
-
-
 <t t-name="Sidebar.section.items">
             <li t-foreach="items" t-as="item" t-att-class="item.classname">
                 <a class="oe_sidebar_action_a" t-att-id="item.element_id" t-att-title="item.title" href="#">
@@ -551,6 +549,7 @@
         </span>
     </td>
 </tr>
+
 <table t-name="ListView" class="oe-listview-content">
     <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
     <thead class="ui-widget-header">
@@ -568,21 +567,7 @@
                                 Delete
                             </button>
                         </td>
-                        <th t-if="options.pager !== false" class="oe-list-pager">
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="first">First</button>
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="previous"
-                                    >&lt;</button>
-
-                            <span class="oe-pager-state">
-                            </span>
-
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="next">&gt;</button>
-                            <button type="button" disabled="disabled"
-                                    data-pager-action="last">Last</button>
-                        </th>
+                        <t t-call="Listview.navigation.button"/>
                     </tr>
                 </table>
             </th>
@@ -593,7 +578,8 @@
                     <t t-esc="column.string"/>
                 </th>
             </t>
-            <th t-if="options.selectable" width="1"/>
+            <th t-if="options.selectable" width="1"  >
+                <input type="checkbox" class="all-record-selector"/> </th>
             <t t-foreach="columns" t-as="column">
                 <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
                     t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)">
@@ -612,8 +598,26 @@
             </td>
             <td t-if="options.deletable"/>
         </tr>
+        <tr>
+            <t t-call="Listview.navigation.button"/>
+        </tr>
     </tfoot>
 </table>
+<th t-name="Listview.navigation.button" t-if="options.pager !== false"
+        class="oe-list-pager" t-att-colspan="columns_count">
+    <button type="button" disabled="disabled"
+            data-pager-action="first">First</button>
+    <button type="button" disabled="disabled"
+            data-pager-action="previous">&lt;</button>
+
+    <span class="oe-pager-state">
+    </span>
+
+    <button type="button" disabled="disabled"
+            data-pager-action="next">&gt;</button>
+    <button type="button" disabled="disabled"
+            data-pager-action="last">Last</button>
+</th>
 <t t-name="ListView.rows" t-foreach="records.length" t-as="index">
     <t t-call="ListView.row">
         <t t-set="record" t-value="records.at(index)"/>
@@ -628,9 +632,18 @@
 
         </td>
     </t>
-    <th t-if="options.selectable" class="oe-record-selector" width="1">
-        <input type="checkbox"/>
-    </th>
+    <t t-if="options.radio">
+        <th t-if="options.selectable" class="oe-record-selector" width="1">
+            <input type="radio" name ="radiogroup"/>
+        </th>
+    </t>
+    <t t-if="!options.radio">
+        <th t-if="options.selectable" class="oe-record-selector" width="1">
+            <input type="checkbox"/>
+        </th>
+    </t>
+
+
     <t t-foreach="columns" t-as="column">
         <t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/>
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
@@ -646,18 +659,20 @@
 <t t-name="ListView.row.form">
     <t t-raw="frame.render()"/>
 </t>
+
 <t t-name="FormView">
     <div class="oe_form_header">
-        <div class="oe_form_buttons" t-if="view.options.action_buttons !== false">
-            <button type="button" class="oe_form_button_save">
-                <span class="oe_form_on_update">Save</span>
-                <span class="oe_form_on_create">Create</span>
+        <div class="oe_form_buttons" t-if="widget.options.action_buttons !== false">
+            <button type="button" class="oe_form_button_save oe_form_on_editable">Save</button>
+            <button type="button" class="oe_form_button_toggle">
+                <span class="oe_form_on_editable">Cancel</span>
+                <span class="oe_form_on_readonly">Edit</span>
             </button>
-            <button type="button" class="oe_form_button_new">New</button>
-            <button type="button" class="oe_form_button_duplicate oe_form_on_update">Duplicate</button>
-            <button type="button" class="oe_form_button_toggle">Readonly/Editable</button>
+            <button type="button" class="oe_form_button_new oe_form_on_readonly">Create</button>
+            <button type="button" class="oe_form_button_duplicate oe_form_on_readonly">Duplicate</button>
+            <button type="button" class="oe_form_button_delete oe_form_on_readonly">Delete</button>
         </div>
-        <div class="oe_form_pager" t-if="view.options.pager !== false">
+        <div class="oe_form_pager" t-if="widget.options.pager !== false">
             <button type="button" data-pager-action="first">First</button>
             <button type="button" data-pager-action="previous">&lt;&lt;</button>
 
@@ -740,12 +755,6 @@
         <t t-call="WidgetFrame"/>
     </div>
 </t>
-<t t-name="WidgetNotebook.readonly">
-    <t t-foreach="widget.pages" t-as="page">
-        <h3><t t-esc="page.string"/></h3>
-        <t t-raw="page.render()"/>
-    </t>
-</t>
 <t t-name="WidgetSeparator">
     <div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
         <t t-esc="widget.string"/>
@@ -753,7 +762,7 @@
 </t>
 <t t-name="WidgetLabel">
     <label t-att-for="widget.element_id"
-           t-att-class="'oe_label' + (widget.help ? '_help' : '')"
+           t-attf-class="oe_label#{widget.help ? '_help' : ''} oe_align_#{widget.align}"
            t-att-title="widget.help">
         <t t-esc="widget.string"/>
         <span t-if="widget.help">?</span>
@@ -761,10 +770,10 @@
     </label>
 </t>
 <t t-name="WidgetParagraph">
-    <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
+    <p t-attf-class="oe_form_paragraph oe_align_#{widget.align}"><t t-esc="widget.string"/></p>
 </t>
 <t t-name="FieldChar">
-    <input type="text" size="1"
+    <input t-att-type="widget.password ? 'password' : 'text'" size="1"
         t-att-name="widget.name"
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
@@ -855,9 +864,9 @@
 </t>
 <t t-name="FieldMany2One.context_menu">
     <ul>
-        <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open...</li>
-        <li t-att-id="widget.cm_id + '_create'">Create...</li>
-        <li t-att-id="widget.cm_id + '_search'" class="oe_m2o_menu_item_mandatory">Search...</li>
+        <li t-att-id="widget.cm_id + '_open'" style="color:grey" class="oe_m2o_menu_item_mandatory">Open...</li>
+        <li t-att-id="widget.cm_id + '_create'" class="oe_m2o_menu_item_noreadonly">Create...</li>
+        <li t-att-id="widget.cm_id + '_search'" class="oe_m2o_menu_item_noreadonly">Search...</li>
         <t t-set="i" t-value="0"/>
         <t t-foreach="widget.related_entries" t-as="entry">
             <li t-att-id="widget.cm_id + '_related_' + i" style="color:grey" class="oe_m2o_menu_item_mandatory">
@@ -1002,6 +1011,7 @@
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
 </t>
+
 <t t-name="SearchView">
     <form class="oe_forms">
         <t t-call="SearchView.render_lines"/>
@@ -1271,6 +1281,55 @@
             .unwrap();
     </t>
 </t>
+<t t-name="view_editor">
+    <table class="oe_view_editor">
+        <t t-call="view_editor.row"/>
+    </table>
+</t>
+<tr t-name="view_editor.row"  class="oe_view_editor_row" t-att-id="'viewedit-' + rec.id"  t-att-level="rec.level" t-foreach="data" t-as="rec">
+    <td class="oe_view_editor_colum"  width="85%">
+        <table class="oe_view_editor_tree_grid">
+            <tr>
+                <td width="16px" t-att-style="'background-position: ' + 20*rec.level + 'px; padding-left: ' + 20*rec.level + 'px'">
+                    <img t-if="rec.child_id.length" t-att-id="'parentimg-' + rec.id"
+                        src="/web/static/src/img/collapse.gif" width="16" height="16" border="0"/>
+                </td>
+                <td style="cursor: pointer;">
+                    <a style="text-decoration:none" href="javascript:void(0);"> <t t-esc="rec.name"/> </a>
+                </td>
+            </tr>
+        </table>
+    </td>
+    <td align="left" class="oe_view_editor_colum"  width="15%">
+        <table  width="100%">
+            <tr>
+                <td width="20%">
+                    <img t-if="rec.att_list.length"
+                        id="side-add" src="/web/static/src/img/icons/gtk-add.png" style="cursor: pointer;"/>
+                </td>
+                <td width="20%">
+                    <img  id="side-remove" src="/web/static/src/img/icons/gtk-remove.png" style="cursor: pointer;"/>
+                </td>
+                <td width="20%">
+                    <img t-if="rec.att_list.length"
+                        id="side-edit" src="/web/static/src/img/icons/gtk-edit.png" style="cursor: pointer;"/>
+                </td>
+                <td width="20%">
+                    <img t-if="rec.att_list.length"
+                        id="side-up" src="/web/static/src/img/icons/gtk-go-up.png" style="cursor: pointer;"/>
+                </td>
+                <td width="20%">
+                    <img t-if="rec.att_list.length"
+                        id="side-down" src="/web/static/src/img/icons/gtk-go-down.png" style="cursor: pointer;"/>
+                </td>
+            </tr>
+        </table>
+    </td>
+    <t t-if="rec.child_id.length">
+        <t t-set="data" t-value="rec.child_id"/>
+        <t t-call="view_editor.row"/>
+    </t>
+</tr>
 
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
@@ -1405,7 +1464,8 @@
     <a id="importview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Import</a>
 </t>
 <t t-name="ImportDataView">
-<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data">
+<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"
+        class="oe-import oe-import-no-result">
     <input type="hidden" name="session_id" t-att-value="session.session_id"/>
     <h2 class="separator horizontal">1. Import a .CSV file</h2>
     <p>Select a .CSV file to import. If you need a sample of file to import,
@@ -1415,11 +1475,11 @@
         <label for="csvfile">CSV File:</label>
         <input type="file" id="csvfile" size="50" name="csvfile"/>
     </p>
-    <h2 class="separator horizontal">2. Check your file format</h2>
-    <div id="result"></div>
-    <fieldset>
-        <legend style="cursor:pointer;">Import Options</legend>
-        <table style="display:none">
+    <h2 class="separator horizontal oe-import-result">2. Check your file format</h2>
+    <div id="result" class="oe-import-result"></div>
+    <fieldset class="oe-closed oe-import-result">
+        <legend>Import Options</legend>
+        <table>
             <tr>
                 <td colspan="4">
                     <label for="file_has_headers">Does your file have titles?</label>
@@ -1449,22 +1509,24 @@
     </fieldset>
 </form>
 </t>
-<table t-name="ImportView.result"
-        class="oe_import_grid" width="100%" style="margin: 5px 0;">
-    <tr t-if="headers" class="oe_import_grid-header">
-        <td t-foreach="headers" t-as="header" class="oe_import_grid-cell">
-            <t t-esc="header"/></td>
-    </tr>
-    <tr>
-        <td t-foreach="records[0]" t-as="column">
-            <input class="sel_fields"/>
-        </td>
-    </tr>
-    <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
-        <td t-foreach="record" t-as="cell" class="oe_import_grid-cell">
-            <t t-esc="cell"/></td>
-    </tr>
-</table>
+<t t-name="ImportView.result">
+    <table class="oe_import_grid" width="100%" style="margin: 5px 0;">
+        <tr t-if="headers" class="oe_import_grid-header">
+            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell">
+                <t t-esc="header"/></td>
+        </tr>
+        <tr>
+            <td t-foreach="records[0]" t-as="column">
+                <input class="sel_fields" placeholder="--- Don't Import ---"/><span class="oe-m2o-drop-down-button">
+                        <img src="/web/static/src/img/down-arrow.png" /></span>
+            </td>
+        </tr>
+        <tr t-foreach="records" t-as="record" class="oe_import_grid-row">
+            <td t-foreach="record" t-as="cell" class="oe_import_grid-cell">
+                <t t-esc="cell"/></td>
+        </tr>
+    </table>
+</t>
 <t t-name="ImportView.error">
     <p style="white-space:pre-line;">The import failed due to:<t t-esc="error.message"/></p>
     <t t-if="error.preview">