From db0770f1fb0e97e23a14849c543cb25cd689bcea Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 20 Jan 2012 18:57:33 +0530
Subject: [PATCH 01/15] [IMP]add auto_search var.

bzr revid: vme@tinyerp.com-20120120132733-nxams21g4lzniob3
---
 addons/web/static/src/js/view_editor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 6e58886fadd..10dd199b84a 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -27,6 +27,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             type: 'ir.actions.act_window',
             target: "current",
             limit: this.dataset.limit || 80,
+            auto_search : true,
             flags: {
                 sidebar: false,
                 deletable: false,

From 7abae86af45c310da12b09ecd34a5c5ed98e62d1 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 23 Jan 2012 19:01:12 +0530
Subject: [PATCH 02/15] [IMP]implement css and improve code for new fields.

bzr revid: vme@tinyerp.com-20120123133112-kipziko910s43nim
---
 addons/web/static/src/css/base.css      | 36 +++++++++----------
 addons/web/static/src/js/view_editor.js | 16 ++++-----
 addons/web/static/src/xml/base.xml      | 48 +++++++++++--------------
 3 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 13068e123a5..316b92d358e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1857,6 +1857,7 @@ label.error {
     width: 100%;
     background-color : #FFFFFF;
     border-spacing: 0;
+    
 }
 .openerp .oe-treeview-table tr:hover{
     color: blue;
@@ -2000,33 +2001,30 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
     border-bottom-right-radius: 3px;
 }
 .openerp .oe_view_editor {
-    border-collapse: collapse;
-    padding: 0;
-    align: left;
+    width:100%;
+    border-collapse : collapse;
+    margin-left: -12px;
+    
     width: 100%;
+    background-color : white;
+    border-spacing: 0;
 }
-.openerp .oe_view_editor_colum{
+.openerp .oe_view_editor td{
+    text-align: center;
+    white-space: nowrap;
+    border: 1px solid #D8D8D8;
+    
+    cursor: pointer;
     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_field td{
+    border: 0px !important;
 }
 
-.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 {
+.openerp .oe_view_editor td:hover {
     color: blue;
 }
-.openerp .oe_view_editor_tree_grid a {
-    display: block;
-}
+
 
 /* Dialog traceback cases */
 .openerp .oe_error_detail{
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 10dd199b84a..1de39ee6809 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -46,7 +46,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 {text: _t("Create"), click: function() { self.on_create_view(); }},
                 {text: _t("Edit"), click: function() { self.xml_element_id = 0; self.get_arch(); }},
                 {text: _t("Remove"), click: function() { self.do_delete_view(); }},
-                {text: _t("Close"), click: function() { self.view_edit_dialog.close(); }}
+                {text: _t("Close"), click: function() {self.view_edit_dialog.close(); }}
             ]
         }).open();
         this.main_view_id = this.parent.fields_view.view_id;
@@ -935,16 +935,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var action_manager = new openerp.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_viewmanager.views['form'].controller;
-            // TODO NIV: use page view
-            controller.do_set_readonly.add_last(function(){
+            controller.on_button_cancel.add_last(function(){
+                action_manager.stop()
+            });
+            controller.do_save.add_last(function(){
                 action_manager.stop();
-                new_fields_name = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
-                new_fields_name.read_ids([controller.datarecord.id], ['name']).then(function(result) {
-                self.add_node_dialog.$element.find('select[id=field_value]').append($("<option selected></option>").attr("value", result[0].name).text(result[0].name));
+                var value =controller.fields.name.value;
+                self.add_node_dialog.$element.find('select[id=field_value]').append($("<option selected></option>").attr("value",value).text(value));
                     _.detect(self.add_widget,function(widget){
-                        widget.name == "field_value"? widget.selection.push(result[0].name): false;
+                        widget.name == "field_value"? widget.selection.push(value): false;
                     });
-                });
             });
         });
     }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b119e5aae3c..26ed45c8f24 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1453,9 +1453,9 @@
     </table>
 </t>
 <t t-name="view_editor.row">
-    <tr  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  t-att-id="'viewedit-' + rec.id"  t-att-level="rec.level" t-foreach="data" t-as="rec">
+        <td width="90%">
+            <table class="oe_view_editor_field">
                 <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"
@@ -1469,30 +1469,24 @@
                 </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 and !_.include(no_properties, rec.att_list[0])"
-                            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 width="2%">
+            <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="2%">
+            <img  id="side-remove" src="/web/static/src/img/icons/gtk-remove.png" style="cursor: pointer;"/>
+        </td>
+        <td width="2%">
+            <img t-if="rec.att_list.length and !_.include(no_properties, rec.att_list[0])"
+                id="side-edit" src="/web/static/src/img/icons/gtk-edit.png" style="cursor: pointer;"/>
+        </td>
+        <td width="2%">
+            <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="2%">
+            <img t-if="rec.att_list.length"
+                id="side-down" src="/web/static/src/img/icons/gtk-go-down.png" style="cursor: pointer;"/>
         </td>
         <t t-if="rec.child_id.length">
             <t t-set="data" t-value="rec.child_id"/>

From 2562b5e5863cb979ee83b6951e6fa540f89fcd11 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 24 Jan 2012 10:53:39 +0530
Subject: [PATCH 03/15] [IMP]display full name of res.groups.

bzr revid: vme@tinyerp.com-20120124052339-o690awgzzafquq9n
---
 addons/web/static/src/css/base.css      | 4 ++--
 addons/web/static/src/js/view_editor.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 316b92d358e..8a2c84f3b6f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2021,8 +2021,8 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
     border: 0px !important;
 }
 
-.openerp .oe_view_editor td:hover {
-    color: blue;
+.openerp .oe_view_editor tr:hover {
+    background-color: #ecebf2;
 }
 
 
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 1de39ee6809..ef62a2ebb78 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -848,7 +848,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             .done(function(res_grp) {
                 _.each(res_grp,function(res){
                     var key = res.id;
-                    group_names[key]=res.name;
+                    group_names[key]=res.full_name;
                     group_ids.push(res.id);
                 });
                 model_data

From 1e3253e561f701c0c777c266ca75f1a66517da23 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 24 Jan 2012 11:12:11 +0530
Subject: [PATCH 04/15] [FIX]when group string change after that fields are
 added.

bzr revid: vme@tinyerp.com-20120124054211-l0m10yblwdy4yxaj
---
 addons/web/static/src/js/view_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ef62a2ebb78..d43a30f21a8 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -450,7 +450,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     do_node_add: function(side){
         var self = this;
-        var tr = $(side).find('a').text();
+        var tr = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], [])[0].att_list[0];
         var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0];
         var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null);
         parent_tr = $(parent_tr).find('a').text();

From 2ffb3404fc818f3253cd09e930222344a9699aab Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 24 Jan 2012 14:47:06 +0530
Subject: [PATCH 05/15] [FIX]tree view top/bottom editable issue.

bzr revid: vme@tinyerp.com-20120124091706-q9jx2o6zsrly2jbd
---
 addons/web/static/src/js/view_editor.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d43a30f21a8..6ff2eb74afa 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -46,7 +46,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 {text: _t("Create"), click: function() { self.on_create_view(); }},
                 {text: _t("Edit"), click: function() { self.xml_element_id = 0; self.get_arch(); }},
                 {text: _t("Remove"), click: function() { self.do_delete_view(); }},
-                {text: _t("Close"), click: function() {self.view_edit_dialog.close(); }}
+                {text: _t("Close"), click: function() { self.view_edit_dialog.close(); }}
             ]
         }).open();
         this.main_view_id = this.parent.fields_view.view_id;
@@ -369,6 +369,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         views: [[self.main_view_id, self.main_view_type]],
                         type: 'ir.actions.act_window',
                         target: "new",
+                        auto_search: true,
                         flags: {
                             sidebar: false,
                             views_switcher: false,
@@ -569,7 +570,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         arch_to_pass = _.filter($(arch.arch), function (child) {
             return child.nodeType == 1;
         });
-        return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0],[], move_direct, update_values,arch);
+        return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);
     },
     get_object_by_id: function(id, one_object, result) {
         var self = this;
@@ -824,6 +825,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
                     return res instanceof Array? _.include(res, widget.name): false;
                 });
+                
                 value = value instanceof Array ? value[1] : value;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + widget.string + ':</td>' + type_widget.render() + '</tr>');
                 type_widget.start();
@@ -1041,7 +1043,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         var index = 0;
         value = value === null? false: value;
         for (var i = 0, ii = this.selection.length; i < ii; i++) {
-            if ((this.selection[i] instanceof Array && this.selection[i][1] === value) || this.selection[i] === value) index = i;
+            if ((this.selection[i] instanceof Array && this.selection[i][0] === value) || this.selection[i] === value) index = i;
         }
         this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
     },
@@ -1094,7 +1096,7 @@ var _CHILDREN = {
     'calendar': ['field'],
     'notebook': ['page'],
     'page': ['notebook', 'group', 'field', 'label', 'button', 'newline', 'separator'],
-    'group': ['field', 'label', 'button', 'separator', 'newline'],
+    'group': ['field', 'label', 'button', 'separator', 'newline','group'],
     'board': ['column'],
     'action': [],
     'field': ['form', 'tree', 'graph'],

From a9aaad2257ae9b61729757007ef59db41f8521f4 Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Thu, 2 Feb 2012 17:04:56 +0530
Subject: [PATCH 06/15] [RES] Resolve conflict from view-editor.js.

bzr revid: jra@tinyerp.com-20120202113456-wqpffa9mdpinmbby
---
 addons/web/static/src/js/view_editor.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 97304bbb679..7fd88749193 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -848,11 +848,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             res_groups.read_slice([], {}).done(function (res_grp) {
                 _.each(res_grp, function (res) {
                     var key = res.id;
-<<<<<<< TREE
                     group_names[key]=res.full_name;
-=======
-                    group_names[key] = res.name;
->>>>>>> MERGE-SOURCE
                     group_ids.push(res.id);
                 });
                 model_data.read_slice([], {domain: [

From c5b572cd5e4481332a8ded5953a89de0e7574dfe Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 9 Feb 2012 12:53:32 +0530
Subject: [PATCH 07/15] [REM]Remove custmiztion object functionality.

bzr revid: vme@tinyerp.com-20120209072332-6243cd7rdocpkh5l
---
 addons/web/static/src/js/views.js  | 10 ----------
 addons/web/static/src/xml/base.xml |  1 -
 2 files changed, 11 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 7c1f7385927..3dcb9145e12 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -602,16 +602,6 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
                         width: '95%'}, $root).open();
                 });
                 break;
-            case 'customize_object':
-                this.rpc('/web/dataset/search_read', {
-                    model: 'ir.model',
-                    fields: ['id'],
-                    domain: [['model', '=', this.dataset.model]]
-                }, function (result) {
-                    self.do_edit_resource('ir.model', result.ids[0], {
-                        name : _t("Customize Object") });
-                });
-                break;
             case 'manage_views':
                 if (current_view.fields_view && current_view.fields_view.arch) {
                     var view_editor = new session.web.ViewEditor(current_view, current_view.$element, this.dataset, current_view.fields_view.arch);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c1fdb3b7c92..1bf99faa40b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -484,7 +484,6 @@
         <option t-if="view_manager.searchview" value="edit" data-model="ir.ui.view" t-att-data-id="view_manager.searchview.view_id">Edit SearchView</option>
         <option t-if="view_manager.action" value="edit" t-att-data-model="view_manager.action.type" t-att-data-id="view_manager.action.id">Edit Action</option>
         <option value="edit_workflow">Edit Workflow</option>
-        <option value="customize_object">Customize Object</option>
     </t>
 </t>
 <t t-name="ViewManagerDebugViewLog">

From b859b935248d6576e30cb73c1e5e192d021ab1da Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 9 Feb 2012 14:38:53 +0530
Subject: [PATCH 08/15] [IMP]Fix recursion error.

bzr revid: vme@tinyerp.com-20120209090853-db8jjlx8cp5el991
---
 addons/web/static/src/js/view_editor.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index a2a927fa86d..b95b0c00604 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -46,9 +46,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 {text: _t("Create"), click: function() { self.on_create_view(); }},
                 {text: _t("Edit"), click: function() { self.xml_element_id = 0; self.get_arch(); }},
                 {text: _t("Remove"), click: function() { self.do_delete_view(); }},
-                {text: _t("Close"), click: function() { self.view_edit_dialog.close(); }}
+                {text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }}
             ]
         }).open();
+        this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new openerp.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog);
@@ -601,7 +602,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         return clone;
     },
     do_save_xml: function(arch1, obj, child_list, move_direct, update_values, arch){
-        var self = this, children_list =  $(arch1).children(), list_obj_xml = _.zip(children_list, obj.child_id);
+        var self = this, children_list =  $(arch1).children(),list_obj_xml;
+        try{list_obj_xml = _.zip(children_list, obj.child_id);}catch(err){return;}
         if (this.one_object.clicked_tr_id) {
             if (obj.id == this.one_object.clicked_tr_id) {
                 var parent = false, index = _.indexOf(child_list, obj);

From 4499491098e0ea416b7358e5597442ec2f10cf4a Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 9 Feb 2012 19:17:04 +0530
Subject: [PATCH 09/15] [IMP]develop inherit view functionaliy.

bzr revid: vme@tinyerp.com-20120209134704-0tnp339kh6c57m9f
---
 addons/web/static/src/js/view_editor.js | 71 +++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index b95b0c00604..03a4446bd22 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -115,6 +115,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     do_save_view: function(values) {
         def = $.Deferred();
+        console.log("valuesss",values);
         var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null);
         var model_dataset = new openerp.web.DataSetSearch(this, 'ir.model', null, null);
         var view_string = "", field_name = false, self = this;
@@ -235,6 +236,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 self.main_view_type = arch[0].type == 'tree'? 'list': arch[0].type;
                 view_arch_list.push({"view_id": self.main_view_id, "arch": arch[0].arch});
                 self.dataset.read_slice([], {domain: [['inherit_id','=', parseInt(self.main_view_id)]]}).then(function(result) {
+                    console.log("resulttt",result);
                     _.each(result, function(res) {
                         view_arch_list.push({"view_id": res.id, "arch": res.arch});
                         self.inherit_view(arch_object, res);
@@ -279,6 +281,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     return list instanceof Array? _.include(list, "position"): false;
                 });
                 expr_to_list = [_.flatten(temp)];
+                console.log("exprt",expr_to_list,xpath_arch_object);
             }
             self.inherit_apply(expr_to_list, arch_object ,xpath_arch_object);
         });
@@ -305,7 +308,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case 3:
                     //for field[@name='type']
                     obj = _.detect(arch_object, function(element){
-                        if ((_.intersection(_.flatten(element.att_list), _.uniq(check))).length == check.length) {
+                        if ((_.intersection(_.flatten(element.att_list), _.uniq(check))).length == _.uniq(check).length) {
                             return element;
                         }
                     });
@@ -363,6 +366,20 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             title: _.str.sprintf(_t("View Editor %d - %s"), self.main_view_id, self.model),
             height: '90%',
             buttons: [
+                {text: _t("Inherit View"), click: function(){
+                    var selected_row = self.edit_xml_dialog.$element.find('.ui-selected');
+                    if (selected_row.length) {
+                        if(selected_row.find('a').text().search("field") != -1){
+                            if (confirm(_t("Do you really wants to create an inherited view here?"))) {
+                                self.inherited_view(selected_row);
+                            }
+                        }else{
+                            alert("Can't Update View");
+                        }
+                    }else{
+                        alert("Select an element");
+                    }
+                }},
                 {text: _t("Preview"), click: function() {
                     var action = {
                         context: self.session.user_context,
@@ -400,6 +417,54 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             self.on_select_img(this);
         });
     },
+    inherited_view: function(selected_row){
+        var self = this;
+        var row_id = parseInt((selected_row.attr('id')).split('-')[1]);
+        var obj = self.get_object_by_id(row_id,self.one_object['main_object'], [])[0];
+        var view_name = this.model + '.inherit_' + Math.round(Math.random() * 1000),
+        view_find = selected_row,view_id,view_xml_id,min_level = parseInt(selected_row.attr('level'));
+        while (1) {
+            view_find = view_find.prev();
+            if (view_find.length == 0 ||
+                    (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
+                    && parseInt(view_find.attr('level')) < min_level ) {
+                        
+                view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
+                view_xml_id = parseInt((view_find.attr('id')).split('-')[1]);
+                break;
+            }
+            if (view_find.attr('level') < min_level) {min_level = parseInt(view_find.attr('level'));}
+        }
+        val = _.detect(obj.att_list,function(val){
+                return val[0] == "name";
+            });
+        var arch = _.str.sprintf("<?xml version='1.0'?>\n\t <field name='%s' position='after'> </field>", val[1]);
+        var vals = {'model': self.model, 'name': view_name, 'priority': 16, 'type': "form", 'arch': arch,'inherit_id':view_id};
+        this.dataset.create(vals, function(suc) {
+            var arch_to_obj = self.parse_xml(arch,suc.result);
+            self.increase_level(arch_to_obj[0],obj.level+1);
+            obj.child_id.push(arch_to_obj[0]);
+            self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
+            self.render_inherited_view(selected_row,arch_to_obj[0]);        
+        });
+    },
+    render_inherited_view: function(selected_row,obj){
+        var self = this;
+        var row_id = parseInt((selected_row.attr('id')).split('-')[1]);
+        var clone = this.create_clone(selected_row.clone(),obj);
+        if (selected_row.find("img[id^='parentimg-']").length == 0) {
+            ($(selected_row.find('a').parent()).siblings('td'))
+            .append($('<img width="16" height="16"></img>').attr('src', '/web/static/src/img/collapse.gif').
+             attr('id','parentimg-'+ row_id).click(function(){
+                self.do_parent_img_hide_show(this);
+            }));
+        }
+        self.edit_xml_dialog.$element.
+            find("tr[id='viewedit-"+row_id+"']").after(clone);
+        _.each(obj.child_id,function(obj){
+            self.render_inherited_view(clone,obj);
+        });
+    },
     on_select_img: function(element_img) {
         var self = this;
         var side = $(element_img).closest("tr[id^='viewedit-']");
@@ -565,7 +630,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             arch.arch = _.detect(children, function(xml_child) {
                 var temp_obj = self.create_View_Node(xml_child),
                     insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
-                if (insert.length == check_list.length ) {return xml_child;}
+                if (insert.length == _.uniq(check_list).length ) {return xml_child;}
             });
         }
         arch_to_pass = _.filter($(arch.arch), function (child) {
@@ -586,7 +651,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return result;
     },
-    create_clone: function(clone, new_node_obj, position){
+    create_clone: function(clone, new_node_obj){
         var self = this;
         clone.find('a').text(new_node_obj.name);
         ($(clone.find('a').parent()).siblings('td')).css( "padding-left", 20 * new_node_obj.level);

From 5c7cc64be7366b5a82b352e5eb336aa6d210e83b Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 10 Feb 2012 10:58:53 +0530
Subject: [PATCH 10/15] [IMP]some minor changes.

bzr revid: vme@tinyerp.com-20120210052853-aovv3baf4u5wl3pp
---
 addons/web/static/src/js/view_editor.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 03a4446bd22..8baf7b23c25 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -115,7 +115,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     do_save_view: function(values) {
         def = $.Deferred();
-        console.log("valuesss",values);
         var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null);
         var model_dataset = new openerp.web.DataSetSearch(this, 'ir.model', null, null);
         var view_string = "", field_name = false, self = this;
@@ -167,10 +166,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     do_delete_view: function() {
         if (confirm(_t("Do you really want to remove this view?"))) {
             var controller = this.action_manager.inner_viewmanager.views[this.action_manager.inner_viewmanager.active_view].controller;
-            this.dataset.unlink([this.main_view_id]).then(function() {
-                controller.reload_content();
-                this.main_view_id = self.parent.fields_view.view_id;
-            });
+            this.dataset.unlink([this.main_view_id]).then(function() {controller.reload_content();});
         }
     },
     create_View_Node: function(node){
@@ -236,7 +232,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 self.main_view_type = arch[0].type == 'tree'? 'list': arch[0].type;
                 view_arch_list.push({"view_id": self.main_view_id, "arch": arch[0].arch});
                 self.dataset.read_slice([], {domain: [['inherit_id','=', parseInt(self.main_view_id)]]}).then(function(result) {
-                    console.log("resulttt",result);
                     _.each(result, function(res) {
                         view_arch_list.push({"view_id": res.id, "arch": res.arch});
                         self.inherit_view(arch_object, res);
@@ -281,7 +276,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     return list instanceof Array? _.include(list, "position"): false;
                 });
                 expr_to_list = [_.flatten(temp)];
-                console.log("exprt",expr_to_list,xpath_arch_object);
             }
             self.inherit_apply(expr_to_list, arch_object ,xpath_arch_object);
         });
@@ -371,6 +365,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     if (selected_row.length) {
                         if(selected_row.find('a').text().search("field") != -1){
                             if (confirm(_t("Do you really wants to create an inherited view here?"))) {
+                                self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller.reload_content();
                                 self.inherited_view(selected_row);
                             }
                         }else{
@@ -442,6 +437,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var vals = {'model': self.model, 'name': view_name, 'priority': 16, 'type': "form", 'arch': arch,'inherit_id':view_id};
         this.dataset.create(vals, function(suc) {
             var arch_to_obj = self.parse_xml(arch,suc.result);
+            self.one_object['arch'].push({'view_id':suc.result,"arch":arch});
             self.increase_level(arch_to_obj[0],obj.level+1);
             obj.child_id.push(arch_to_obj[0]);
             self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
@@ -460,7 +456,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }));
         }
         self.edit_xml_dialog.$element.
-            find("tr[id='viewedit-"+row_id+"']").after(clone);
+            find("tr[id='viewedit-"+row_id+"']").after(clone.removeClass('ui-selected'));
         _.each(obj.child_id,function(obj){
             self.render_inherited_view(clone,obj);
         });

From cf6bf41255bd23d7e1e0adfdb1906b3ba8d93249 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 10 Feb 2012 11:22:01 +0530
Subject: [PATCH 11/15] [FIX]set default view_id after deteleting view.

bzr revid: vme@tinyerp.com-20120210055201-6576d0encj4re56h
---
 addons/web/static/src/js/view_editor.js | 32 +++++++++++--------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8baf7b23c25..31239eca1b0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -164,9 +164,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
     },
     do_delete_view: function() {
+        var self = this;
         if (confirm(_t("Do you really want to remove this view?"))) {
             var controller = this.action_manager.inner_viewmanager.views[this.action_manager.inner_viewmanager.active_view].controller;
-            this.dataset.unlink([this.main_view_id]).then(function() {controller.reload_content();});
+            this.dataset.unlink([this.main_view_id]).then(function() {
+                controller.reload_content();
+                self.main_view_id = self.parent.fields_view.view_id;
+            });
         }
     },
     create_View_Node: function(node){
@@ -413,40 +417,34 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
     },
     inherited_view: function(selected_row){
-        var self = this;
-        var row_id = parseInt((selected_row.attr('id')).split('-')[1]);
+        var self = this,row_id = parseInt((selected_row.attr('id')).split('-')[1]);
         var obj = self.get_object_by_id(row_id,self.one_object['main_object'], [])[0];
         var view_name = this.model + '.inherit_' + Math.round(Math.random() * 1000),
-        view_find = selected_row,view_id,view_xml_id,min_level = parseInt(selected_row.attr('level'));
+        view_find = selected_row,view_id,min_level = parseInt(selected_row.attr('level'));
         while (1) {
             view_find = view_find.prev();
             if (view_find.length == 0 ||
                     (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
                     && parseInt(view_find.attr('level')) < min_level ) {
-                        
                 view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
-                view_xml_id = parseInt((view_find.attr('id')).split('-')[1]);
                 break;
             }
             if (view_find.attr('level') < min_level) {min_level = parseInt(view_find.attr('level'));}
         }
-        val = _.detect(obj.att_list,function(val){
-                return val[0] == "name";
-            });
+        val = _.detect(obj.att_list,function(val){return val[0] == "name";});
         var arch = _.str.sprintf("<?xml version='1.0'?>\n\t <field name='%s' position='after'> </field>", val[1]);
         var vals = {'model': self.model, 'name': view_name, 'priority': 16, 'type': "form", 'arch': arch,'inherit_id':view_id};
         this.dataset.create(vals, function(suc) {
             var arch_to_obj = self.parse_xml(arch,suc.result);
-            self.one_object['arch'].push({'view_id':suc.result,"arch":arch});
-            self.increase_level(arch_to_obj[0],obj.level+1);
-            obj.child_id.push(arch_to_obj[0]);
             self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
-            self.render_inherited_view(selected_row,arch_to_obj[0]);        
+            self.one_object['arch'].push({'view_id':suc.result,"arch":arch});
+            obj.child_id.push(arch_to_obj[0]);
+            self.increase_level(arch_to_obj[0],obj.level+1);
+            self.render_inherited_view(selected_row,arch_to_obj[0]);
         });
     },
     render_inherited_view: function(selected_row,obj){
-        var self = this;
-        var row_id = parseInt((selected_row.attr('id')).split('-')[1]);
+        var self = this,row_id = parseInt((selected_row.attr('id')).split('-')[1]);
         var clone = this.create_clone(selected_row.clone(),obj);
         if (selected_row.find("img[id^='parentimg-']").length == 0) {
             ($(selected_row.find('a').parent()).siblings('td'))
@@ -457,9 +455,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         self.edit_xml_dialog.$element.
             find("tr[id='viewedit-"+row_id+"']").after(clone.removeClass('ui-selected'));
-        _.each(obj.child_id,function(obj){
-            self.render_inherited_view(clone,obj);
-        });
+        _.each(obj.child_id,function(obj){self.render_inherited_view(clone,obj);});
     },
     on_select_img: function(element_img) {
         var self = this;

From 31ec88474aa9fa0f3340fb3cc90b81cf9c8288e6 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 10 Feb 2012 12:38:30 +0530
Subject: [PATCH 12/15] [IMP]some change for earlier inherited view.

bzr revid: vme@tinyerp.com-20120210070830-jz7rw2rqt5gr6bw3
---
 addons/web/static/src/js/view_editor.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 31239eca1b0..3abf1736eef 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -230,14 +230,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     get_arch: function() {
         var self = this;
         var view_arch_list = [];
-        this.dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type']).then(function(arch) {
+        this.dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type','priority']).then(function(arch) {
             if (arch.length) {
                 var arch_object = self.parse_xml(arch[0].arch, self.main_view_id);
                 self.main_view_type = arch[0].type == 'tree'? 'list': arch[0].type;
-                view_arch_list.push({"view_id": self.main_view_id, "arch": arch[0].arch});
+                view_arch_list.push({"view_id": self.main_view_id, "arch": arch[0].arch,"priority":arch[0].priority});
                 self.dataset.read_slice([], {domain: [['inherit_id','=', parseInt(self.main_view_id)]]}).then(function(result) {
                     _.each(result, function(res) {
-                        view_arch_list.push({"view_id": res.id, "arch": res.arch});
+                        view_arch_list.push({"view_id": res.id, "arch": res.arch,"priority":res.priority});
                         self.inherit_view(arch_object, res);
                     });
                     return self.edit_view({"main_object": arch_object,
@@ -431,14 +431,15 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             if (view_find.attr('level') < min_level) {min_level = parseInt(view_find.attr('level'));}
         }
-        val = _.detect(obj.att_list,function(val){return val[0] == "name";});
+        var val = _.detect(obj.att_list,function(val){return val[0] == "name";});
+        var priority =_.detect(self.one_object['arch'],function(val){return val.view_id == view_id;});
         var arch = _.str.sprintf("<?xml version='1.0'?>\n\t <field name='%s' position='after'> </field>", val[1]);
-        var vals = {'model': self.model, 'name': view_name, 'priority': 16, 'type': "form", 'arch': arch,'inherit_id':view_id};
+        var vals = {'model': self.model, 'name': view_name, 'priority': priority.priority + 1, 'type': "form", 'arch': arch,'inherit_id':self.main_view_id};
         this.dataset.create(vals, function(suc) {
             var arch_to_obj = self.parse_xml(arch,suc.result);
-            self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
-            self.one_object['arch'].push({'view_id':suc.result,"arch":arch});
             obj.child_id.push(arch_to_obj[0]);
+            self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
+            self.one_object['arch'].push({'view_id':suc.result,"arch":arch,'priority': priority.priority + 1});
             self.increase_level(arch_to_obj[0],obj.level+1);
             self.render_inherited_view(selected_row,arch_to_obj[0]);
         });

From d6d57fc2069889efc488ebc6f08e537aeb620a2b Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 10 Feb 2012 12:42:13 +0530
Subject: [PATCH 13/15] [IMP]reload dialoag after closing edit dialog box.

bzr revid: vme@tinyerp.com-20120210071213-tbr9tdxkneq21guh
---
 addons/web/static/src/js/view_editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 3abf1736eef..e0c7e49394e 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -364,12 +364,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             title: _.str.sprintf(_t("View Editor %d - %s"), self.main_view_id, self.model),
             height: '90%',
             buttons: [
-                {text: _t("Inherit View"), click: function(){
+                {text: _t("Inherited View"), click: function(){
                     var selected_row = self.edit_xml_dialog.$element.find('.ui-selected');
                     if (selected_row.length) {
                         if(selected_row.find('a').text().search("field") != -1){
                             if (confirm(_t("Do you really wants to create an inherited view here?"))) {
-                                self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller.reload_content();
                                 self.inherited_view(selected_row);
                             }
                         }else{
@@ -397,6 +396,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     action_manager.do_action(action);
                 }},
                 {text: _t("Close"), click: function(){
+                    self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller.reload_content();
                     self.edit_xml_dialog.close();
                 }}
             ]

From 3a81530c1428073dc75d14c8de3b1dcaee6b58de Mon Sep 17 00:00:00 2001
From: "Jiten (OpenERP)" <jra@tinyerp.com>
Date: Fri, 10 Feb 2012 19:06:20 +0530
Subject: [PATCH 14/15] [IMP] Add field in children of fields.

bzr revid: jra@tinyerp.com-20120210133620-sy20dxxsrjwubths
---
 addons/web/static/src/js/view_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index e4f8d8f3016..3d6c4a5aa6b 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1158,7 +1158,7 @@ var _CHILDREN = {
     'group': ['field', 'label', 'button', 'separator', 'newline','group'],
     'board': ['column'],
     'action': [],
-    'field': ['form', 'tree', 'graph'],
+    'field': ['form', 'tree', 'graph','field'],
     'label': [],
     'button' : [],
     'newline': [],

From 301e25915b224c776b76df122b6c6d9ca9e14741 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Feb 2012 11:53:41 +0100
Subject: [PATCH 15/15] [imp] rewritten code to be easier to read

bzr revid: nicolas.vanhoren@openerp.com-20120213105341-09pawcz7pau2incs
---
 addons/web/static/src/js/view_editor.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 3d6c4a5aa6b..0258509f172 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -417,22 +417,27 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         });
     },
     inherited_view: function(selected_row){
-        var self = this,row_id = parseInt((selected_row.attr('id')).split('-')[1]);
+        var self = this;
+        var row_id = parseInt((selected_row.attr('id')).split('-')[1]);
         var obj = self.get_object_by_id(row_id,self.one_object['main_object'], [])[0];
-        var view_name = this.model + '.inherit_' + Math.round(Math.random() * 1000),
-        view_find = selected_row,view_id,min_level = parseInt(selected_row.attr('level'));
+        var view_name = this.model + '.inherit_' + Math.round(Math.random() * 1000);
+        var view_find = selected_row;
+        var view_id;
+        var min_level = parseInt(selected_row.attr('level'));
         while (1) {
             view_find = view_find.prev();
             if (view_find.length == 0 ||
-                    (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
-                    && parseInt(view_find.attr('level')) < min_level ) {
-                view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
+                    self.edit_xml_dialog.$element.find(view_find).find('a').text().search("view_id") != -1 &&
+                    parseInt(view_find.attr('level')) < min_level ) {
+                view_id = parseInt($(view_find).find('a').text().replace(/[^0-9]+/g, ''));
                 break;
             }
-            if (view_find.attr('level') < min_level) {min_level = parseInt(view_find.attr('level'));}
+            if (view_find.attr('level') < min_level) {
+            	min_level = parseInt(view_find.attr('level'));
+            }
         }
-        var val = _.detect(obj.att_list,function(val){return val[0] == "name";});
-        var priority =_.detect(self.one_object['arch'],function(val){return val.view_id == view_id;});
+        var val = _.detect(obj.att_list, function(val) {return val[0] == "name";});
+        var priority = _.detect(self.one_object['arch'], function(val) {return val.view_id == view_id;});
         var arch = _.str.sprintf("<?xml version='1.0'?>\n\t <field name='%s' position='after'> </field>", val[1]);
         var vals = {'model': self.model, 'name': view_name, 'priority': priority.priority + 1, 'type': "form", 'arch': arch,'inherit_id':self.main_view_id};
         this.dataset.create(vals, function(suc) {