From 3feaa84beb11eb2b887fddcce6b82ec9df79aafe Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 4 Oct 2011 11:39:03 +0530
Subject: [PATCH 001/114] [IMP]edit node code at initial level modify by using
 widget.

bzr revid: kch@tinyerp.com-20111004060903-0se42632vpjlk24u
---
 addons/web/static/src/js/view_editor.js | 51 +++++++++++++++++++------
 addons/web/static/src/xml/base.xml      |  7 ----
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d0cc7d53eb3..7b68cdc3372 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,7 +1,6 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
-    'field' : ['name', 'string', 'required', 'readonly', 'select', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs', 'groups'],
+    'field' : ['required', 'readonly'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -31,6 +30,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.dataset = dataset;
         this.model = dataset.model;
         this.xml_id = 0;
+        this.property = openerp.web.ViewEditor.property_widget;
     },
 
     start: function() {
@@ -320,6 +320,17 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             case "side-remove":
                 break;
             case "side-edit":
+                var tag, fld_name;
+                var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
+                var tag_fld = tr.split(" ");
+                if (tag_fld.length > 3){
+                    tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
+                    fld_name = tag_fld[2].split("=")[1].replace(/[^a-zA-Z _ 0-9]+/g,'');
+                }else{
+                    tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
+                }
+                var properties = _PROPERTIES[tag];
+                self.on_edit_node(this,properties,fld_name);
                 break;
            case "side-up":
                 while(1){
@@ -406,7 +417,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(self,property,fld_name){
+    on_edit_node:function(self,properties,fld_name){
         var self = this;
         var result;
         this.dialog = new openerp.web.Dialog(this,{
@@ -427,17 +438,35 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
                 db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
-                    var data = [];
-                    _.each(property,function(record){
-                        var dict = {'key':record,'value':res[0][record]};
-                        data.push(dict);
+                    _.each(properties,function(record){
+                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (false, false);
+                        console.log("widget_view",type_widget);
                     });
-                    console.log("check data+++",data);
-                    /*self.dialog.$element.html(QWeb.render('Edit_Node_View',{
-                        'res': res
-                    }));*/
                 });
             });
     }
 });
+openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
+    init: function(view, node) {
+        //this._super(view, node);
+        console.log("view++++",view);
+        console.log("nodoe+++++",node);
+        this.template = "FieldBoolean";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    }
+});
+openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
+    'required' : 'openerp.web.ViewEditor.FieldBoolean',
+    'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
+    'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
+    'completion' : 'openerp.web.ViewEditor.FieldBoolean',
+    /*'widget' : '',
+    'groups' : '',
+    'position': '',
+    'icon': '',
+    'align': '' */
+});
 };
\ No newline at end of file
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 957415c8043..04bd475fd1c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1325,13 +1325,6 @@
             <t t-call="view_editor.row"/>
         </t>
     </tr>
-<t t-name="Edit_Node_View">
-    <table>
-        <tr t-foreach="res" t-as="rec">
-            <td><t t-esc="rec.ttype"/></td>
-        </tr>
-    </table>
-</t>
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>

From 02bbd4bd5c8b39cd3d5c60f49b79ed96f84a3012 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Wed, 5 Oct 2011 17:32:12 +0530
Subject: [PATCH 002/114] [IMP]Render boolean field with static data using
 widget.

bzr revid: kch@tinyerp.com-20111005120212-tj2jhlxwjmtp91z6
---
 addons/web/static/src/js/view_editor.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 7b68cdc3372..4378ac4a0a9 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -330,7 +330,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
                 }
                 var properties = _PROPERTIES[tag];
-                self.on_edit_node(this,properties,fld_name);
+                self.on_edit_node(properties,fld_name);
                 break;
            case "side-up":
                 while(1){
@@ -417,7 +417,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(self,properties,fld_name){
+    on_edit_node:function(properties,fld_name){
         var self = this;
         var result;
         this.dialog = new openerp.web.Dialog(this,{
@@ -438,9 +438,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
                 db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
+                    // res will use for getting value of fields.
+                    var k = {"attrs":{"modifiers":"{'readonly':true}","name":"name"},"children":[],"tag":"field"};
                     _.each(properties,function(record){
-                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (false, false);
-                        console.log("widget_view",type_widget);
+                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
+                        $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
                     });
                 });
             });
@@ -449,8 +451,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
     init: function(view, node) {
         //this._super(view, node);
-        console.log("view++++",view);
-        console.log("nodoe+++++",node);
         this.template = "FieldBoolean";
     },
     start: function() {
@@ -458,6 +458,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
         this._super.apply(this, arguments);
     }
 });
+
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',

From c5f5637e0992158734adda1782b725e24546dc6e Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Thu, 13 Oct 2011 16:30:39 +0530
Subject: [PATCH 003/114] [IMP]trying to setvalue into edit node data.

bzr revid: kch@tinyerp.com-20111013110039-i92u5ghg9kjzxwe6
---
 addons/web/static/src/js/view_editor.js | 50 ++++++++++++++++++++-----
 addons/web/static/src/js/view_form.js   | 18 ++++-----
 addons/web/static/src/xml/base.xml      |  6 +--
 3 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 4378ac4a0a9..87744825207 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,6 +1,7 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
-    'field' : ['required', 'readonly'],
+    'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
+               'colspan', 'eval', 'ref', 'on_change', 'attrs'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -22,7 +23,6 @@ var _PROPERTIES = {
 };
 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
@@ -107,7 +107,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         render_name+= ">";
         xml_tag+= ">";
         });
-        obj.main_xml = xml_tag;
+        obj.main_xml = xml;
         obj.name = render_name;
         return obj;
     },
@@ -287,7 +287,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     this.dialog.$element.html(QWeb.render('view_editor', {
        'data': one_object['main_object'],
     }));
-
     $("tr[id^='viewedit-']").click(function() {
         $("tr[id^='viewedit-']").removeClass('ui-selected');
         $(this).addClass('ui-selected');
@@ -439,10 +438,18 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
                     // res will use for getting value of fields.
+                    var widget = ['readonly','required','nolable','completion','groups','position','icon','align'];
                     var k = {"attrs":{"modifiers":"{'readonly':true}","name":"name"},"children":[],"tag":"field"};
                     _.each(properties,function(record){
-                        var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
-                        $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
+                        if (_.include(widget,record)){
+                            var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
+                            $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
+                            type_widget.set_value(res[0][record]);
+                        }else{
+                            var type_widget = new openerp.web.ViewEditor.FieldChar (self.dialog, k);
+                            $("div[id='"+self.dialog.element_id+"']").append('<div id="res">'+record+''+type_widget.render()+'</div>');
+                            type_widget.set_value(res[0][record]);
+                        }
                     });
                 });
             });
@@ -450,12 +457,36 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
     init: function(view, node) {
-        //this._super(view, node);
-        this.template = "FieldBoolean";
+        this.$element = view.$element;
     },
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
+    },
+    set_value: function(value) {
+        if (value === false || value === undefined) {
+            // As in GTK client, floats default to 0
+            value = 0;
+            this.dirty = true;
+        }
+        this._super.apply(this, [value]);
+    }
+});
+openerp.web.ViewEditor.FieldChar = openerp.web.form.FieldChar.extend({
+    init: function(view, node) {
+        this.$element = view.$element;
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(value) {
+        if (value === false || value === undefined) {
+            // As in GTK client, floats default to 0
+            value = 0;
+            this.dirty = true;
+        }
+        this._super.apply(this, [value]);
     }
 });
 
@@ -464,8 +495,7 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
     'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
     'completion' : 'openerp.web.ViewEditor.FieldBoolean',
-    /*'widget' : '',
-    'groups' : '',
+    /*'groups' : 'openerp.web.ViewEditor.WidgetFrame',
     'position': '',
     'icon': '',
     'align': '' */
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 11ebad8d093..e184424fbd6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -14,7 +14,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     /**
      * @constructs openerp.web.FormView
      * @extends openerp.web.View
-     * 
+     *
      * @param {openerp.web.Session} session the current openerp session
      * @param {openerp.web.DataSet} dataset the dataset this view will work with
      * @param {String} view_id the identifier of the OpenERP view object
@@ -1042,7 +1042,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
     },
     update_dom: function() {
         this._super.apply(this, arguments);
-        if (this.field.translate) {
+       /* if (this.field.translate) {
             this.$element.find('.oe_field_translate').toggle(!!this.view.datarecord.id);
         }
         if (!this.disable_utility_classes) {
@@ -1051,7 +1051,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
             if (this.view.show_invalid) {
                 this.$element.toggleClass('invalid', !this.is_valid());
             }
-        }
+        }*/
     },
     on_ui_change: function() {
         this.dirty = this.view.dirty_for_user = true;
@@ -2274,7 +2274,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             }).pipe(function() {
                 self.searchview.do_search();
             });
-            
+
         });
         this.searchview.appendTo($("#" + this.element_id + "_search"));
     },
@@ -2647,13 +2647,13 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
     start: function() {
         this._super();
         this.selected_value = null;
-        
+
         this.render_list();
     },
     set_value: function(value) {
         this._super(value);
         this.selected_value = value;
-        
+
         this.render_list();
     },
     render_list: function() {
@@ -2661,7 +2661,7 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
         var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","),
             function(x) { return x.trim(); });
         shown = _.select(shown, function(x) { return x.length > 0; });
-            
+
         if (shown.length == 0) {
             this.to_show = this.field.selection;
         } else {
@@ -2669,10 +2669,10 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
                 return _.indexOf(shown, x[0]) !== -1 || x[0] === self.selected_value;
             });
         }
-        
+
         var content = openerp.web.qweb.render("FieldStatus.content", {widget: this, _:_});
         this.$element.html(content);
-        
+
         var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}");
         var color = colors[this.selected_value];
         if (color) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 04bd475fd1c..b8da6dcab78 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -773,13 +773,13 @@
     <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
 </t>
 <t t-name="FieldChar">
-    <input type="text" size="1"
+    <input type="text" size="12"
         t-att-name="widget.name"
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type} #{widget.element_class}"
-        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
+
     />
-    <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
+    <!-- img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/-->
 </t>
 <t t-name="FieldChar.readonly">
     <div

From 59f3ab077f4d44b443033069932ca489777fbd13 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Mon, 24 Oct 2011 18:29:12 +0530
Subject: [PATCH 004/114] [IMP]Improved code for edit node by setting its
 value.

bzr revid: kch@tinyerp.com-20111024125912-m9w3v9bnikurtlxf
---
 addons/web/static/src/js/view_editor.js | 155 +++++++++++++++---------
 addons/web/static/src/xml/base.xml      |  21 +++-
 2 files changed, 117 insertions(+), 59 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 774d1872c29..b20694b7d01 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,7 +1,7 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
     'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'eval', 'ref', 'on_change', 'attrs'],
+               'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -28,7 +28,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.element_id = element_id
         this.parent = parent
         this.dataset = dataset;
-        this.model = dataset.model;
+        this.model = this.dataset.model;
         this.xml_id = 0;
         this.property = openerp.web.ViewEditor.property_widget;
     },
@@ -331,9 +331,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         fld_name = tag_fld[2].split("=")[1].replace(/[^a-zA-Z _ 0-9]+/g,'');
                     }else{
                         tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
+                        fld_name= tag;
                     }
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties,fld_name);
+                    self.on_edit_node(properties,fld_name,id_tr);
                     break;
                 case "side-up":
                     while (1) {
@@ -398,6 +399,19 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         });
     },
+    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;
+    },
     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-']");
@@ -421,14 +435,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties,fld_name){
+    on_edit_node:function(properties,fld_name,id_tr){
         var self = this;
         var result;
-        this.dialog = new openerp.web.Dialog(this,{
+        this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
             width: 650,
-            height: 150,
+            height: 200,
             buttons: {
                     "Update": function(){
                     },
@@ -437,72 +451,103 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     }
                 }
         });
-        this.dialog.start().open();
+        this.edit_node_dialog.start().open();
+        var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
+        var arch_val = self.get_view_object(id_tr,one_object,[]);
+        self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
         dataset = new openerp.web.DataSetSearch(this,'ir.model', null, null);
-            dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
-                db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
-                db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
-                    // res will use for getting value of fields.
-                    var widget = ['readonly','required','nolable','completion','groups','position','icon','align'];
-                    var k = {"attrs":{"modifiers":"{'readonly':true}","name":"name"},"children":[],"tag":"field"};
-                    _.each(properties,function(record){
-                        if (_.include(widget,record)){
-                            var type_widget =  new (self.property.get_any(['undefined' , record, 'field'])) (self.dialog, k);
-                            $("div[id='"+self.dialog.element_id+"']").append('<div>'+record+''+type_widget.render()+'</div>');
-                            type_widget.set_value(res[0][record]);
-                        }else{
-                            var type_widget = new openerp.web.ViewEditor.FieldChar (self.dialog, k);
-                            $("div[id='"+self.dialog.element_id+"']").append('<div id="res">'+record+''+type_widget.render()+'</div>');
-                            type_widget.set_value(res[0][record]);
-                        }
-                    });
+        dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
+            db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
+            db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
+                _.each(properties,function(record){
+                    var id = record;
+                    var rs = res.length ? res[0][record] : null;
+                    if (_.include(widget,record)){
+                        var type_widget =  new (self.property.get_any(['undefined' , record, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
+                        type_widget.set_value(id,rs);
+                    }else{
+                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
+                        type_widget.set_value(id,rs);
+                    }
                 });
             });
+        });
     }
 });
-openerp.web.ViewEditor.FieldBoolean = openerp.web.form.FieldBoolean.extend({
+openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node) {
         this.$element = view.$element;
+        this.node = node;
+    },
+    render: function () {
+        return QWeb.render(this.template, {widget: this});
     },
     start: function() {
+        this._super();
         var self = this;
-        this._super.apply(this, arguments);
-    },
-    set_value: function(value) {
-        if (value === false || value === undefined) {
-            // As in GTK client, floats default to 0
-            value = 0;
-            this.dirty = true;
-        }
-        this._super.apply(this, [value]);
-    }
-});
-openerp.web.ViewEditor.FieldChar = openerp.web.form.FieldChar.extend({
-    init: function(view, node) {
-        this.$element = view.$element;
-    },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
-    set_value: function(value) {
-        if (value === false || value === undefined) {
-            // As in GTK client, floats default to 0
-            value = 0;
-            this.dirty = true;
-        }
-        this._super.apply(this, [value]);
     }
 });
 
+openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_boolean";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,id);
+        });
+        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', value);
+    }
+});
+openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_char";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,id);
+        });
+        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val(value);
+    }
+});
+openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.node = node;
+        this.template = "view_selection";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        //ToDo
+    }
+});
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
     'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
     'completion' : 'openerp.web.ViewEditor.FieldBoolean',
-    /*'groups' : 'openerp.web.ViewEditor.WidgetFrame',
-    'position': '',
-    'icon': '',
-    'align': '' */
+    'widget' : 'openerp.web.ViewEditor.FieldSelect',
+    'groups' : 'openerp.web.ViewEditor.FieldSelect',
+    'position': 'openerp.web.ViewEditor.FieldSelect',
+    'icon': 'openerp.web.ViewEditor.FieldSelect',
+    'align': 'openerp.web.ViewEditor.FieldSelect',
+    'special': 'openerp.web.ViewEditor.FieldSelect',
+    'type': 'openerp.web.ViewEditor.FieldSelect',
+    'target': 'openerp.web.ViewEditor.FieldSelect'
 });
 };
\ No newline at end of file
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cc3a0af8341..cf74e14ebfc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -778,13 +778,13 @@
     <p class="oe_form_paragraph"><t t-esc="widget.string"/></p>
 </t>
 <t t-name="FieldChar">
-    <input type="text" size="12"
+    <input type="text" size="1"
         t-att-name="widget.name"
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
-
+        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     />
-    <!-- img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/-->
+    <img class="oe_field_translate" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldChar.readonly">
     <div
@@ -1333,7 +1333,20 @@
             <t t-set="data" t-value="rec.child_id"/>
             <t t-call="view_editor.row"/>
         </t>
-    </tr>
+</tr>
+<t t-name="view_char">
+    <input type="text" class="field_char" size="50"/>
+</t>
+<t t-name="view_selection">
+    <select>
+        <option selected="true"></option>
+        <option>ToDo</option>
+    </select>
+</t>
+<t t-name="view_boolean">
+    <input type="checkbox"/>
+</t>
+
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>

From b14b4c956cf2ac0d39a8b87f5967303251bbc5a3 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 25 Oct 2011 18:43:12 +0530
Subject: [PATCH 005/114] [IMP]Improved code for getting value of selection box
 x in edit node.

bzr revid: kch@tinyerp.com-20111025131312-jgkdm51vblkvag9s
---
 addons/web/static/src/js/view_editor.js | 177 ++++++++++++++++++++++--
 addons/web/static/src/xml/base.xml      |   1 -
 2 files changed, 168 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index b20694b7d01..89afa432c12 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,7 +1,7 @@
 openerp.web.view_editor = function(openerp) {
 var _PROPERTIES = {
     'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs'],
+               'colspan', 'widget', 'eval', 'ref', 'on_change', 'groups', 'attrs'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -455,6 +455,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(id_tr,one_object,[]);
         self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
+
+        var groups_values = self.on_groups();
         dataset = new openerp.web.DataSetSearch(this,'ir.model', null, null);
         dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
             db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
@@ -465,7 +467,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     if (_.include(widget,record)){
                         var type_widget =  new (self.property.get_any(['undefined' , record, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value(id,rs);
+                        (record=='groups')?type_widget.set_value(id,groups_values):type_widget.set_value(id,rs);
                     }else{
                         var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
@@ -474,10 +476,33 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             });
         });
+    },
+     //for getting groups
+    on_groups: function(){
+        var self = this;
+        var group_ids = [];
+        var group_names = {};
+        var groups = [];
+        var resgrp_database = new openerp.web.DataSetSearch(self,'res.groups', null, null);
+        resgrp_database.read_slice([],{}, function (res_grp) {
+            _.each(res_grp,function(res){
+                var key = res.id;
+                group_names[key]=res.name;
+                group_ids.push(res.id);
+            });
+            var irmodel_database = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
+            irmodel_database.read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]},function(model_grp){
+               _.each(model_grp,function(res_group){
+                   groups.push([res_group.name,group_names[res_group.res_id]]);
+               });
+            });
+        });
+        return groups;
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node) {
+        var self = this;
         this.$element = view.$element;
         this.node = node;
     },
@@ -536,18 +561,152 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         //ToDo
     }
 });
+openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.registry = openerp.web.form.widgets;
+        this.template = "view_selection";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = _.keys(this.registry.map);
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                value: item,
+                text: item
+            }));
+        });
+    }
+});
+/*openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    start: function() {
+        var self = this;
+        this._super.apply(this, arguments);
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = ;
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                value: item,
+                text: item
+            }));
+        });
+    }
+});*/
+openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                value: 'new',
+                text: 'New Window'
+        }));
+    }
+});
+openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        value = [['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        _.each(value, function(item) {
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
+openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.Field.extend({
+    init: function(view, node) {
+        this._super(view, node);
+        this.template = "view_selection";
+    },
+    set_value: function(id,value) {
+        var self = this;
+        var select = self.$element.find("tr[id="+id+"] select").attr('multiple', true);
+        _.each(value, function(item) {
+            select.append($("<option/>", {
+                    value:item[0],
+                    text:item[1]
+            }));
+        });
+    }
+});
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
     'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
     'completion' : 'openerp.web.ViewEditor.FieldBoolean',
-    'widget' : 'openerp.web.ViewEditor.FieldSelect',
-    'groups' : 'openerp.web.ViewEditor.FieldSelect',
-    'position': 'openerp.web.ViewEditor.FieldSelect',
+    'widget' : 'openerp.web.ViewEditor.WidgetProperty',
+    'groups' : 'openerp.web.ViewEditor.GroupsProperty',
+    'position': 'openerp.web.ViewEditor.PositionProperty',
     'icon': 'openerp.web.ViewEditor.FieldSelect',
-    'align': 'openerp.web.ViewEditor.FieldSelect',
-    'special': 'openerp.web.ViewEditor.FieldSelect',
-    'type': 'openerp.web.ViewEditor.FieldSelect',
-    'target': 'openerp.web.ViewEditor.FieldSelect'
+    'align': 'openerp.web.ViewEditor.AlignProperty',
+    'special': 'openerp.web.ViewEditor.ButtonSpecialProperty',
+    'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
+    'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
 });
 };
\ No newline at end of file
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f8f316eb6a0..d6c9ac232e6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1339,7 +1339,6 @@
 <t t-name="view_selection">
     <select>
         <option selected="true"></option>
-        <option>ToDo</option>
     </select>
 </t>
 <t t-name="view_boolean">

From c1956c46d41c34a0cbdd2bc09b2f0d7c522e9421 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 1 Nov 2011 18:52:57 +0530
Subject: [PATCH 006/114] [IMP]Improved code for fill selection box value in
 edit node of view editor.

bzr revid: kch@tinyerp.com-20111101132257-j222v9nfkflm2m2h
---
 addons/web/static/src/js/view_editor.js | 186 ++++++++++--------------
 addons/web/static/src/xml/base.xml      |   3 +-
 2 files changed, 77 insertions(+), 112 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 89afa432c12..bf87e473934 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -21,6 +21,33 @@ var _PROPERTIES = {
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
     'view' : [],
 };
+var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
+'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
+'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
+'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
+'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
+'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
+'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
+'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
+'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
+'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
+'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
+'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
+'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
+'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
+'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
+'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
+'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
+'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
+'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
+'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
+'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
+'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
+'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
+'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
+'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
+'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph',
+];
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
@@ -152,7 +179,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         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], [])
+        obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], []);
         return [obj];
     },
     get_data: function() {
@@ -445,6 +472,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 200,
             buttons: {
                     "Update": function(){
+                        self.on_update_node();
                     },
                     "Cancel": function(){
                         $(this).dialog('destroy');
@@ -498,6 +526,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         });
         return groups;
+    },
+    on_update_node: function(){
+        //todo
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
@@ -508,10 +539,6 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     },
     render: function () {
         return QWeb.render(this.template, {widget: this});
-    },
-    start: function() {
-        this._super();
-        var self = this;
     }
 });
 
@@ -520,10 +547,6 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_boolean";
     },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
     set_value: function(id,value) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
@@ -536,10 +559,6 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_char";
     },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
     set_value: function(id,value) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
@@ -550,149 +569,96 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.node = node;
         this.template = "view_selection";
     },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-    },
     set_value: function(id,value) {
-        //ToDo
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,id);
+        });
+        var self = this;
+        _.each(value, function(item) {
+            var select_val = view_val?(view_val[1]==item[0]?true:false):false;
+            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+                    value:(typeof(item)=='string')?item:item[0],
+                    text:(typeof(item)=='string')?item:item[1],
+                    selected:select_val
+            }));
+        });
     }
 });
-openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
         this.registry = openerp.web.form.widgets;
-        this.template = "view_selection";
-    },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
     },
     set_value: function(id,value) {
-        var self = this;
         value = _.keys(this.registry.map);
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                value: item,
-                text: item
-            }));
-        });
+        value.push('');
+        value.sort();
+        this._super.apply(this,[id, value]);
     }
 });
-/*openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
-    },
-    start: function() {
-        var self = this;
-        this._super.apply(this, arguments);
     },
     set_value: function(id,value) {
-        var self = this;
-        value = ;
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                value: item,
-                text: item
-            }));
-        });
-    }
-});*/
-openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
-        this.template = "view_selection";
-    },
-    set_value: function(id,value) {
-        var self = this;
-        self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                value: 'new',
-                text: 'New Window'
-        }));
+        value = icons;
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['new','New Window']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        value = [['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        _.each(value, function(item) {
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+        this._super.apply(this,[id, value]);
     }
 });
-openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.Field.extend({
+openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = "view_selection";
     },
     set_value: function(id,value) {
-        var self = this;
-        var select = self.$element.find("tr[id="+id+"] select").attr('multiple', true);
-        _.each(value, function(item) {
-            select.append($("<option/>", {
-                    value:item[0],
-                    text:item[1]
-            }));
-        });
+        value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        this._super.apply(this,[id, value]);
+    }
+});
+openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
+    init: function(view, node) {
+        this._super(view, node);
+    },
+    set_value: function(id,value) {
+        this.$element.find("tr[id="+id+"] select").attr('multiple', true);
+        this._super.apply(this,[id, value]);
     }
 });
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
@@ -703,7 +669,7 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'widget' : 'openerp.web.ViewEditor.WidgetProperty',
     'groups' : 'openerp.web.ViewEditor.GroupsProperty',
     'position': 'openerp.web.ViewEditor.PositionProperty',
-    'icon': 'openerp.web.ViewEditor.FieldSelect',
+    'icon': 'openerp.web.ViewEditor.IconProperty',
     'align': 'openerp.web.ViewEditor.AlignProperty',
     'special': 'openerp.web.ViewEditor.ButtonSpecialProperty',
     'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d6c9ac232e6..41865e4f5a3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1337,8 +1337,7 @@
     <input type="text" class="field_char" size="50"/>
 </t>
 <t t-name="view_selection">
-    <select>
-        <option selected="true"></option>
+    <select style="width:366px">
     </select>
 </t>
 <t t-name="view_boolean">

From e85e6c5836277143a7e8252ff4cab21adf51d22c Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 2 Nov 2011 12:37:10 +0530
Subject: [PATCH 007/114] [IMP]hide child tr when up arrow click.

bzr revid: vme@tinyerp.com-20111102070710-kijqa4q0xtu049ac
---
 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 f41b77f1744..3e19712f08c 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -56,8 +56,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         action_manager.appendTo(this.view_edit_dialog);
         action_manager.do_action(action);
     },
-    check_attr: function(xml, tag, level) {
+    check_attr: function(xml, level) {
         var obj = {'child_id':[],'id':this.xml_id++,'level':level+1,'att_list':[],'name':""};
+        var tag = xml.tagName.toLowerCase();
         var render_name = "<" + tag;
         obj.att_list.push(tag);
         $(xml).each(function() {
@@ -101,7 +102,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         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));
+            child_obj_list.push(self.check_attr(child_node,parents.length));
         });
         if (children_list.length != 0) {
             if (parents.length <= parent_list.length) {
@@ -121,7 +122,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         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);
+        var root_object = this.check_attr(root,0);
         obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], [])
         return [obj];
     },
@@ -326,11 +327,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         cur_tr = prev_tr;
                     }
                     if (img) {
+                    self.edit_xml_dialog.$element.find("img[id='parentimg-" + id_tr + "']").
+                                                        attr('src', '/web/static/src/img/expand.gif');
                         while (1) {
                             next_tr = side.next();
                             if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) {
                                 break;
                             } else {
+                                next_tr.hide();
                                 list_shift.push(next_tr);
                                 side = next_tr;
                             }
@@ -384,7 +388,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                        $(last_tr).after(rec);
                     });
                     self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down");
-
                 }
                 break;
             }
@@ -399,7 +402,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         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 temp_obj = self.check_attr(xml_child);
                 var main_list = _.flatten(temp_obj.att_list);
                 check_list = _.uniq(check_list);
                 var insert = _.intersection(main_list,check_list);
@@ -473,7 +476,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             return false;
          }
        }
-      
     },
 
     on_expand: function(expand_img){
@@ -499,6 +501,5 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     }
-
 });
 };

From 7f6d06267a58682f43557c7bcfc857a92b1c6ff0 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Wed, 2 Nov 2011 17:38:37 +0530
Subject: [PATCH 008/114] [IMP]Improved code for only getting view's value not
 from databse.

bzr revid: kch@tinyerp.com-20111102120837-lbqu36nmf2e9anyr
---
 addons/web/static/src/js/view_editor.js | 113 ++++++++++++------------
 1 file changed, 58 insertions(+), 55 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index bf87e473934..039ac0fac3e 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -464,7 +464,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     on_edit_node:function(properties,fld_name,id_tr){
         var self = this;
-        var result;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
@@ -483,49 +482,53 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(id_tr,one_object,[]);
         self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
-
-        var groups_values = self.on_groups();
-        dataset = new openerp.web.DataSetSearch(this,'ir.model', null, null);
-        dataset.read_slice([],{domain : [['model','=',self.model]]},function (result) {
-            db = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
-            db.read_slice([],{domain : [['model_id','=',result[0].id],['name','=',fld_name]]},function (res) {
-                _.each(properties,function(record){
-                    var id = record;
-                    var rs = res.length ? res[0][record] : null;
-                    if (_.include(widget,record)){
-                        var type_widget =  new (self.property.get_any(['undefined' , record, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
-                        (record=='groups')?type_widget.set_value(id,groups_values):type_widget.set_value(id,rs);
+        _.each(properties,function(record){
+            var id = record;
+            self.ready  = $.when(self.on_groups(id)).then(function () {
+                    if (_.include(widget,id)){
+                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                        (id=='groups')?type_widget.set_value(id,self.groups):type_widget.set_value(id);
                     }else{
                         var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+record+'"><td align="right">'+record+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value(id,rs);
+                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                        type_widget.set_value(id);
                     }
                 });
             });
-        });
     },
      //for getting groups
-    on_groups: function(){
-        var self = this;
-        var group_ids = [];
-        var group_names = {};
-        var groups = [];
-        var resgrp_database = new openerp.web.DataSetSearch(self,'res.groups', null, null);
-        resgrp_database.read_slice([],{}, function (res_grp) {
-            _.each(res_grp,function(res){
-                var key = res.id;
-                group_names[key]=res.name;
-                group_ids.push(res.id);
-            });
-            var irmodel_database = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
-            irmodel_database.read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]},function(model_grp){
-               _.each(model_grp,function(res_group){
-                   groups.push([res_group.name,group_names[res_group.res_id]]);
-               });
-            });
-        });
-        return groups;
+    on_groups: function(id){
+        var self = this,
+        def = $.Deferred();
+        if (id !='groups') {
+            self.groups = false;
+            return false;
+        }
+        var group_ids = [],
+        group_names = {},
+        groups = [];
+        var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
+            model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
+        res_groups
+            .read_slice([],{})
+            .done(function(res_grp) {
+                _.each(res_grp,function(res){
+	                var key = res.id;
+	                group_names[key]=res.name;
+	                group_ids.push(res.id);
+                });
+            model_data
+                .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]})
+                .done(function(model_grp) {
+                    _.each(model_grp,function(res_group){
+	                    groups.push([res_group.name,group_names[res_group.res_id]]);
+	                });
+                    self.groups = groups;
+                    def.resolve();
+                });
+            })
+        return def.promise();
     },
     on_update_node: function(){
         //todo
@@ -547,11 +550,11 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_boolean";
     },
-    set_value: function(id,value) {
+    set_value: function(id) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', value);
+        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', false);
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -559,11 +562,11 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this._super(view, node);
         this.template = "view_char";
     },
-    set_value: function(id,value) {
+    set_value: function(id) {
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,id);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val(value);
+        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val();
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
@@ -591,8 +594,8 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         this._super(view, node);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function(id,value) {
-        value = _.keys(this.registry.map);
+    set_value: function(id) {
+        var value = _.keys(this.registry.map);
         value.push('');
         value.sort();
         this._super.apply(this,[id, value]);
@@ -602,8 +605,8 @@ openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend(
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = icons;
+    set_value: function(id) {
+        var value = icons;
         this._super.apply(this,[id, value]);
     }
 });
@@ -611,8 +614,8 @@ openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['new','New Window']];
+    set_value: function(id) {
+        var value = [['',''],['new','New Window']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -620,8 +623,8 @@ openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.e
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+    set_value: function(id) {
+        var value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -629,8 +632,8 @@ openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+    set_value: function(id) {
+        var value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -638,8 +641,8 @@ openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelec
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+    set_value: function(id) {
+        var value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
         this._super.apply(this,[id, value]);
     }
 });
@@ -647,8 +650,8 @@ openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.ext
     init: function(view, node) {
         this._super(view, node);
     },
-    set_value: function(id,value) {
-        value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+    set_value: function(id) {
+        var value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
         this._super.apply(this,[id, value]);
     }
 });

From a25c1ed24c0a5e941a85a279f93745b973c6d71d Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 2 Nov 2011 18:44:13 +0530
Subject: [PATCH 009/114] [IMP]remove unused variables.

bzr revid: vme@tinyerp.com-20111102131413-bn7e95njx4vlxc7q
---
 addons/web/static/src/js/view_editor.js | 109 +++++++++++-------------
 1 file changed, 49 insertions(+), 60 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 3e19712f08c..b402da6a13a 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -7,7 +7,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.parent = parent
         this.dataset = dataset;
         this.model = dataset.model;
-        this.xml_id = 0;
+        this.xml_element_id = 0;
     },
     start: function() {
         this.View_editor();
@@ -43,8 +43,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 //to do
             },
             "Edit": function(){
-                self.xml_id=0;
-                self.get_data();
+                self.xml_element_id=0;
+                self.get_arch();
             },
             "Close": function(){
                 $(this).dialog('destroy');
@@ -56,84 +56,75 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         action_manager.appendTo(this.view_edit_dialog);
         action_manager.do_action(action);
     },
-    check_attr: function(xml, level) {
-        var obj = {'child_id':[],'id':this.xml_id++,'level':level+1,'att_list':[],'name':""};
+
+    convert_tag_to_obj: function(xml, level) {
+        var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""};
         var tag = xml.tagName.toLowerCase();
-        var render_name = "<" + tag;
         obj.att_list.push(tag);
+        obj.name = "<"+ 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 + '"' ;}
+            if (tag != 'button' && tag != 'field') {
+                if (attrs.nodeName == "string" ) {
+                obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;}
             } else {
                 if (attrs.nodeName == "name") {
-                render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';}
+                obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';}
             }
             obj.att_list.push( [attrs.nodeName,attrs.nodeValue] );
             });
-        render_name+= ">";
+        obj.name+= ">";
         });
-        obj.name = render_name;
         return obj;
     },
-    save_object: function(val, parent_list, child_obj_list) {
+
+    append_child_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;
-                    }
-                }
+            _.each(val.child_id, function(val) {
+                (val.id == parent_list[0])?
+                    self.append_child_object( val, parent_list.slice(1), child_obj_list) : false;
             });
-        } else {
-            val.child_id = child_obj_list;
-        }
+        } else { val.child_id = child_obj_list; }
     },
-    xml_node_create: function(xml, root, parent_list, parent_id, main_object){
+
+    convert_arch_to_obj: function(xml, parent_list, parent_id, main_object){
         var self = this;
         var child_obj_list = [];
-        var children_list = $(xml).filter(root).children();
+        var children_list = $(xml).children();
         var parents = $(children_list[0]).parents().get();
         _.each(children_list, function (child_node) {
-            child_obj_list.push(self.check_attr(child_node,parents.length));
+            child_obj_list.push(self.convert_tag_to_obj(child_node,parents.length));
         });
         if (children_list.length != 0) {
-            if (parents.length <= parent_list.length) {
-                parent_list.splice(parents.length - 1);
-            }
+            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);
+            self.append_child_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);
+            self.convert_arch_to_obj
+            (children_list[i], 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,0);
-        obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], [])
-        return [obj];
+        var view_obj ={'child_id':[],'id':this.xml_element_id++,
+            'level':0,'att_list':[],'name':"<view view_id='"+view_id+"'>"};
+        var root_object = this.convert_tag_to_obj(root,0);
+        view_obj.child_id = this.convert_arch_to_obj(arch, [], this.xml_element_id, [root_object], []);
+        return [view_obj];
     },
-    get_data: function() {
+    get_arch: function() {
         var self = this;
-
         var view_arch_list = [];
-        var view_id =((this.view_edit_dialog.$element.find("input[name='radiogroup']:checked").parent()).parent()).attr('data-id');
+        var 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(view_id)], ['arch'], function (arch) {
-            one_object = self.parse_xml(arch[0].arch,view_id);
+            one_object = self.parse_xml(arch[0].arch, view_id);
             view_arch_list.push({"view_id" : view_id, "arch" : arch[0].arch});
             dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null);
             dataset.read_slice([], {domain : [['inherit_id','=', parseInt(view_id)]]}, function (result) {
@@ -195,30 +186,30 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             switch (check.length) {
                 case 2:
                     if(parseInt(check[1])){
+                        //for field[3]
                         var list_1 = _.select(val,function(element){
-                            var main_list = _.flatten(element.att_list);
-                            return _.include(main_list, check[0]);
+                            return _.include(_.flatten(element.att_list), check[0]);
                         });
                         obj = val[_.indexOf(val,list_1[parseInt(check[1])-1])];
                     } else {
+                        //for notebook[last()]
                         obj = _.detect(val, function(element){
-                            var main_list = _.flatten(element.att_list);
-                            return _.include(main_list, check[0]);
+                            return _.include(_.flatten(element.att_list), check[0]);
                         });
                     }
                     break;
                 case 3:
+                    //for field[@name='type']
                     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;}
+                        if((_.intersection(_.flatten(element.att_list),_.uniq(check))).length == check.length){
+                            return element;
+                        }
                     });
                     break;
                 case 1:
+                    //for /form/notebook
                     var list_1 = _.select(val,function(element){
-                        var main_list = _.flatten(element.att_list);
-                        return _.include(main_list, check[0]);
+                        return _.include(_.flatten(element.att_list), check[0]);
                     });
                     if(list_1.length != 0){
                         (check_list.length == 1)? obj = list_1[0] : check_list.shift();
@@ -230,8 +221,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 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)
+                    self.increase_level(xpath_object[0], obj.level+1);
                     obj.child_id.push(xpath_object[0]);
                     xpath_object.pop();
                     return;
@@ -402,10 +392,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         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);
+                var temp_obj = self.convert_tag_to_obj(xml_child);
                 var main_list = _.flatten(temp_obj.att_list);
-                check_list = _.uniq(check_list);
-                var insert = _.intersection(main_list,check_list);
+                var insert = _.intersection(main_list,_.uniq(check_list));
                 if(insert.length == check_list.length ){return xml_child;}
             });
         }

From 13aaf10a5f2980bec068a3eef33c7af556ae9c03 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 3 Nov 2011 11:44:25 +0530
Subject: [PATCH 010/114] [IMP]reduced code and given proper name.

bzr revid: vme@tinyerp.com-20111103061425-223ika1xh70zefu5
---
 addons/web/static/src/js/view_editor.js | 154 +++++++++++-------------
 1 file changed, 71 insertions(+), 83 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index b402da6a13a..629f13b39f7 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -118,89 +118,80 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     get_arch: function() {
         var self = this;
-        var view_arch_list = [];
         var view_id =
             ((this.view_edit_dialog.$element.find("input[name='radiogroup']:checked").parent()).parent())
                     .attr('data-id');
+        var view_arch_list = [];
         var ve_dataset = new openerp.web.DataSet(this, 'ir.ui.view');
         ve_dataset.read_ids([parseInt(view_id)], ['arch'], function (arch) {
-            one_object = self.parse_xml(arch[0].arch, view_id);
+            arch_object = self.parse_xml(arch[0].arch, view_id);
             view_arch_list.push({"view_id" : view_id, "arch" : arch[0].arch});
             dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null);
             dataset.read_slice([], {domain : [['inherit_id','=', parseInt(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);
+                    self.inherit_view(arch_object, res);
                 });
-                return self.edit_view({"main_object": one_object,
-                         "parent_child_id": self.parent_child_list(one_object, []),
+                return self.edit_view({"main_object": arch_object,
+                         "parent_child_id": self.parent_child_list(arch_object, []),
                          "arch": view_arch_list});
             });
         });
     },
-    parent_child_list : function(one_object, p_list) {
+    parent_child_list : function(one_object, parent_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);
+                parent_list.push({"key":element.id,"value":_.pluck(element.child_id, 'id')});
+                self.parent_child_list(element.child_id, parent_list);
             }
         });
-        return p_list;
+        return parent_list;
     },
-    inherit_view : function(one_object, result) {
+    inherit_view : function(arch_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]);
-        }
+        (root[0].tagName.toLowerCase() == "data")?xml_list = $(root[0]).children() : 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);
+            var expr_to_list = [];
+            var xpath_arch_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("!"),""));
+                    expr_to_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)];
+                var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list)
+                    { return _.include(list, "position")});
+                    expr_to_list = [_.flatten(temp)];
             }
-            self.full_path_search(check_list ,one_object ,xpath_object);
+            self.inherit_apply(expr_to_list ,arch_object ,xpath_arch_object);
         });
     },
-    full_path_search: function(check_list ,val ,xpath_object) {
+    inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) {
         var self = this;
-        if(xpath_object.length!=0){
-            var check = check_list[0];
+        if(xpath_arch_object.length!=0){
+            var check = expr_list[0];
             var obj;
             switch (check.length) {
                 case 2:
                     if(parseInt(check[1])){
                         //for field[3]
-                        var list_1 = _.select(val,function(element){
+                        var temp_list = _.select(arch_object,function(element){
                             return _.include(_.flatten(element.att_list), check[0]);
                         });
-                        obj = val[_.indexOf(val,list_1[parseInt(check[1])-1])];
+                        obj = arch_object[_.indexOf(arch_object,temp_list[parseInt(check[1])-1])];
                     } else {
                         //for notebook[last()]
-                        obj = _.detect(val, function(element){
+                        obj = _.detect(arch_object, function(element){
                             return _.include(_.flatten(element.att_list), check[0]);
                         });
                     }
                     break;
                 case 3:
                     //for field[@name='type']
-                    obj = _.detect(val,function(element){
+                    obj = _.detect(arch_object, function(element){
                         if((_.intersection(_.flatten(element.att_list),_.uniq(check))).length == check.length){
                             return element;
                         }
@@ -208,28 +199,27 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     break;
                 case 1:
                     //for /form/notebook
-                    var list_1 = _.select(val,function(element){
+                    var temp_list = _.select(arch_object, function(element){
                         return _.include(_.flatten(element.att_list), check[0]);
                     });
-                    if(list_1.length != 0){
-                        (check_list.length == 1)? obj = list_1[0] : check_list.shift();
+                    if(temp_list.length != 0){
+                        (expr_list.length == 1)? obj = temp_list[0] : expr_list.shift();
                     }
                     break;
             }
             if(obj) {
-                check_list.shift();
-                if (check_list.length !=0){
-                    self.full_path_search(check_list ,obj.child_id ,xpath_object);
+                expr_list.shift();
+                if (expr_list.length !=0){
+                    self.inherit_apply(expr_list ,obj.child_id ,xpath_arch_object);
                 } else {
-                    self.increase_level(xpath_object[0], obj.level+1);
-                    obj.child_id.push(xpath_object[0]);
-                    xpath_object.pop();
-                    return;
+                    self.increase_level(xpath_arch_object[0], obj.level+1);
+                    obj.child_id.push(xpath_arch_object[0]);
+                    xpath_arch_object.pop();
                 }
             }
             else {
-                _.each(val,function(element){
-                    self.full_path_search(check_list ,element.child_id ,xpath_object);
+                _.each(arch_object,function(element){
+                    self.inherit_apply(expr_list ,element.child_id ,xpath_arch_object);
                 });
             }
         }
@@ -280,23 +270,23 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         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 clicked_tr_id = (side.attr('id')).split('-')[1];
+            var img = side.find("img[id='parentimg-"+clicked_tr_id+"']").attr('src'); ;
+            var clicked_tr_level = parseInt(side.attr('level'));
             var cur_tr = side;
-            list_shift.push(side);
+            var last_tr;
             var next_tr;
-            var ls = side;
+            var tr_to_move =[];
+            tr_to_move.push(side);
             var view_id;
             var view_xml_id;
+            var view_find = side;
             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];
+                view_find = view_find.prev();
+               if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
+                     && parseInt(view_find.attr('level')) < clicked_tr_level){
+                    view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g,''));
+                    view_xml_id = (view_find.attr('id')).split('-')[1];
                     break;
                 }
             }
@@ -310,45 +300,45 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-up":
                     while (1) {
                         var prev_tr = cur_tr.prev();
-                        if(level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) {
+                        if(clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) {
                            last_tr = prev_tr;
                            break;
                         }
                         cur_tr = prev_tr;
                     }
                     if (img) {
-                    self.edit_xml_dialog.$element.find("img[id='parentimg-" + id_tr + "']").
+                    self.edit_xml_dialog.$element.find("img[id='parentimg-" + clicked_tr_id + "']").
                                                         attr('src', '/web/static/src/img/expand.gif');
                         while (1) {
                             next_tr = side.next();
-                            if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) {
+                            if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) {
                                 break;
                             } else {
                                 next_tr.hide();
-                                list_shift.push(next_tr);
+                                tr_to_move.push(next_tr);
                                 side = next_tr;
                             }
                         }
                     }
                     if (last_tr.length != 0 
-                            && parseInt(last_tr.attr('level')) == level
+                            && parseInt(last_tr.attr('level')) == clicked_tr_level
                                 && 
                     (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
-                        _.each(list_shift, function(rec) {
+                        _.each(tr_to_move, function(rec) {
                              $(last_tr).before(rec);
                         });
-                        self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "up");
+                        self.save_move_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_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) {
+                        if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) {
                             last_tr = next_tr;
                             break;
                         } else {
-                            list_shift.push(next_tr);
+                            tr_to_move.push(next_tr);
                             cur_tr = next_tr;
                         }
                    }
@@ -359,7 +349,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 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) {
+                if (last_tr.length != 0 &&  parseInt(last_tr.attr('level')) == clicked_tr_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) {
@@ -367,28 +357,26 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                                                         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;
+                            if (next_tr.attr('level') <= clicked_tr_level || next_tr.length == 0) break;
                             next_tr.hide();
                             last_tr = next_tr;
                         }
                     }
-                    
-                    list_shift.reverse();
-                    _.each(list_shift, function(rec) {
+                    tr_to_move.reverse();
+                    _.each(tr_to_move, function(rec) {
                        $(last_tr).after(rec);
                     });
-                    self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down");
+                    self.save_move_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down");
                 }
                 break;
             }
         });
     },
-    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct){
+    save_move_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, 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'], []);
+        var arch = _.detect(one_object['arch'],function(element){return element.view_id == view_id;});
+        var obj = self.get_object_by_id(view_xml_id, one_object['main_object'], []);
+         //for finding xpath tag from inherit view
         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){
@@ -398,11 +386,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 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),
+        return self.save_arch(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(level),
                         parseInt(view_id), arch, move_direct);
     },
 
-    get_view_object: function(view_xml_id, one_object,result){
+    get_object_by_id: function(view_xml_id, one_object,result){
         var self = this;
         if(result.length==0){
             var check = _.detect(one_object , function(obj){
@@ -410,13 +398,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
             if(check){result.push(check);};
             _.each(one_object, function(obj){
-               self.get_view_object(view_xml_id, obj.child_id, result);
+               self.get_object_by_id(view_xml_id, obj.child_id, result);
             });
         }
         return result;
     },
 
-    get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){
+    save_arch: 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);
@@ -448,7 +436,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             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);
+                    self.save_arch(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct);
                 });
             }
         }

From a100ce70b00e21a51aa46c4796db8e1e2ae07f2c Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 3 Nov 2011 17:47:30 +0530
Subject: [PATCH 011/114] [IMP] vieweditor :- improve code.

bzr revid: ysa@tinyerp.com-20111103121730-ev0n4v6swetak1jw
---
 addons/web/static/src/js/view_editor.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index c26fecc062c..570f602fff0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -15,22 +15,22 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     init_view_editor: function() {
         var self = this;
         var action = {
-            name:'ViewEditor',
-            context:this.session.user_context,
+            name: _.sprintf("Manage Views (%s)", this.model),
+            context: this.session.user_context,
             domain: [["model", "=", this.dataset.model]],
-            res_model : 'ir.ui.view',
-            views : [[false, 'list']],
+            res_model: 'ir.ui.view',
+            views: [[false, 'list']],
             type: 'ir.actions.act_window',
             target: "current",
-            limit : 80,
-            auto_search : true,
+            limit: this.dataset.limit || 80,
+            auto_search: true,
             flags: {
                 sidebar: false,
                 deletable: false,
                 views_switcher: false,
-                action_buttons:false,
-                search_view:false,
-                pager:false,
+                action_buttons: false,
+                search_view: false,
+                pager: false,
                 radio: true
             },
         };
@@ -44,11 +44,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 //to do
             },
             "Edit": function(){
-                self.xml_element_id=0;
+                self.xml_element_id = 0;
                 self.get_arch();
             },
             "Close": function(){
-                $(this).dialog('destroy');
+                self.view_edit_dialog.close();
             }
         },
         }).start().open();
@@ -334,7 +334,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             }
                         }
                     }
-                    if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level && 
+                    if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level &&
                     (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
                         _.each(tr_to_move, function(rec) {
                              $(last_tr).before(rec);

From bc9c13dc0c16dad4fb705e2512db1dc5f7d9f373 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 3 Nov 2011 17:55:20 +0530
Subject: [PATCH 012/114] [IMP] vieweditor :- improve code of select view in
 manage view list.

bzr revid: ysa@tinyerp.com-20111103122520-neun6etb7dxr1ahw
---
 addons/web/static/src/js/view_editor.js | 33 ++++++++++++++++---------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 570f602fff0..3176f8e72fd 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -40,21 +40,31 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             width: 750,
             height: 500,
             buttons: {
-            "Create": function(){
-                //to do
+                "Create": function(){
+                    //to do
+                },
+                "Edit": function(){
+                    self.xml_element_id = 0;
+                    self.get_arch();
+                },
+                "Close": function(){
+                    self.view_edit_dialog.close();
+                }
             },
-            "Edit": function(){
-                self.xml_element_id = 0;
-                self.get_arch();
-            },
-            "Close": function(){
-                self.view_edit_dialog.close();
-            }
-        },
         }).start().open();
         var action_manager = new openerp.web.ActionManager(this);
         action_manager.appendTo(this.view_edit_dialog);
-        action_manager.do_action(action);
+        $.when(action_manager.do_action(action)).then(function() {
+            var viewmanager = action_manager.inner_viewmanager,
+                controller = viewmanager.views[viewmanager.active_view].controller;
+            controller.on_loaded.add_last(function(){
+                $(controller.groups).bind({
+                    'selected': function(e, ids, records) {
+                        self.main_view_id = ids[0];
+                    }
+                })
+            });
+        });
     },
 
     convert_tag_to_obj: function(xml, level) {
@@ -119,7 +129,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     get_arch: 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) {
             var arch_object = self.parse_xml(arch[0].arch,self.main_view_id);

From bd1a87840738e40840dde22cc11656d108a02c99 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 3 Nov 2011 18:34:55 +0530
Subject: [PATCH 013/114] [IMP] vieweditor:- code refactor.

bzr revid: ysa@tinyerp.com-20111103130455-u9i5okx02jioq3an
---
 addons/web/static/src/js/view_editor.js | 96 ++++++++++++++-----------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 3176f8e72fd..70a389a97fe 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -66,28 +66,34 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         });
     },
-
     convert_tag_to_obj: function(xml, level) {
-        var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""};
+        var obj = {
+            'child_id': [],
+            'id': this.xml_element_id++,
+            'level': level + 1,
+            'att_list': [],
+            'name': ''
+        };
         var tag = xml.tagName.toLowerCase();
         obj.att_list.push(tag);
-        obj.name = "<"+ tag
+        obj.name = "<" + tag;
         $(xml).each(function() {
-            _.each(this.attributes, function(attrs){
-            if (tag != 'button' && tag != 'field') {
-                if (attrs.nodeName == "string" ) {
-                obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;}
-            } else {
-                if (attrs.nodeName == "name") {
-                obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';}
-            }
-            obj.att_list.push( [attrs.nodeName,attrs.nodeValue] );
+            _.each(this.attributes, function(attrs) {
+                if (tag != 'button' && tag != 'field') {
+                    if (attrs.nodeName == "string" ) {
+                        obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';
+                    }
+                } else {
+                    if (attrs.nodeName == "name") {
+                        obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';
+                    }
+                }
+                obj.att_list.push([attrs.nodeName, attrs.nodeValue]);
             });
-        obj.name+= ">";
+            obj.name += ">";
         });
         return obj;
     },
-
     append_child_object: function(val, parent_list, child_obj_list) {
         var self = this;
         if (val.child_id.length != 0) {
@@ -97,60 +103,63 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         } else { val.child_id = child_obj_list; }
     },
-
     convert_arch_to_obj: function(xml, parent_list, parent_id, main_object){
         var self = this;
         var child_obj_list = [];
         var children_list = $(xml).children();
         var parents = $(children_list[0]).parents().get();
-        _.each(children_list, function (child_node) {
+        _.each(children_list, function(child_node) {
             child_obj_list.push(self.convert_tag_to_obj(child_node,parents.length));
         });
         if (children_list.length != 0) {
-            if(parents.length <= parent_list.length) {parent_list.splice(parents.length - 1);}
+            if(parents.length <= parent_list.length) { parent_list.splice(parents.length - 1);}
             parent_list.push(parent_id);
             self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list);
         }
-        for (var i=0; i<children_list.length; i++) {
-            self.convert_arch_to_obj
-            (children_list[i], parent_list, child_obj_list[i].id, main_object);
+        for (var i = 0; i < children_list.length; i++) {
+            self.convert_arch_to_obj(children_list[i], 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 view_obj ={'child_id':[],'id':this.xml_element_id++,
-            'level':0,'att_list':[],'name':"<view view_id='"+view_id+"'>"};
-        var root_object = this.convert_tag_to_obj(root,0);
+        var view_obj = {
+            'child_id': [],
+            'id': this.xml_element_id++,
+            'level': 0,
+            'att_list': [],
+            'name': _.sprintf("<view view_id='%d'>", view_id),
+        };
+        var root_object = this.convert_tag_to_obj(root, 0);
         view_obj.child_id = this.convert_arch_to_obj(arch, [], this.xml_element_id, [root_object], []);
         return [view_obj];
     },
     get_arch: function() {
         var self = this;
         var view_arch_list = [];
-        var ve_dataset = new openerp.web.DataSet(this, 'ir.ui.view');
-        ve_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function (arch) {
-            var arch_object = self.parse_xml(arch[0].arch,self.main_view_id);
+        var view_dataset = new openerp.web.DataSet(this, 'ir.ui.view');
+        view_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function(arch) {
+            var arch_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});
+            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) {
+            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});
+                    view_arch_list.push({"view_id": res.id, "arch": res.arch});
                     self.inherit_view(arch_object, res);
                 });
                 return self.edit_view({"main_object": arch_object,
-                         "parent_child_id": self.parent_child_list(arch_object, []),
-                         "arch": view_arch_list});
+                    "parent_child_id": self.parent_child_list(arch_object, []),
+                    "arch": view_arch_list});
             });
         });
     },
     parent_child_list : function(one_object, parent_list) {
         var self = this;
-        _.each(one_object , function(element){
-            if(element.child_id.length != 0){
-                parent_list.push({"key":element.id,"value":_.pluck(element.child_id, 'id')});
+        _.each(one_object , function(element) {
+            if (element.child_id.length != 0) {
+                parent_list.push({"key": element.id, "value": _.pluck(element.child_id, 'id')});
                 self.parent_child_list(element.child_id, parent_list);
             }
         });
@@ -160,21 +169,22 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         var root = $(result.arch).filter('*');
         var xml_list = [];
-        (root[0].tagName.toLowerCase() == "data")?xml_list = $(root[0]).children() : xml_list.push(root[0]);
-        _.each(xml_list , function(xml){
+        root[0].tagName.toLowerCase() == "data"? xml_list = $(root[0]).children() : xml_list.push(root[0]);
+        _.each(xml_list, function(xml) {
             var expr_to_list = [];
             var xpath_arch_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){
-                    expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"),""));
+                var part_expr = _.without($(xml).attr('expr').split("/"), "");
+                _.each(part_expr, function(part) {
+                    expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"), ""));
                 });
             } else {
-                var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list)
-                    { return _.include(list, "position")});
-                    expr_to_list = [_.flatten(temp)];
+                var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
+                    return _.include(list, "position")
+                });
+                expr_to_list = [_.flatten(temp)];
             }
-            self.inherit_apply(expr_to_list ,arch_object ,xpath_arch_object);
+            self.inherit_apply(expr_to_list, arch_object ,xpath_arch_object);
         });
     },
     inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) {

From dd5270a00db6991c50991ef58b55daf8fb987d8d Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 10:33:38 +0530
Subject: [PATCH 014/114] [IMP]Implement code for update node in view editor.

bzr revid: kch@tinyerp.com-20111104050338-tdble3tr1v05a7cv
---
 addons/web/static/src/js/view_editor.js | 193 +++++++++++++++---------
 1 file changed, 123 insertions(+), 70 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d7f059005f7..7221a895d17 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -112,7 +112,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         obj.att_list.push(tag);
         $(xml).each(function() {
             _.each(this.attributes, function(attrs){
-                if (tag != 'button') {
+                if ((tag != 'button') && (tag != 'field')){
                     if (attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index") {
                         render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;
                     }
@@ -393,7 +393,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         fld_name= tag;
                     }
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties,fld_name,id_tr);
+                    self.on_edit_node(properties,fld_name,id_tr,one_object,view_id, view_xml_id, level);
                     break;
                 case "side-up":
                     while (1) {
@@ -465,7 +465,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         });
     },
-    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct){
+    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct, update_values){
         var self = this;
         var arch = _.detect(one_object['arch'],function(element){
             return element.view_id == view_id;
@@ -482,7 +482,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         }
         return self.get_node(arch.arch, obj[0].child_id[0], parseInt(id_tr), [], parseInt(level),
-            parseInt(view_id), arch, move_direct);
+            parseInt(view_id), arch, move_direct, update_values);
     },
     get_view_object: function(view_xml_id, one_object,result){
         var self = this;
@@ -497,13 +497,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return result;
     },
-    get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){
+    get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){
         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);
@@ -511,11 +510,20 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     var next = $(arch1).next();
                     $(next).after(arch1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
-                } else {
+                }else if(move_direct == "up"){
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
+                }else if(move_direct == "update_node"){
+                    _.each(update_values, function(val){
+                        $(arch1).attr(val[0],val[1]);
+                    });
+                    var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level);
+                    new_obj.id = obj.id;
+                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
+                    child_list.splice(_.indexOf(child_list, obj), 0, new_obj);
                 }
+
                 parent = parent[parent.length-1];
                 var convert_to_utf = self.xml2Str(parent);
                 if (convert_to_utf) {
@@ -529,7 +537,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             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);
+                    self.get_node(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values);
                 });
             }
         }
@@ -570,7 +578,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties,fld_name,id_tr){
+    on_edit_node:function(properties,fld_name,id_tr,obj,view_id, view_xml_id, level){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -579,7 +587,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 200,
             buttons: {
                     "Update": function(){
-                        self.on_update_node();
+                        //self.on_update_node();
+                        var update_values = [];
+                        _.each(self.edit_widget,function(widget){
+                            update_values.push(widget.get_value());
+                        });
+                        update_values = _.without(update_values,undefined);
+                        self.save_move_arch(obj, view_id, view_xml_id, id_tr, level, "update_node", update_values);
                     },
                     "Cancel": function(){
                         $(this).dialog('destroy');
@@ -589,18 +603,21 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog.start().open();
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(id_tr,one_object,[]);
-        self.edit_node_dialog.$element.append('<table id="rec_table"></table>');
+        self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
+        self.edit_widget = [];
         _.each(properties,function(record){
             var id = record;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                     if (_.include(widget,id)){
-                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val);
+                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
+                        self.edit_widget.push(type_widget);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        (id=='groups')?type_widget.set_value(id,self.groups):type_widget.set_value(id);
+                        (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
                     }else{
-                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val);
+                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
+                        self.edit_widget.push(type_widget);
                         self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value(id);
+                        type_widget.set_value();
                     }
                 });
             });
@@ -618,7 +635,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         groups = [];
         var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
             model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
-        res_groups
+            res_groups
             .read_slice([],{})
             .done(function(res_grp) {
                 _.each(res_grp,function(res){
@@ -638,137 +655,173 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             })
         return def.promise();
     },
-    on_update_node: function(){
-        //todo
-    }
+    /*on_update_node: function(){
+        var self = this;
+        var values = [];
+        _.each(self.edit_widget,function(widget){
+            values.push(widget.get_value());
+        });
+        values = _.without(values,undefined);
+    }*/
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
-    init: function(view, node) {
+    init: function(view, node, id) {
         var self = this;
         this.$element = view.$element;
         this.node = node;
+        this.dirty = false;
+        this.name = id;
     },
     render: function () {
         return QWeb.render(this.template, {widget: this});
     }
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.template = "view_boolean";
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,id);
+            return _.include(res,self.name);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+id+"] input").attr('checked', false);
+        view_val ? this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+self.name+"] input").attr('checked', false);
+    },
+    get_value: function(){
+        var val = this.$element.find("tr[id="+this.name+"] input").attr('checked');
+        if (val){
+            return [this.name,val];
+        }
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.template = "view_char";
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,id);
+            return _.include(res, self.name);
         });
-        view_val ? this.$element.find("tr[id="+id+"] input").val(view_val[1]): this.$element.find("tr[id="+id+"] input").val();
+        view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
+    },
+    get_value: function(){
+        var val= this.$element.find("tr[id="+this.name+"] input").val();
+        if (val){
+            return [this.name,val];
+        }
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.template = "view_selection";
     },
-    set_value: function(id,value) {
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,id);
-        });
+    set_value: function(value) {
         var self = this;
+        var view_val = _.detect(this.node[0]['att_list'],function(res) {
+            return _.include(res,self.name);
+        });
         _.each(value, function(item) {
             var select_val = view_val?(view_val[1]==item[0]?true:false):false;
-            self.$element.find("tr[id="+id+"] select").append($("<option/>", {
+            self.$element.find("tr[id="+self.name+"] select").append($("<option/>", {
                     value:(typeof(item)=='string')?item:item[0],
                     text:(typeof(item)=='string')?item:item[1],
                     selected:select_val
             }));
         });
+    },
+    get_value: function(){
+        var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
+        if (val){
+            return [this.name,val];
+        }
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self= this;
         var value = _.keys(this.registry.map);
         value.push('');
         value.sort();
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = icons;
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['new','New Window']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id) {
+    set_value: function() {
+        var self = this;
         var value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        this._super.apply(this,[id, value]);
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node) {
-        this._super(view, node);
+    init: function(view, node, id) {
+        this._super(view, node, id);
     },
-    set_value: function(id,value) {
-        this.$element.find("tr[id="+id+"] select").attr('multiple', true);
-        this._super.apply(this,[id, value]);
+    set_value: function(value) {
+        var self = this;
+        this.$element.find("tr[id="+ this.name +"] select").attr('multiple', true);
+        this.$element.find("tr[id="+ this.name +"] select").css('height','100px');
+        this._super.apply(this,[value]);
     }
 });
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({

From 7ed841b241f5105ffb82a524af2979178ddab375 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 4 Nov 2011 10:36:01 +0530
Subject: [PATCH 015/114] [IMP] vieweditor :- code refactoring.

bzr revid: ysa@tinyerp.com-20111104050601-igvnt3gqhe7bkfxp
---
 addons/web/static/src/js/view_editor.js | 123 ++++++++++++------------
 1 file changed, 60 insertions(+), 63 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 70a389a97fe..9e1cbf26072 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -189,20 +189,20 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) {
         var self = this;
-        if(xpath_arch_object.length!=0){
+        if (xpath_arch_object.length) {
             var check = expr_list[0];
             var obj;
             switch (check.length) {
                 case 2:
-                    if(parseInt(check[1])){
+                    if (parseInt(check[1])) {
                         //for field[3]
-                        var temp_list = _.select(arch_object,function(element){
+                        var temp_list = _.select(arch_object, function(element) {
                             return _.include(_.flatten(element.att_list), check[0]);
                         });
-                        obj = arch_object[_.indexOf(arch_object,temp_list[parseInt(check[1])-1])];
+                        obj = arch_object[_.indexOf(arch_object, temp_list[parseInt(check[1]) - 1])];
                     } else {
                         //for notebook[last()]
-                        obj = _.detect(arch_object, function(element){
+                        obj = _.detect(arch_object, function(element) {
                             return _.include(_.flatten(element.att_list), check[0]);
                         });
                     }
@@ -210,34 +210,34 @@ 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 == check.length) {
                             return element;
                         }
                     });
                     break;
                 case 1:
                     //for /form/notebook
-                    var temp_list = _.select(arch_object, function(element){
+                    var temp_list = _.select(arch_object, function(element) {
                         return _.include(_.flatten(element.att_list), check[0]);
                     });
-                    if(temp_list.length != 0){
-                        (expr_list.length == 1)? obj = temp_list[0] : expr_list.shift();
+                    if (temp_list.length != 0) {
+                        expr_list.length == 1 ? obj = temp_list[0] : expr_list.shift();
                     }
                     break;
             }
-            if(obj) {
+            if (obj) {
                 expr_list.shift();
-                if (expr_list.length !=0){
-                    self.inherit_apply(expr_list ,obj.child_id ,xpath_arch_object);
+                if (expr_list.length) {
+                    self.inherit_apply(expr_list, obj.child_id, xpath_arch_object);
                 } else {
-                    self.increase_level(xpath_arch_object[0], obj.level+1);
+                    self.increase_level(xpath_arch_object[0], obj.level + 1);
                     obj.child_id.push(xpath_arch_object[0]);
                     xpath_arch_object.pop();
                 }
             }
             else {
-                _.each(arch_object,function(element){
-                    self.inherit_apply(expr_list ,element.child_id ,xpath_arch_object);
+                _.each(arch_object, function(element) {
+                    self.inherit_apply(expr_list, element.child_id, xpath_arch_object);
                 });
             }
         }
@@ -251,28 +251,28 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     edit_view: function(one_object) {
         var self = this;
-        this.edit_xml_dialog = new openerp.web.Dialog(this,{
+        this.edit_xml_dialog = new openerp.web.Dialog(this, {
             modal: true,
             title: 'View Editor',
             width: 750,
             height: 500,
             buttons: {
-                "Inherited View": function(){
+                "Inherited View": function() {
                     //todo
                 },
-                "Preview": function(){
+                "Preview": function() {
                     var action = {
-                        context:self.session.user_context,
-                        res_model : self.model,
-                        views : [[self.main_view_id, self.main_view_type]],
+                        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,
+                            action_buttons: false,
+                            search_view: false,
+                            pager: false,
                         },
                     };
                     var action_manager = new openerp.web.ActionManager(self);
@@ -282,11 +282,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     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'],
-        }));
+        }).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');
@@ -302,23 +299,23 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         });
         this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() {
-            var side = $(this).closest("tr[id^='viewedit-']")
+            var side = $(this).closest("tr[id^='viewedit-']");
             var clicked_tr_id = (side.attr('id')).split('-')[1];
-            var img = side.find("img[id='parentimg-"+clicked_tr_id+"']").attr('src'); ;
+            var img = side.find("img[id='parentimg-" + clicked_tr_id + "']").attr('src');
             var clicked_tr_level = parseInt(side.attr('level'));
             var cur_tr = side;
             var last_tr;
             var next_tr;
-            var tr_to_move =[];
+            var tr_to_move = [];
             tr_to_move.push(side);
             var view_id;
             var view_xml_id;
             var view_find = side;
-            while(1){
+            while (1) {
                 view_find = view_find.prev();
-               if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
-                     && parseInt(view_find.attr('level')) < clicked_tr_level){
-                    view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g,''));
+                if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
+                        && parseInt(view_find.attr('level')) < clicked_tr_level) {
+                    view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
                     view_xml_id = (view_find.attr('id')).split('-')[1];
                     break;
                 }
@@ -333,7 +330,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-up":
                     while (1) {
                         var prev_tr = cur_tr.prev();
-                        if(clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) {
+                        if (clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) {
                            last_tr = prev_tr;
                            break;
                         }
@@ -341,10 +338,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     }
                     if (img) {
                     self.edit_xml_dialog.$element.find("img[id='parentimg-" + clicked_tr_id + "']").
-                                                        attr('src', '/web/static/src/img/expand.gif');
+                            attr('src', '/web/static/src/img/expand.gif');
                         while (1) {
                             next_tr = side.next();
-                            if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) {
+                            if (parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) {
                                 break;
                             } else {
                                 next_tr.hide();
@@ -354,7 +351,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         }
                     }
                     if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level &&
-                    (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
+                            (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
                         _.each(tr_to_move, function(rec) {
                              $(last_tr).before(rec);
                         });
@@ -377,7 +374,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 else {
                     last_tr = cur_tr.next();
                 }
-                if((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1){
+                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')) == clicked_tr_level) {
@@ -403,32 +400,32 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         });
     },
-    save_move_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, level, move_direct){
+    save_move_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, level, move_direct) {
         var self = this;
-        var arch = _.detect(one_object['arch'],function(element){return element.view_id == view_id;});
+        var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;});
         var obj = self.get_object_by_id(view_xml_id, one_object['main_object'], []);
          //for finding xpath tag from inherit view
-        if(($(arch.arch).filter("data")).length != 0 && view_xml_id != 0){
+        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.convert_tag_to_obj(xml_child);
                 var main_list = _.flatten(temp_obj.att_list);
                 var insert = _.intersection(main_list,_.uniq(check_list));
-                if(insert.length == check_list.length ){return xml_child;}
+                if (insert.length == check_list.length ) {return xml_child;}
             });
         }
         return self.save_arch(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(level),
                         parseInt(view_id), arch, move_direct);
     },
 
-    get_object_by_id: function(view_xml_id, one_object,result){
+    get_object_by_id: 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 (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){
+            if (check) {result.push(check);};
+            _.each(one_object, function(obj) {
                self.get_object_by_id(view_xml_id, obj.child_id, result);
             });
         }
@@ -442,7 +439,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             if (obj.id == id) {
                 var id;
                 var parent = $(arch1).parents();
-                var index = _.indexOf(child_list, obj)
+                var index = _.indexOf(child_list, obj);
                 var re_insert_obj = child_list.splice(index, 1);
                 if (move_direct == "down") {
                     var next = $(arch1).next();
@@ -453,19 +450,19 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     $(prev).before(arch1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                 }
-                parent = parent[parent.length-1];
+                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) {
+                        dataset.write(parseInt(view_id),{"arch": convert_to_utf}, function(result) {
                     });
                 }
             }
-            if(obj.level <= level){
-                _.each(list_obj_xml, function(child_node){
+            if (obj.level <= level) {
+                _.each(list_obj_xml, function(child_node) {
                     self.save_arch(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct);
                 });
             }
@@ -475,11 +472,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
        try {
           return (new XMLSerializer()).serializeToString(xmlNode);
       }
-      catch (e) {
+      catch (exception) {
          try {
             return xmlNode.xml;
          }
-         catch (e) {
+         catch (exception) {
             return false;
          }
        }
@@ -489,7 +486,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var cur_tr = $(expand_img).closest("tr[id^='viewedit-']");
         while (1) {
             var nxt_tr = cur_tr.next();
-            if (parseInt(nxt_tr.attr('level')) > level){
+            if (parseInt(nxt_tr.attr('level')) > level) {
                 cur_tr = nxt_tr;
                 nxt_tr.hide();
             } else return nxt_tr;
@@ -498,12 +495,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     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) {
+        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');
+        _.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();
         });
     }

From 0955cc4eeafcf34a8964d31600f7b207c0d8b127 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 15:22:06 +0530
Subject: [PATCH 016/114] [FIX]Fixed code for getting updated value in boolean
 field.

bzr revid: kch@tinyerp.com-20111104095206-yy9yv1kmeupgg76d
---
 addons/web/static/src/js/view_editor.js | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 7221a895d17..6f31aa75031 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -9,7 +9,7 @@ var _PROPERTIES = {
     'image' : ['filename', 'width', 'height', 'groups'],
     'separator' : ['string', 'colspan', 'groups'],
     'label': ['string', 'align', 'colspan', 'groups'],
-    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups'],
+    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
     'newline' : [],
     'hpaned': ['position', 'groups'],
     'vpaned': ['position', 'groups'],
@@ -587,12 +587,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 200,
             buttons: {
                     "Update": function(){
-                        //self.on_update_node();
                         var update_values = [];
                         _.each(self.edit_widget,function(widget){
                             update_values.push(widget.get_value());
                         });
-                        update_values = _.without(update_values,undefined);
                         self.save_move_arch(obj, view_id, view_xml_id, id_tr, level, "update_node", update_values);
                     },
                     "Cancel": function(){
@@ -654,15 +652,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             })
         return def.promise();
-    },
-    /*on_update_node: function(){
-        var self = this;
-        var values = [];
-        _.each(self.edit_widget,function(widget){
-            values.push(widget.get_value());
-        });
-        values = _.without(values,undefined);
-    }*/
+    }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node, id) {
@@ -686,12 +676,16 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
             return _.include(res,self.name);
         });
-        view_val ? this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]): this.$element.find("tr[id="+self.name+"] input").attr('checked', false);
+        if(view_val){
+            this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]);
+        }
     },
     get_value: function(){
-        var val = this.$element.find("tr[id="+this.name+"] input").attr('checked');
+        var val = this.$element.find("tr[id="+this.name+"] input").is(':checked');
         if (val){
             return [this.name,val];
+        }else{
+            return [this.name,null];
         }
     }
 });
@@ -708,9 +702,12 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
     },
     get_value: function(){
+        var self = this;
         var val= this.$element.find("tr[id="+this.name+"] input").val();
         if (val){
             return [this.name,val];
+        }else{
+            return [this.name,""];
         }
     }
 });
@@ -725,7 +722,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
             return _.include(res,self.name);
         });
         _.each(value, function(item) {
-            var select_val = view_val?(view_val[1]==item[0]?true:false):false;
+            var select_val = view_val?(view_val[1]==((typeof(item)=='string')?item:item[0])?true:false):false;
             self.$element.find("tr[id="+self.name+"] select").append($("<option/>", {
                     value:(typeof(item)=='string')?item:item[0],
                     text:(typeof(item)=='string')?item:item[1],
@@ -734,9 +731,12 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         });
     },
     get_value: function(){
+        var self = this;
         var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
         if (val){
             return [this.name,val];
+        }else{
+            return [this.name,""];
         }
     }
 });

From 2de28bf033c556b0cf40e22fddeba5ed5e0d8d72 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 4 Nov 2011 16:58:48 +0530
Subject: [PATCH 017/114] [FIX]save and move functionality after update node.

bzr revid: vme@tinyerp.com-20111104112848-gdfj275kyrj2g2qq
---
 addons/web/static/src/js/view_editor.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 6f31aa75031..f44b063561b 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -503,27 +503,29 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var list_obj_xml = _.zip(children_list,obj.child_id);
         if (id) {
             if (obj.id == 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);
+                    var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
                 }else if(move_direct == "up"){
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
+                    var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                 }else if(move_direct == "update_node"){
                     _.each(update_values, function(val){
+                        if(val[1]){
                         $(arch1).attr(val[0],val[1]);
+                        }
                     });
                     var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level);
                     new_obj.id = obj.id;
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
-                    child_list.splice(_.indexOf(child_list, obj), 0, new_obj);
+                    child_list.splice(index, 1, new_obj);
                 }
-
+                var parent = $(arch1).parents();
                 parent = parent[parent.length-1];
                 var convert_to_utf = self.xml2Str(parent);
                 if (convert_to_utf) {
@@ -838,4 +840,4 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
     'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
 });
-};
\ No newline at end of file
+};

From d67d093495e24b785e48f3baa43fc4cb2c7eed96 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 4 Nov 2011 17:33:44 +0530
Subject: [PATCH 018/114] [FIX]fix wrong level and child_id issue after update
 node.

bzr revid: vme@tinyerp.com-20111104120344-nckdtrak38l9px8r
---
 addons/web/static/src/js/view_editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f44b063561b..5676a4be5c4 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -520,8 +520,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         $(arch1).attr(val[0],val[1]);
                         }
                     });
-                    var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level);
+                    var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level - 1);
                     new_obj.id = obj.id;
+                    new_obj.child_id = obj.child_id;
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
                 }

From 766be33a937ac6e6d19b86ceb0fa7de72a2576ae Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 17:45:25 +0530
Subject: [PATCH 019/114] [FIX]Fixed code by using change method so now only
 update attr goes to save.

bzr revid: kch@tinyerp.com-20111104121525-m5lff48g2a87hreh
---
 addons/web/static/src/js/view_editor.js | 92 +++++++++++++++++--------
 1 file changed, 63 insertions(+), 29 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 5676a4be5c4..ae3995ff436 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -356,8 +356,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         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 tr_id = (side.attr('id')).split('-')[1];
+            var img = side.find("img[id='parentimg-"+tr_id+"']").attr('src'); ;
             var level = parseInt(side.attr('level'));
             var list_shift =[];
             var last_tr;
@@ -393,7 +393,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         fld_name= tag;
                     }
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties,fld_name,id_tr,one_object,view_id, view_xml_id, level);
+                    self.on_edit_node(properties, fld_name, tr_id, one_object, view_id, view_xml_id, level);
                     break;
                 case "side-up":
                     while (1) {
@@ -420,7 +420,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         _.each(list_shift, function(rec) {
                              $(last_tr).before(rec);
                         });
-                        self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "up");
+                        self.save_move_arch(one_object, view_id, view_xml_id, tr_id, level, "up");
                     }
                 break;
             case "side-down":
@@ -459,13 +459,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     _.each(list_shift, function(rec) {
                        $(last_tr).after(rec);
                     });
-                    self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down");
+                    self.save_move_arch(one_object, view_id, view_xml_id, tr_id, level, "down");
                 }
                 break;
             }
         });
     },
-    save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct, update_values){
+    save_move_arch: function(one_object, view_id, view_xml_id, tr_id, level, move_direct, update_values){
         var self = this;
         var arch = _.detect(one_object['arch'],function(element){
             return element.view_id == view_id;
@@ -481,7 +481,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 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),
+        return self.get_node(arch.arch, obj[0].child_id[0], parseInt(tr_id), [], parseInt(level),
             parseInt(view_id), arch, move_direct, update_values);
     },
     get_view_object: function(view_xml_id, one_object,result){
@@ -516,9 +516,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                 }else if(move_direct == "update_node"){
                     _.each(update_values, function(val){
-                        if(val[1]){
                         $(arch1).attr(val[0],val[1]);
-                        }
                     });
                     var new_obj = self.check_attr(arch1,arch1.tagName.toLowerCase(),obj.level - 1);
                     new_obj.id = obj.id;
@@ -581,7 +579,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties,fld_name,id_tr,obj,view_id, view_xml_id, level){
+    on_edit_node:function(properties, fld_name, tr_id, obj, view_id, view_xml_id, level){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -592,36 +590,43 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     "Update": function(){
                         var update_values = [];
                         _.each(self.edit_widget,function(widget){
-                            update_values.push(widget.get_value());
+                            var value = widget.get_value();
+                            if (value) {
+                                update_values.push(value);
+                            }
                         });
-                        self.save_move_arch(obj, view_id, view_xml_id, id_tr, level, "update_node", update_values);
+                        self.save_move_arch(obj, view_id, view_xml_id, tr_id, level, "update_node", update_values);
+                        self.edit_node_dialog.close();
                     },
                     "Cancel": function(){
-                        $(this).dialog('destroy');
+                        self.edit_node_dialog.close();
                     }
                 }
         });
         this.edit_node_dialog.start().open();
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
-        var arch_val = self.get_view_object(id_tr,one_object,[]);
+        var arch_val = self.get_view_object(tr_id,one_object,[]);
         self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
         self.edit_widget = [];
         _.each(properties,function(record){
             var id = record;
             self.ready  = $.when(self.on_groups(id)).then(function () {
-                    if (_.include(widget,id)){
-                        var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
-                        self.edit_widget.push(type_widget);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
-                    }else{
-                        var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
-                        self.edit_widget.push(type_widget);
-                        self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                        type_widget.set_value();
-                    }
-                });
+                if (_.include(widget,id)){
+                    var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
+                    self.edit_widget.push(type_widget);
+                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                    (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
+                    type_widget.start();
+                }else{
+                    var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
+                    self.edit_widget.push(type_widget);
+                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                    type_widget.set_value();
+                    type_widget.start();
+                }
+
             });
+        });
     },
      //for getting groups
     on_groups: function(id){
@@ -659,21 +664,29 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     init: function(view, node, id) {
-        var self = this;
         this.$element = view.$element;
         this.node = node;
         this.dirty = false;
         this.name = id;
     },
+    on_ui_change: function() {
+        this.dirty = true;
+    },
     render: function () {
         return QWeb.render(this.template, {widget: this});
-    }
+    },
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     init: function(view, node, id) {
         this._super(view, node, id);
         this.template = "view_boolean";
     },
+    start: function () {
+        var self = this;
+        this.$element.find("tr[id="+ self.name+"] input").change(function() {
+            self.on_ui_change();
+        });
+    },
     set_value: function() {
         var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
@@ -684,6 +697,9 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         }
     },
     get_value: function(){
+        if (!this.dirty) {
+            return false;
+        }
         var val = this.$element.find("tr[id="+this.name+"] input").is(':checked');
         if (val){
             return [this.name,val];
@@ -697,6 +713,12 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this._super(view, node, id);
         this.template = "view_char";
     },
+    start: function () {
+        var self = this;
+        this.$element.find("tr[id="+ this.name+"] input").change(function() {
+            self.on_ui_change();
+        });
+    },
     set_value: function() {
         var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
@@ -705,6 +727,9 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
     },
     get_value: function(){
+        if (!this.dirty) {
+            return false;
+        }
         var self = this;
         var val= this.$element.find("tr[id="+this.name+"] input").val();
         if (val){
@@ -719,6 +744,12 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this._super(view, node, id);
         this.template = "view_selection";
     },
+    start: function () {
+        var self = this;
+        this.$element.find("tr[id="+ this.name+"] select").change(function() {
+            self.on_ui_change();
+        });
+    },
     set_value: function(value) {
         var self = this;
         var view_val = _.detect(this.node[0]['att_list'],function(res) {
@@ -734,6 +765,9 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         });
     },
     get_value: function(){
+        if (!this.dirty) {
+            return false;
+        }
         var self = this;
         var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
         if (val){
@@ -841,4 +875,4 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
     'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
 });
-};
+};
\ No newline at end of file

From 441f064ed943480cb752f0088e13713a1c5d6ec1 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 4 Nov 2011 17:52:34 +0530
Subject: [PATCH 020/114] [IMP]implement xml parsing in different way.

bzr revid: vme@tinyerp.com-20111104122234-jdestwpdnzuf7dsk
---
 addons/web/static/src/js/view_editor.js | 41 +++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index c26fecc062c..9cfc00444e4 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -56,7 +56,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         action_manager.appendTo(this.view_edit_dialog);
         action_manager.do_action(action);
     },
-
+    
     convert_tag_to_obj: function(xml, level) {
         var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""};
         var tag = xml.tagName.toLowerCase();
@@ -96,7 +96,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         _.each(children_list, function (child_node) {
             child_obj_list.push(self.convert_tag_to_obj(child_node,parents.length));
         });
-        if (children_list.length != 0) {
+        if (children_list.length) {
             if(parents.length <= parent_list.length) {parent_list.splice(parents.length - 1);}
             parent_list.push(parent_id);
             self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list);
@@ -147,6 +147,43 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         return parent_list;
     },
+
+        /*show_view_from_arch: function(arch) {
+            var xml_arch = QWeb.load_xml(arch);
+            rootNode = xml_arch.childNodes,
+            this.recursion_xml(rootNode);
+        },
+        recursion_xml : function(child){
+            var self = this;
+            var att_list = [];
+            _.each(child, function(node){
+               kk = _.each(node.attributes ,function(att){console.log(att.nodeName,att.node);});
+                ViewNode = {
+                    'level': 0,
+                    'id': 0,
+                    'attrs': att_list,
+                    'name': self.add_node_name(node),
+                },
+                self.recursion_xml(node.children);
+            });
+        },
+
+        add_node_name : function(node) {
+            if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
+                return (node.getAttribute('name'))?
+                    _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
+                    _.sprintf( "<%s>",node.tagName.toLowerCase());
+            }else if(node.tagName.toLowerCase() == "group"){
+                return (node.getAttribute('string'))?
+                    _.sprintf( "<%s>",node.getAttribute('string')):
+                    _.sprintf( "<%s>",node.tagName.toLowerCase());
+            }else{
+                return (node.getAttribute('string'))?
+                    _.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')):
+                    _.sprintf( "<%s>",node.tagName.toLowerCase());
+            }
+        },*/
+
     inherit_view : function(arch_object, result) {
         var self = this;
         var root = $(result.arch).filter('*');

From f657312f4d61fd4c628cee6fc1d49717931808de Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Fri, 4 Nov 2011 18:05:32 +0530
Subject: [PATCH 021/114] [IMP]Improved code by removing unnecessary code.

bzr revid: kch@tinyerp.com-20111104123532-dbwgkrqsid0aowlm
---
 addons/web/static/src/js/view_editor.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ae3995ff436..382a9342d64 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -609,22 +609,19 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
         self.edit_widget = [];
         _.each(properties,function(record){
-            var id = record;
+            var id = record,
+            type_widget;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                 if (_.include(widget,id)){
-                    var type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
+                    type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
                     self.edit_widget.push(type_widget);
-                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                    (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
-                    type_widget.start();
                 }else{
-                    var type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
+                    type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
                     self.edit_widget.push(type_widget);
-                    self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                    type_widget.set_value();
-                    type_widget.start();
                 }
-
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
+                type_widget.start();
             });
         });
     },

From 79f4bee7644e8b70fe7ba5169ea9ceb7ee0c22e0 Mon Sep 17 00:00:00 2001
From: Bogdan Stanciu <bogdanovidiu.stanciu@gmail.com>
Date: Sun, 6 Nov 2011 15:30:29 +0100
Subject: [PATCH 022/114] [IMP] created fr_CH.po file, as some translations are
 different from the standard

bzr revid: bogdanovidiu.stanciu@gmail.com-20111106143029-nf75df1y49t4q367
---
 addons/hr/i18n/fr_CH.po | 829 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 829 insertions(+)
 create mode 100644 addons/hr/i18n/fr_CH.po

diff --git a/addons/hr/i18n/fr_CH.po b/addons/hr/i18n/fr_CH.po
new file mode 100644
index 00000000000..e84289f6b17
--- /dev/null
+++ b/addons/hr/i18n/fr_CH.po
@@ -0,0 +1,829 @@
+# French (Switzerland) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <bogdanovidiu.stanciu@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15:13+0000\n"
+"PO-Revision-Date: 2011-11-06 15:15+0000\n"
+"Last-Translator: Bogdan Stanciu (bstanciu)\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-05 05:31+0000\n"
+"X-Generator: Launchpad (build 14231)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr "Utilisateur OpenERP"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr ""
+
+#. module: hr
+#: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"Job Positions are used to define jobs and their requirements. You can keep "
+"track of the number of employees you have per job position and how many you "
+"expect in the future. You can also attach a survey to a job position that "
+"will be used in the recruitment process to evaluate the applicants for this "
+"job position."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
+msgid "Department"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
+msgid "Married"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Department Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Employee Hierarchy"
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid ""
+"You can enhance the base HR Application by installing few HR-related "
+"functionalities."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
+msgid "Divorced"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
+msgid "Departments"
+msgstr ""
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr ""
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "No. AVS"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid ""
+"\n"
+"    Module for human resource management. You can manage:\n"
+"    * Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"    * HR Departments\n"
+"    * HR Jobs\n"
+"    "
+msgstr ""
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr ""
+
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
+msgid "Marital Status"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
+
+#. module: hr
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Current"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
+msgid "Single"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
+msgid "Employees"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "Numéro de sécurité sociale (AVS)"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure Your Human Resources Application"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
+msgid "Widower"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr ""

From c5576d9a0452ca2777e871cecaabdf21c6887ddc Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Nov 2011 10:41:37 +0530
Subject: [PATCH 023/114] [IMP] vieweditor :- give title of vieweditor dialog
 box.

bzr revid: ysa@tinyerp.com-20111108051137-8rr281wtwm1kvcas
---
 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 9e1cbf26072..cb37b4595e1 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -253,7 +253,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         this.edit_xml_dialog = new openerp.web.Dialog(this, {
             modal: true,
-            title: 'View Editor',
+            title: _.sprintf("View Editor %d - %s", self.main_view_id, self.model),
             width: 750,
             height: 500,
             buttons: {

From d8a2f16c434d1ebaf76d17187d1ca541b4b4b217 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 8 Nov 2011 12:14:01 +0530
Subject: [PATCH 024/114] [FIX]Fixed code for finding tag name from selecting
 tr in edit node.

bzr revid: kch@tinyerp.com-20111108064401-lfjvhm1ejbga2ch3
---
 addons/web/static/src/js/view_editor.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 382a9342d64..881dc5cfce9 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -382,18 +382,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-remove":
                     break;
                 case "side-edit":
-                    var tag, fld_name;
                     var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
-                    var tag_fld = tr.split(" ");
-                    if (tag_fld.length > 3){
-                        tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
-                        fld_name = tag_fld[2].split("=")[1].replace(/[^a-zA-Z _ 0-9]+/g,'');
-                    }else{
-                        tag = tag_fld[1].replace(/[^a-zA-Z 0-9]+/g,'');
-                        fld_name= tag;
-                    }
+                    var tag = _.detect(_.keys(_PROPERTIES),function(res){
+                        return _.includes(tr, res);
+                    });
                     var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties, fld_name, tr_id, one_object, view_id, view_xml_id, level);
+                    self.on_edit_node(properties, tr_id, one_object, view_id, view_xml_id, level);
                     break;
                 case "side-up":
                     while (1) {
@@ -579,7 +573,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties, fld_name, tr_id, obj, view_id, view_xml_id, level){
+    on_edit_node:function(properties, tr_id, obj, view_id, view_xml_id, level){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -606,8 +600,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog.start().open();
         var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
         var arch_val = self.get_view_object(tr_id,one_object,[]);
-        self.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
-        self.edit_widget = [];
+        this.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
+        this.edit_widget = [];
         _.each(properties,function(record){
             var id = record,
             type_widget;

From aa4cbf79578c4cdca993bf4a7eeabbf45960281e Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 8 Nov 2011 12:29:29 +0530
Subject: [PATCH 025/114] [IMP]converting jquery dom to string with use of
 qweb.

bzr revid: vme@tinyerp.com-20111108065929-gzghj6thxdhq5b4u
---
 addons/web/static/src/js/view_editor.js | 110 +++++++++++-------------
 1 file changed, 52 insertions(+), 58 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 9cfc00444e4..9281f9b6991 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -56,7 +56,22 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         action_manager.appendTo(this.view_edit_dialog);
         action_manager.do_action(action);
     },
-    
+    add_node_name : function(node) {
+        if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
+            return (node.getAttribute('name'))?
+                _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
+                _.sprintf( "<%s>",node.tagName.toLowerCase());
+        }else if(node.tagName.toLowerCase() == "group"){
+            return (node.getAttribute('string'))?
+                _.sprintf( "<%s>",node.getAttribute('string')):
+                _.sprintf( "<%s>",node.tagName.toLowerCase());
+        }else{
+            return (node.getAttribute('string'))?
+                _.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')):
+                _.sprintf( "<%s>",node.tagName.toLowerCase());
+        }
+    },
+
     convert_tag_to_obj: function(xml, level) {
         var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""};
         var tag = xml.tagName.toLowerCase();
@@ -107,7 +122,36 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return main_object;
     },
+/*  show_view_from_arch: function(arch) {
+        var xml_arch = QWeb.load_xml(arch);
+        rootNode = xml_arch.childNodes,
+        this.recursion_xml(rootNode);
+    },*/
+    recursion_xml : function(child){
+        var self = this;
+        _.each(child, function(node){
+            ViewNode = {
+                'level': ($(node).parents()).length + 1,
+                'id': this.xml_element_id++,
+                'attr_list': [],
+                'name': self.add_node_name(node),
+                'child_id': []
+            },
+            //console.log("nanananaa",QWeb.tools.xml_node_to_string(node));
+            ViewNode.attr_list.push(node.tagName.toLowerCase());
+            _.each(node.attributes ,function(att){
+               ViewNode.attr_list.push([att.nodeName,att.nodeValue]);
+           });
+            self.recursion_xml(node.children);
+        });
+    },
     parse_xml: function(arch, view_id) {
+        //========================
+        var xml_arch = QWeb.load_xml(arch);
+        rootNode = xml_arch.childNodes,
+        this.recursion_xml(rootNode);
+        //console.log(xml_arch);
+        // Parsing Other way
         var root = $(arch).filter(":first")[0];
         var tag = root.tagName.toLowerCase();
         var view_obj ={'child_id':[],'id':this.xml_element_id++,
@@ -148,41 +192,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         return parent_list;
     },
 
-        /*show_view_from_arch: function(arch) {
-            var xml_arch = QWeb.load_xml(arch);
-            rootNode = xml_arch.childNodes,
-            this.recursion_xml(rootNode);
-        },
-        recursion_xml : function(child){
-            var self = this;
-            var att_list = [];
-            _.each(child, function(node){
-               kk = _.each(node.attributes ,function(att){console.log(att.nodeName,att.node);});
-                ViewNode = {
-                    'level': 0,
-                    'id': 0,
-                    'attrs': att_list,
-                    'name': self.add_node_name(node),
-                },
-                self.recursion_xml(node.children);
-            });
-        },
-
-        add_node_name : function(node) {
-            if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
-                return (node.getAttribute('name'))?
-                    _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
-                    _.sprintf( "<%s>",node.tagName.toLowerCase());
-            }else if(node.tagName.toLowerCase() == "group"){
-                return (node.getAttribute('string'))?
-                    _.sprintf( "<%s>",node.getAttribute('string')):
-                    _.sprintf( "<%s>",node.tagName.toLowerCase());
-            }else{
-                return (node.getAttribute('string'))?
-                    _.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')):
-                    _.sprintf( "<%s>",node.tagName.toLowerCase());
-            }
-        },*/
 
     inherit_view : function(arch_object, result) {
         var self = this;
@@ -472,15 +481,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     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) {
-                    });
-                }
+                var convert_to_utf = QWeb.tools.xml_node_to_string(parent);
+                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){
@@ -489,19 +496,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         }
     },
-    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-']");

From 4c9aade99ebbafb9a231ac8b1c403a4b5648d8e0 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 8 Nov 2011 14:49:12 +0530
Subject: [PATCH 026/114] [FIX]Remove unnecessary changes in view_form.js.

bzr revid: kch@tinyerp.com-20111108091912-4j1uog22h7p7p20m
---
 addons/web/static/src/js/view_form.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a2f7a89ff80..ac96ea27f1f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1169,7 +1169,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
     },
     update_dom: function() {
         this._super.apply(this, arguments);
-       /* if (this.field.translate) {
+        if (this.field.translate) {
             this.$element.find('.oe_field_translate').toggle(!!this.view.datarecord.id);
         }
         if (!this.disable_utility_classes) {
@@ -1178,7 +1178,7 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
             if (this.view.show_invalid) {
                 this.$element.toggleClass('invalid', !this.is_valid());
             }
-        }*/
+        }
     },
     on_ui_change: function() {
         this.dirty = this.view.dirty_for_user = true;
@@ -1979,7 +1979,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
     },
     load_views: function() {
         var self = this;
-        
+
         var modes = this.node.attrs.mode;
         modes = !!modes ? modes.split(",") : ["tree"];
         var views = [];
@@ -2004,7 +2004,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
             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',
@@ -2281,7 +2281,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.Field.extend({
         this.dataset.on_unlink.add_last(function(ids) {
             self.on_ui_change();
         });
-        
+
         this.is_setted.then(function() {
             self.load_view();
         });

From 8fa095ad1812e3b08e1832a6439deea33ff2efae Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 8 Nov 2011 16:52:45 +0530
Subject: [PATCH 027/114] [imp]parsing xml successfully with qweb.

bzr revid: vme@tinyerp.com-20111108112245-fc7fk14tksgqjtbv
---
 addons/web/static/src/js/view_editor.js | 135 ++++++++++--------------
 1 file changed, 54 insertions(+), 81 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 9281f9b6991..0224056ee86 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -44,7 +44,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 //to do
             },
             "Edit": function(){
-                self.xml_element_id=0;
+                self.xml_element_id = 0;
                 self.get_arch();
             },
             "Close": function(){
@@ -56,6 +56,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         action_manager.appendTo(this.view_edit_dialog);
         action_manager.do_action(action);
     },
+
     add_node_name : function(node) {
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
             return (node.getAttribute('name'))?
@@ -72,98 +73,70 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
     },
 
-    convert_tag_to_obj: function(xml, level) {
-        var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""};
-        var tag = xml.tagName.toLowerCase();
-        obj.att_list.push(tag);
-        obj.name = "<"+ tag
-        $(xml).each(function() {
-            _.each(this.attributes, function(attrs){
-            if (tag != 'button' && tag != 'field') {
-                if (attrs.nodeName == "string" ) {
-                obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;}
-            } else {
-                if (attrs.nodeName == "name") {
-                obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';}
-            }
-            obj.att_list.push( [attrs.nodeName,attrs.nodeValue] );
-            });
-        obj.name+= ">";
-        });
-        return obj;
-    },
-
-    append_child_object: function(val, parent_list, child_obj_list) {
+    create_View_Node: function(node){
         var self = this;
-        if (val.child_id.length != 0) {
-            _.each(val.child_id, function(val) {
-                (val.id == parent_list[0])?
-                    self.append_child_object( val, parent_list.slice(1), child_obj_list) : false;
-            });
-        } else { val.child_id = child_obj_list; }
+        ViewNode = {
+            'level': ($(node).parents()).length + 1,
+            'id': self.xml_element_id += 1,
+            'att_list': [],
+            'name': self.add_node_name(node),
+            'child_id': []
+        }
+        ViewNode.att_list.push(node.tagName.toLowerCase());
+        _.each(node.attributes ,function(att){
+           ViewNode.att_list.push([att.nodeName,att.nodeValue]);
+       });
+        return ViewNode;
     },
 
-    convert_arch_to_obj: function(xml, parent_list, parent_id, main_object){
+    append_child_object: function(main_object, parent_id, child_obj_list) {
+        var self = this;
+        if(parent_id){
+            if(main_object.id == parent_id){
+                main_object.child_id = child_obj_list;
+                return main_object;
+            }else{
+                _.each(main_object.child_id ,function(child_object){
+                    self.append_child_object(child_object, parent_id, child_obj_list);
+                });
+            }
+        }
+       
+    },
+
+    convert_arch_to_obj: function(xml_Node, main_object, parent_id){
         var self = this;
         var child_obj_list = [];
-        var children_list = $(xml).children();
-        var parents = $(children_list[0]).parents().get();
-        _.each(children_list, function (child_node) {
-            child_obj_list.push(self.convert_tag_to_obj(child_node,parents.length));
+        _.each(xml_Node,function(element){
+           child_obj_list.push(self.create_View_Node(element)) ;
+        });
+        this.append_child_object(main_object, parent_id, child_obj_list);
+        var obj_xml_list = _.zip(xml_Node,child_obj_list);
+        _.each(obj_xml_list, function(node){
+            if(node[0].children.length != 0){
+            self.convert_arch_to_obj(node[0].children, main_object, node[1].id);}
         });
-        if (children_list.length) {
-            if(parents.length <= parent_list.length) {parent_list.splice(parents.length - 1);}
-            parent_list.push(parent_id);
-            self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list);
-        }
-        for (var i=0; i<children_list.length; i++) {
-            self.convert_arch_to_obj
-            (children_list[i], parent_list, child_obj_list[i].id, main_object);
-        }
         return main_object;
     },
-/*  show_view_from_arch: function(arch) {
-        var xml_arch = QWeb.load_xml(arch);
-        rootNode = xml_arch.childNodes,
-        this.recursion_xml(rootNode);
-    },*/
-    recursion_xml : function(child){
-        var self = this;
-        _.each(child, function(node){
-            ViewNode = {
-                'level': ($(node).parents()).length + 1,
-                'id': this.xml_element_id++,
-                'attr_list': [],
-                'name': self.add_node_name(node),
-                'child_id': []
-            },
-            //console.log("nanananaa",QWeb.tools.xml_node_to_string(node));
-            ViewNode.attr_list.push(node.tagName.toLowerCase());
-            _.each(node.attributes ,function(att){
-               ViewNode.attr_list.push([att.nodeName,att.nodeValue]);
-           });
-            self.recursion_xml(node.children);
-        });
-    },
+
     parse_xml: function(arch, view_id) {
-        //========================
+        main_object = {
+            'level': 0,
+            'id': this.xml_element_id +=1,
+            'att_list': [],
+            'name': _.sprintf("<view view_id = %s>", view_id),
+            'child_id': []
+        };
         var xml_arch = QWeb.load_xml(arch);
-        rootNode = xml_arch.childNodes,
-        this.recursion_xml(rootNode);
-        //console.log(xml_arch);
-        // Parsing Other way
-        var root = $(arch).filter(":first")[0];
-        var tag = root.tagName.toLowerCase();
-        var view_obj ={'child_id':[],'id':this.xml_element_id++,
-            'level':0,'att_list':[],'name':"<view view_id='"+view_id+"'>"};
-        var root_object = this.convert_tag_to_obj(root,0);
-        view_obj.child_id = this.convert_arch_to_obj(arch, [], this.xml_element_id, [root_object], []);
-        return [view_obj];
+        return [this.convert_arch_to_obj(xml_arch.childNodes, main_object, this.xml_element_id)];
     },
+
     get_arch: 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');
+        self.main_view_id =
+        ((this.view_edit_dialog.$element.find("input[name='radiogroup']:checked").parent()).parent()).attr('data-id');
+        console.log("i like that",this.view_editor.dataset);
         var ve_dataset = new openerp.web.DataSet(this, 'ir.ui.view');
         ve_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function (arch) {
             var arch_object = self.parse_xml(arch[0].arch,self.main_view_id);
@@ -173,7 +146,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             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(arch_object, res);
+                    //self.inherit_view(arch_object, res);
                 });
                 return self.edit_view({"main_object": arch_object,
                          "parent_child_id": self.parent_child_list(arch_object, []),
@@ -192,7 +165,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         return parent_list;
     },
 
-
     inherit_view : function(arch_object, result) {
         var self = this;
         var root = $(result.arch).filter('*');
@@ -310,6 +282,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
             }
         });
+        console.log("finallly",one_object['main_object']);
         this.edit_xml_dialog.start().open();
         this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {
             'data': one_object['main_object'],

From 0658a41309d713a91e91db5c4360762efe838e84 Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Tue, 8 Nov 2011 16:59:10 +0530
Subject: [PATCH 028/114] [IMP]Improved code as par review.

bzr revid: kch@tinyerp.com-20111108112910-p177yz5g4lfcorg1
---
 addons/web/static/src/js/view_editor.js | 218 ++++++++++--------------
 addons/web/static/src/xml/base.xml      |   6 +-
 2 files changed, 92 insertions(+), 132 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 9814bb81e0f..edadbe005b0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -22,31 +22,31 @@ var _PROPERTIES = {
     'view' : [],
 };
 var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
-'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
-'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
-'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
-'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
-'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
-'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
-'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
-'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
-'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
-'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
-'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
-'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
-'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
-'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
-'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
-'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
-'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
-'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
-'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
-'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
-'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
-'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
-'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
-'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
-'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph',
+            'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
+            'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
+            'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
+            'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
+            'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
+            'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
+            'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
+            'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
+            'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
+            'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
+            'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
+            'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
+            'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
+            'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
+            'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
+            'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
+            'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
+            'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
+            'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
+            'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
+            'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
+            'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
+            'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
+            'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
+            'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
 ];
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
@@ -162,7 +162,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             child_obj_list.push(self.convert_tag_to_obj(child_node, parents.length));
         });
         if (children_list.length != 0) {
-            if(parents.length <= parent_list.length) { parent_list.splice(parents.length - 1);}
+            if (parents.length <= parent_list.length) { parent_list.splice(parents.length - 1);}
             parent_list.push(parent_id);
             self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list);
         }
@@ -284,8 +284,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     obj.child_id.push(xpath_arch_object[0]);
                     xpath_arch_object.pop();
                 }
-            }
-            else {
+            } else {
                 _.each(arch_object, function(element) {
                     self.inherit_apply(expr_list, element.child_id, xpath_arch_object);
                 });
@@ -363,7 +362,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             var view_find = side;
             while (1) {
                 view_find = view_find.prev();
-                if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
+                if ((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
                         && parseInt(view_find.attr('level')) < clicked_tr_level) {
                     view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
                     view_xml_id = (view_find.attr('id')).split('-')[1];
@@ -426,10 +425,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             cur_tr = next_tr;
                         }
                    }
-                }
-                else {
+                } else {
                     last_tr = cur_tr.next();
                 }
+
                 if ((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1) {
                     return;
                 }
@@ -470,7 +469,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 if (insert.length == check_list.length ) {return xml_child;}
             });
         }
-        return self.save_arch(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(clicked_tr_level),
+        return self.do_save_xml(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(clicked_tr_level),
                         parseInt(view_id), arch, move_direct, update_values);
     },
     get_object_by_id: function(view_xml_id, one_object, result) {
@@ -486,7 +485,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return result;
     },
-    save_arch: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){
+    do_save_xml: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){
         var self = this;
         var children_list =  $(arch1).children();
         var list_obj_xml = _.zip(children_list,obj.child_id);
@@ -500,12 +499,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     $(next).after(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
-                }else if(move_direct == "up"){
+                } else if (move_direct == "up") {
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
-                }else if(move_direct == "update_node"){
+                } else if (move_direct == "update_node") {
                     _.each(update_values, function(val){
                         $(arch1).attr(val[0],val[1]);
                     });
@@ -528,7 +527,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
-                    self.save_arch(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values);
+                    self.do_save_xml(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values);
                 });
             }
         }
@@ -575,7 +574,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             modal: true,
             title: 'Properties',
             width: 650,
-            height: 200,
+            height: 400,
             buttons: {
                     "Update": function(){
                         var update_values = [];
@@ -594,7 +593,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
         });
         this.edit_node_dialog.start().open();
-        var widget = ['readonly','required','nolabel','completion','widget','groups','position','icon','align','special','type','target'];
+        var widget = _.keys(self.property.map);
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'],[]);
         this.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
         this.edit_widget = [];
@@ -605,12 +604,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 if (_.include(widget,id)){
                     type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
                     self.edit_widget.push(type_widget);
-                }else{
+                } else {
                     type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
                     self.edit_widget.push(type_widget);
                 }
-                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr id="'+id+'"><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                (id=='groups')?type_widget.set_value(self.groups):type_widget.set_value();
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                var view_val = _.detect(arch_val[0]['att_list'],function(res) {
+                    return _.include(res, id);
+                });
+                var value = null;
+                (id=='groups')?type_widget.set_value(self.groups,view_val):type_widget.set_value(value,view_val);
                 type_widget.start();
             });
         });
@@ -659,7 +662,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     on_ui_change: function() {
         this.dirty = true;
     },
-    render: function () {
+    render: function() {
         return QWeb.render(this.template, {widget: this});
     },
 });
@@ -668,31 +671,24 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this._super(view, node, id);
         this.template = "view_boolean";
     },
-    start: function () {
+    start: function() {
         var self = this;
-        this.$element.find("tr[id="+ self.name+"] input").change(function() {
+        this.$element.find("input[id="+ self.name+"]").change(function() {
             self.on_ui_change();
         });
     },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,self.name);
-        });
-        if(view_val){
-            this.$element.find("tr[id="+ self.name+"] input").attr('checked', view_val[1]);
+        if (view_val) {
+            this.$element.find("input[id="+ self.name+"]").attr('checked', view_val[1]);
         }
     },
-    get_value: function(){
+    get_value: function() {
         if (!this.dirty) {
             return false;
         }
-        var val = this.$element.find("tr[id="+this.name+"] input").is(':checked');
-        if (val){
-            return [this.name,val];
-        }else{
-            return [this.name,null];
-        }
+        var val = this.$element.find("input[id="+this.name+"]").is(':checked');
+        return val ? [this.name,val] : [this.name,null];
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -702,28 +698,21 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
     },
     start: function () {
         var self = this;
-        this.$element.find("tr[id="+ this.name+"] input").change(function() {
+        this.$element.find("input[id="+ this.name+"]").change(function() {
             self.on_ui_change();
         });
     },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res, self.name);
-        });
-        view_val ? this.$element.find("tr[id="+self.name +"] input").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
+        view_val ? this.$element.find("input[id="+self.name+"]").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
     },
-    get_value: function(){
+    get_value: function() {
         if (!this.dirty) {
             return false;
         }
         var self = this;
-        var val= this.$element.find("tr[id="+this.name+"] input").val();
-        if (val){
-            return [this.name,val];
-        }else{
-            return [this.name,""];
-        }
+        var val= this.$element.find("input[id="+this.name+"]").val();
+        return val ? [this.name,val] : [this.name,""];
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
@@ -733,35 +722,28 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     },
     start: function () {
         var self = this;
-        this.$element.find("tr[id="+ this.name+"] select").change(function() {
+        this.$element.find("select[id="+this.name+"]").change(function() {
             self.on_ui_change();
         });
     },
-    set_value: function(value) {
+    set_value: function(value, view_val) {
         var self = this;
-        var view_val = _.detect(this.node[0]['att_list'],function(res) {
-            return _.include(res,self.name);
-        });
         _.each(value, function(item) {
             var select_val = view_val?(view_val[1]==((typeof(item)=='string')?item:item[0])?true:false):false;
-            self.$element.find("tr[id="+self.name+"] select").append($("<option/>", {
+            self.$element.find("select[id="+self.name+"]").append($("<option/>", {
                     value:(typeof(item)=='string')?item:item[0],
                     text:(typeof(item)=='string')?item:item[1],
                     selected:select_val
             }));
         });
     },
-    get_value: function(){
+    get_value: function() {
         if (!this.dirty) {
             return false;
         }
         var self = this;
-        var val = this.$element.find("tr[id="+this.name+"] select").find("option:selected").val();
-        if (val){
-            return [this.name,val];
-        }else{
-            return [this.name,""];
-        }
+        var val = this.$element.find("select[id="+this.name+"]").find("option:selected").val();
+        return  val ? [this.name,val] : [this.name,""];
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -769,83 +751,61 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         this._super(view, node, id);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self= this;
-        var value = _.keys(this.registry.map);
+        value = _.keys(this.registry.map);
         value.push('');
         value.sort();
-        this._super.apply(this,[value]);
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = icons;
-        this._super.apply(this,[value]);
+        value = icons;
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['new','New Window']];
-        this._super.apply(this,[value]);
+        value = [['',''],['new','New Window']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        this._super.apply(this,[value]);
+        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        this._super.apply(this,[value]);
+        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        this._super.apply(this,[value]);
+        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function() {
+    set_value: function(value,view_val) {
         var self = this;
-        var value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        this._super.apply(this,[value]);
+        value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        this._super.apply(this,[value,view_val]);
     }
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-    },
-    set_value: function(value) {
+    set_value: function(value,view_val) {
         var self = this;
-        this.$element.find("tr[id="+ this.name +"] select").attr('multiple', true);
-        this.$element.find("tr[id="+ this.name +"] select").css('height','100px');
-        this._super.apply(this,[value]);
+        this.$element.find("select[id="+ this.name +"]").attr('multiple', true).css('height','100px');
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 648dc3a9f1d..cac02286fca 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1331,14 +1331,14 @@
     </t>
 </tr>
 <t t-name="view_char">
-    <input type="text" class="field_char" size="50"/>
+    <input type="text" t-att-id="widget.name" class="field_char" size="50"/>
 </t>
 <t t-name="view_selection">
-    <select style="width:366px">
+    <select style="width:366px" t-att-id="widget.name">
     </select>
 </t>
 <t t-name="view_boolean">
-    <input type="checkbox"/>
+    <input type="checkbox" t-att-id="widget.name"/>
 </t>
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>

From d7213de31586286c445221fb613f7cde7fb456e5 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Nov 2011 18:33:27 +0530
Subject: [PATCH 029/114] [IMP] Vieweditor:- improve xml of edit node view
 editor and init method of widget class

bzr revid: ysa@tinyerp.com-20111108130327-iozuye9ll7tgb2pq
---
 addons/web/static/src/js/view_editor.js | 23 +++++++----------------
 addons/web/static/src/xml/base.xml      |  9 ++++-----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index edadbe005b0..ba9f8be56bb 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -573,7 +573,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
-            width: 650,
+            width: 500,
             height: 400,
             buttons: {
                     "Update": function(){
@@ -595,7 +595,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog.start().open();
         var widget = _.keys(self.property.map);
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'],[]);
-        this.edit_node_dialog.$element.append('<table id="rec_table" class="oe_forms"></table>');
+        this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
         _.each(properties,function(record){
             var id = record,
@@ -667,10 +667,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     },
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-        this.template = "view_boolean";
-    },
+    template : "vieweditor_boolean",
     start: function() {
         var self = this;
         this.$element.find("input[id="+ self.name+"]").change(function() {
@@ -692,13 +689,10 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-        this.template = "view_char";
-    },
+    template : "vieweditor_char",
     start: function () {
         var self = this;
-        this.$element.find("input[id="+ this.name+"]").change(function() {
+        this.$element.find("input[id="+ this.name+"]").css('width','100%').change(function() {
             self.on_ui_change();
         });
     },
@@ -716,13 +710,10 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
-        this.template = "view_selection";
-    },
+    template : "vieweditor_selection",
     start: function () {
         var self = this;
-        this.$element.find("select[id="+this.name+"]").change(function() {
+        this.$element.find("select[id="+ this.name +"]").css('width','100%').change(function() {
             self.on_ui_change();
         });
     },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cac02286fca..a0d8921d1b7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1330,14 +1330,13 @@
         <t t-call="view_editor.row"/>
     </t>
 </tr>
-<t t-name="view_char">
+<t t-name="vieweditor_char">
     <input type="text" t-att-id="widget.name" class="field_char" size="50"/>
 </t>
-<t t-name="view_selection">
-    <select style="width:366px" t-att-id="widget.name">
-    </select>
+<t t-name="vieweditor_selection">
+    <select t-att-id="widget.name"/>
 </t>
-<t t-name="view_boolean">
+<t t-name="vieweditor_boolean">
     <input type="checkbox" t-att-id="widget.name"/>
 </t>
 <t t-name="ExportView">

From bd210bf9d0aa1ddacb3cdf008e4467dc6f282787 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Nov 2011 18:59:43 +0530
Subject: [PATCH 030/114] [IMP] vieweditor:- code refactor.

bzr revid: ysa@tinyerp.com-20111108132943-0wcjjnjfrsx5l0of
---
 addons/web/static/src/js/view_editor.js | 191 +++++++++++-------------
 1 file changed, 89 insertions(+), 102 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ba9f8be56bb..57b0daffec7 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,53 +1,4 @@
 openerp.web.view_editor = function(openerp) {
-var _PROPERTIES = {
-    'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'widget', 'eval', 'ref', 'on_change', 'groups', 'attrs'],
-    'form' : ['string', 'col', 'link'],
-    'notebook' : ['colspan', 'position', 'groups'],
-    'page' : ['string', 'states', 'attrs', 'groups'],
-    'group' : ['string', 'col', 'colspan', 'states', 'attrs', 'groups'],
-    'image' : ['filename', 'width', 'height', 'groups'],
-    'separator' : ['string', 'colspan', 'groups'],
-    'label': ['string', 'align', 'colspan', 'groups'],
-    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
-    'newline' : [],
-    'hpaned': ['position', 'groups'],
-    'vpaned': ['position', 'groups'],
-    'child1' : ['groups'],
-    'child2' : ['groups'],
-    'action' : ['name', 'string', 'colspan', 'groups'],
-    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'],
-    'graph' : ['string', 'type'],
-    'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
-    'view' : [],
-};
-var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
-            'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
-            'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
-            'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
-            'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
-            'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
-            'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
-            'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
-            'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
-            'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
-            'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
-            'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
-            'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
-            'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
-            'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
-            'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
-            'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
-            'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
-            'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
-            'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
-            'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
-            'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
-            'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
-            'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
-            'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
-            'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
-];
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
@@ -578,7 +529,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             buttons: {
                     "Update": function(){
                         var update_values = [];
-                        _.each(self.edit_widget,function(widget){
+                        _.each(self.edit_widget, function(widget) {
                             var value = widget.get_value();
                             if (value) {
                                 update_values.push(value);
@@ -594,26 +545,25 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         this.edit_node_dialog.start().open();
         var widget = _.keys(self.property.map);
-        var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'],[]);
+        var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
-        _.each(properties,function(record){
+        _.each(properties, function(record) {
             var id = record,
             type_widget;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                 if (_.include(widget,id)){
                     type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
-                    self.edit_widget.push(type_widget);
                 } else {
                     type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
-                    self.edit_widget.push(type_widget);
                 }
+                self.edit_widget.push(type_widget);
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
                 var view_val = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, id);
                 });
                 var value = null;
-                (id=='groups')?type_widget.set_value(self.groups,view_val):type_widget.set_value(value,view_val);
+                id == 'groups'? type_widget.set_value(self.groups, view_val): type_widget.set_value(value, view_val);
                 type_widget.start();
             });
         });
@@ -622,7 +572,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     on_groups: function(id){
         var self = this,
         def = $.Deferred();
-        if (id !='groups') {
+        if (id != 'groups') {
             self.groups = false;
             return false;
         }
@@ -632,7 +582,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
             model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
             res_groups
-            .read_slice([],{})
+            .read_slice([], {})
             .done(function(res_grp) {
                 _.each(res_grp,function(res){
                     var key = res.id;
@@ -675,17 +625,17 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         });
     },
     set_value: function(value,view_val) {
-        var self = this;
+        console.log("self.edit_widget.push(type_widget);:::::::",view_val, view);
         if (view_val) {
-            this.$element.find("input[id="+ self.name+"]").attr('checked', view_val[1]);
+            this.$element.find("input[id=" + self.name+ "]").attr('checked', view_val[1]);
         }
     },
     get_value: function() {
         if (!this.dirty) {
             return false;
         }
-        var val = this.$element.find("input[id="+this.name+"]").is(':checked');
-        return val ? [this.name,val] : [this.name,null];
+        var value = this.$element.find("input[id=" + this.name + "]").is(':checked');
+        return value ? [this.name, value] : [this.name, null];
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -697,33 +647,31 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         });
     },
     set_value: function(value,view_val) {
-        var self = this;
-        view_val ? this.$element.find("input[id="+self.name+"]").val(view_val[1]): this.$element.find("tr[id="+self.name+"] input").val();
+        view_val ? this.$element.find("input[id=" + this.name + "]").val(view_val[1]): this.$element.find("tr[id=" + this.name + "] input").val();
     },
     get_value: function() {
         if (!this.dirty) {
             return false;
         }
-        var self = this;
-        var val= this.$element.find("input[id="+this.name+"]").val();
-        return val ? [this.name,val] : [this.name,""];
+        var value= this.$element.find("input[id=" + this.name + "]").val();
+        return value ? [this.name, value] : [this.name, ""];
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     template : "vieweditor_selection",
     start: function () {
         var self = this;
-        this.$element.find("select[id="+ this.name +"]").css('width','100%').change(function() {
+        this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
         });
     },
     set_value: function(value, view_val) {
         var self = this;
         _.each(value, function(item) {
-            var select_val = view_val?(view_val[1]==((typeof(item)=='string')?item:item[0])?true:false):false;
-            self.$element.find("select[id="+self.name+"]").append($("<option/>", {
-                    value:(typeof(item)=='string')?item:item[0],
-                    text:(typeof(item)=='string')?item:item[1],
+            var select_val = view_val? (view_val[1] == ((typeof(item) == 'string')? item:item[0])?true: false): false;
+            self.$element.find("select[id=" + self.name + "]").append($("<option/>", {
+                    value: (typeof(item) == 'string') ? item: item[0],
+                    text: (typeof(item) == 'string')? item: item[1],
                     selected:select_val
             }));
         });
@@ -732,9 +680,8 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         if (!this.dirty) {
             return false;
         }
-        var self = this;
-        var val = this.$element.find("select[id="+this.name+"]").find("option:selected").val();
-        return  val ? [this.name,val] : [this.name,""];
+        var value = this.$element.find("select[id=" + this.name + "]").find("option:selected").val();
+        return  value ? [this.name, value] : [this.name, ""];
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -742,63 +689,103 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         this._super(view, node, id);
         this.registry = openerp.web.form.widgets;
     },
-    set_value: function(value,view_val) {
-        var self= this;
+    set_value: function(value, view_val) {
         value = _.keys(this.registry.map);
         value.push('');
         value.sort();
-        this._super.apply(this,[value,view_val]);
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = icons;
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        this._super.apply(this,[icons, view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['new','New Window']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['', ''], ['new', 'New Window']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['0.0','Left'], ['0.5','Center'], ['1.0','Right']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
-        value = [['',''],['save','Save Button'], ['cancel','Cancel Button'], ['open','Open Button']];
-        this._super.apply(this,[value,view_val]);
+    set_value: function(value, view_val) {
+        value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
+    set_value: function(value, view_val) {
         value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        this._super.apply(this,[value,view_val]);
+        this._super.apply(this,[value, view_val]);
     }
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value,view_val) {
-        var self = this;
+    set_value: function(value, view_val) {
         this.$element.find("select[id="+ this.name +"]").attr('multiple', true).css('height','100px');
         this._super.apply(this,[value, view_val]);
     }
 });
+var _PROPERTIES = {
+    'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
+               'colspan', 'widget', 'eval', 'ref', 'on_change', 'groups', 'attrs'],
+    'form' : ['string', 'col', 'link'],
+    'notebook' : ['colspan', 'position', 'groups'],
+    'page' : ['string', 'states', 'attrs', 'groups'],
+    'group' : ['string', 'col', 'colspan', 'states', 'attrs', 'groups'],
+    'image' : ['filename', 'width', 'height', 'groups'],
+    'separator' : ['string', 'colspan', 'groups'],
+    'label': ['string', 'align', 'colspan', 'groups'],
+    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
+    'newline' : [],
+    'hpaned': ['position', 'groups'],
+    'vpaned': ['position', 'groups'],
+    'child1' : ['groups'],
+    'child2' : ['groups'],
+    'action' : ['name', 'string', 'colspan', 'groups'],
+    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'],
+    'graph' : ['string', 'type'],
+    'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
+    'view' : [],
+};
+var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
+            'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
+            'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
+            'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',
+            'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT',
+            'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE',
+            'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM',
+            'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK',
+            'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK',
+            'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC',
+            'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL',
+            'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD',
+            'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY',
+            'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND',
+            'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW',
+            'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES',
+            'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT',
+            'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED',
+            'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT',
+            'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK',
+            'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE',
+            'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100',
+            'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT',
+            'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase',
+            'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
+            'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
+];
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'required' : 'openerp.web.ViewEditor.FieldBoolean',
     'readonly' : 'openerp.web.ViewEditor.FieldBoolean',

From 5c073850ee307fbbaa2645ba974626280ff1a5a6 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 9 Nov 2011 10:24:22 +0530
Subject: [PATCH 031/114] [FIX] vieweditor :- fix problem in boolean widget.

bzr revid: ysa@tinyerp.com-20111109045422-8940v0i4pap8runc
---
 addons/web/static/src/js/view_editor.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 57b0daffec7..d690057db91 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -625,9 +625,8 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         });
     },
     set_value: function(value,view_val) {
-        console.log("self.edit_widget.push(type_widget);:::::::",view_val, view);
         if (view_val) {
-            this.$element.find("input[id=" + self.name+ "]").attr('checked', view_val[1]);
+            this.$element.find("input[id=" + this.name+ "]").attr('checked', view_val[1]);
         }
     },
     get_value: function() {

From 3d2081a7ccbf0c9ad4b69bbe9ea99cacdf7a1109 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 9 Nov 2011 11:27:38 +0530
Subject: [PATCH 032/114] [IMP]some changes.

bzr revid: vme@tinyerp.com-20111109055738-o6k9g1cuqy3c0kq5
---
 addons/web/static/src/js/view_editor.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ce773972f0c..49f9210b924 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -409,12 +409,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;});
         var obj = self.get_object_by_id(view_xml_id, one_object['main_object'], []);
          //for finding xpath tag from inherit view
-        if (($(arch.arch).filter("data")).length != 0 && view_xml_id != 0) {
+        var xml_arch = QWeb.load_xml(arch.arch);
+        if (xml_arch.childNodes[0].tagName == "data") {
             var check_list = _.flatten(obj[0].child_id[0].att_list);
-            arch.arch = _.detect($(arch.arch).children(), function(xml_child){
-                var temp_obj = self.convert_tag_to_obj(xml_child);
-                var main_list = _.flatten(temp_obj.att_list);
-                var insert = _.intersection(main_list,_.uniq(check_list));
+            arch.arch = _.detect(xml_arch.childNodes[0].children, function(xml_child){
+                var temp_obj = self.create_View_Node(xml_child);
+                var insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
                 if (insert.length == check_list.length ) {return xml_child;}
             });
         }
@@ -435,6 +435,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return result;
     },
+
     save_arch: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){
         var self = this;
         var children_list =  $(arch1).children();
@@ -467,7 +468,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             }
         }
-    },
+    }, 
     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-']");

From beb3aa9fbb43b430c45c066f11f1c406e6c66ecd Mon Sep 17 00:00:00 2001
From: "Kunal Chavda (OpenERP)" <kch@tinyerp.com>
Date: Wed, 9 Nov 2011 11:37:47 +0530
Subject: [PATCH 033/114] [IMP]Implement code for selecting multiple value in
 selection box.

bzr revid: kch@tinyerp.com-20111109060747-c34p3r5ablk56w24
---
 addons/web/static/src/js/view_editor.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d690057db91..b2b6b07324c 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -679,7 +679,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         if (!this.dirty) {
             return false;
         }
-        var value = this.$element.find("select[id=" + this.name + "]").find("option:selected").val();
+        var value = this.$element.find("select[id=" + this.name + "]").val();
         return  value ? [this.name, value] : [this.name, ""];
     }
 });
@@ -732,8 +732,18 @@ openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.ext
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
     set_value: function(value, view_val) {
+        var self = this;
         this.$element.find("select[id="+ this.name +"]").attr('multiple', true).css('height','100px');
-        this._super.apply(this,[value, view_val]);
+        var selected_val, sel_val;
+        view_val ? selected_val=view_val[1].split(',') : selected_val = null;
+        _.each(value, function(item) {
+            _.include(selected_val,item[0])?sel_val=true:sel_val=false;
+            self.$element.find("select[id="+self.name+"]").append($("<option/>", {
+                value : item[0],
+                text : item[1],
+                selected:sel_val
+            }));
+         });
     }
 });
 var _PROPERTIES = {

From 4d2ed09ca5e1995e90147e7079bda41bced8d399 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 9 Nov 2011 12:16:36 +0530
Subject: [PATCH 034/114] [imp]removed console statement.

bzr revid: vme@tinyerp.com-20111109064636-yv9q5636k562v2fj
---
 addons/web/static/src/js/view_editor.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f9c6c7214b9..21246f6bd6c 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -417,9 +417,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     do_save_update_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, move_direct, update_values) {
         var self = this;
         var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;});
-        console.log(arch);
         var obj = self.get_object_by_id(view_xml_id, one_object['main_object'], []);
-        console.log(obj);
          //for finding xpath tag from inherit view
         var xml_arch = QWeb.load_xml(arch.arch);
         if (xml_arch.childNodes[0].tagName == "data") {

From 5e3a533f39f7783c4b3d29c0453601c2f0c48a75 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 9 Nov 2011 13:22:06 +0530
Subject: [PATCH 035/114] [IMP] vieweditor :- improve code in edit widget
 class.

bzr revid: ysa@tinyerp.com-20111109075206-s2k6s8t9n8ik1qu3
---
 addons/web/static/src/js/view_editor.js | 124 ++++++++++++------------
 addons/web/static/src/xml/base.xml      |   9 +-
 2 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index b2b6b07324c..78efb3055a4 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -557,14 +557,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 } else {
                     type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
                 }
-                self.edit_widget.push(type_widget);
-                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
-                var view_val = _.detect(arch_val[0]['att_list'],function(res) {
+                var value = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, id);
                 });
-                var value = null;
-                id == 'groups'? type_widget.set_value(self.groups, view_val): type_widget.set_value(value, view_val);
+                if (id == 'groups') type_widget.value = self.groups;
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
                 type_widget.start();
+                type_widget.set_value(value)
+                self.edit_widget.push(type_widget);
             });
         });
     },
@@ -593,7 +593,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]})
                 .done(function(model_grp) {
                     _.each(model_grp,function(res_group){
-                        groups.push([res_group.name,group_names[res_group.res_id]]);
+                        groups.push([res_group.module + "." + res_group.name,group_names[res_group.res_id]]);
                     });
                     self.groups = groups;
                     def.resolve();
@@ -608,6 +608,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.node = node;
         this.dirty = false;
         this.name = id;
+        this.value = undefined;
     },
     on_ui_change: function() {
         this.dirty = true;
@@ -624,9 +625,9 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
             self.on_ui_change();
         });
     },
-    set_value: function(value,view_val) {
-        if (view_val) {
-            this.$element.find("input[id=" + this.name+ "]").attr('checked', view_val[1]);
+    set_value: function(value) {
+        if (value) {
+            this.$element.find("input[id=" + this.name+ "]").attr('checked', value[1]);
         }
     },
     get_value: function() {
@@ -645,8 +646,8 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
             self.on_ui_change();
         });
     },
-    set_value: function(value,view_val) {
-        view_val ? this.$element.find("input[id=" + this.name + "]").val(view_val[1]): this.$element.find("tr[id=" + this.name + "] input").val();
+    set_value: function(value) {
+        value ? this.$element.find("input[id=" + this.name + "]").val(value[1]): this.$element.find("tr[id=" + this.name + "] input").val();
     },
     get_value: function() {
         if (!this.dirty) {
@@ -664,16 +665,14 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
             self.on_ui_change();
         });
     },
-    set_value: function(value, view_val) {
-        var self = this;
-        _.each(value, function(item) {
-            var select_val = view_val? (view_val[1] == ((typeof(item) == 'string')? item:item[0])?true: false): false;
-            self.$element.find("select[id=" + self.name + "]").append($("<option/>", {
-                    value: (typeof(item) == 'string') ? item: item[0],
-                    text: (typeof(item) == 'string')? item: item[1],
-                    selected:select_val
-            }));
-        });
+    set_value: function(value) {
+        value = value === null ? false : value;
+        value = value instanceof Array ? value[1] : value;
+        var index = 0;
+        for (var i = 0, ii = this.value.length; i < ii; i++) {
+            if ((this.value[i] instanceof Array && this.value[i][1] === value) || this.value[i] === value) index = i;
+        }
+        this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
     },
     get_value: function() {
         if (!this.dirty) {
@@ -687,62 +686,65 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
     init: function(view, node, id) {
         this._super(view, node, id);
         this.registry = openerp.web.form.widgets;
+        var values = _.keys(this.registry.map);
+        values.push('');
+        values.sort();
+        this.value = values;
     },
-    set_value: function(value, view_val) {
-        value = _.keys(this.registry.map);
-        value.push('');
-        value.sort();
-        this._super.apply(this,[value, view_val]);
-    }
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value, view_val) {
-        this._super.apply(this,[icons, view_val]);
-    }
+    init: function(view, node, id) {
+        this._super(view, node, id);
+        this.value = icons;
+    },
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value, view_val) {
-        value = [['', ''], ['new', 'New Window']];
-        this._super.apply(this,[value, view_val]);
-    }
+    init: function(view, node, id) {
+        this._super(view, node, id);
+        this.value = [['', ''], ['new', 'New Window']];
+    },
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value, view_val) {
-        value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-        this._super.apply(this,[value, view_val]);
-    }
+    init: function(view, node, id) {
+        this._super(view, node, id);
+        this.value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+    },
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value, view_val) {
-        value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
-        this._super.apply(this,[value, view_val]);
-    }
+    init: function(view, node, id) {
+        this._super(view, node, id);
+        this.value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
+    },
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value, view_val) {
-        value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
-        this._super.apply(this,[value, view_val]);
-    }
+    init: function(view, node, id) {
+        this._super(view, node, id);
+        this.value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
+    },
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value, view_val) {
-        value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-        this._super.apply(this,[value, view_val]);
-    }
+    init: function(view, node, id) {
+        this._super(view, node, id);
+        this.value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+    },
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    set_value: function(value, view_val) {
+    init: function(view, node, id) {
+        this._super(view, node, id);
+        this.multiple = true;
+    },
+    start: function () {
+        this._super();
+        this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple",true);
+    },
+    set_value: function(value) {
         var self = this;
-        this.$element.find("select[id="+ this.name +"]").attr('multiple', true).css('height','100px');
-        var selected_val, sel_val;
-        view_val ? selected_val=view_val[1].split(',') : selected_val = null;
-        _.each(value, function(item) {
-            _.include(selected_val,item[0])?sel_val=true:sel_val=false;
-            self.$element.find("select[id="+self.name+"]").append($("<option/>", {
-                value : item[0],
-                text : item[1],
-                selected:sel_val
-            }));
+        self.$element.find("#groups option").attr("selected",false);
+        if (!value) return false;
+        _.each(this.value, function(item) {
+            if (_.include(value[1].split(','), item[0])) {
+                self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1)
+            }
          });
     }
 });
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a0d8921d1b7..95bd6f663dd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1334,7 +1334,14 @@
     <input type="text" t-att-id="widget.name" class="field_char" size="50"/>
 </t>
 <t t-name="vieweditor_selection">
-    <select t-att-id="widget.name"/>
+    <select t-att-id="widget.name" >
+        <t t-foreach="widget.value" t-as="option">
+            <option
+                t-att-value="typeof option === 'object' ? option[0] : option">
+                <t t-esc="typeof option === 'object' ? option[1] : option"/>
+            </option>
+        </t>
+    </select>
 </t>
 <t t-name="vieweditor_boolean">
     <input type="checkbox" t-att-id="widget.name"/>

From b9b9fbca444327c3e1f68d62efc39d5e64e4edf3 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 9 Nov 2011 15:46:00 +0530
Subject: [PATCH 036/114] [FIX]fix some issue.

bzr revid: vme@tinyerp.com-20111109101600-6xgkj15f2me1e00q
---
 addons/web/static/src/js/view_editor.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index a0168ceafe4..8556b82bf56 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -121,8 +121,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.append_child_object(main_object, parent_id, child_obj_list);
         var obj_xml_list = _.zip(xml_Node,child_obj_list);
         _.each(obj_xml_list, function(node){
-            if(node[0].children.length != 0){
-            self.convert_arch_to_obj(node[0].children, main_object, node[1].id);}
+            var children = _.filter(node[0].childNodes, function (child) {
+                return child.nodeType == 1;
+            });
+            if(children){
+            self.convert_arch_to_obj(children, main_object, node[1].id);}
         });
         return main_object;
     },
@@ -172,9 +175,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         var xml_list = [];
         var xml_arch = QWeb.load_xml(result.arch);
-        (xml_arch.childNodes[0].tagName == "data")
-            ? xml_list = xml_arch.childNodes[0].children 
-                : xml_list.push(xml_arch.childNodes[0]);
+        if(xml_arch.childNodes[0].tagName == "data"){
+            xml_list = _.filter(xml_arch.childNodes[0].childNodes, function (child) {
+                            return child.nodeType == 1;
+                        });
+        }else{ xml_list.push( xml_arch.childNodes[0] ); }
+
         _.each(xml_list, function(xml) {
             var expr_to_list = [];
             var xpath_arch_object = self.parse_xml(QWeb.tools.xml_node_to_string(xml), result.id);
@@ -422,7 +428,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var xml_arch = QWeb.load_xml(arch.arch);
         if (xml_arch.childNodes[0].tagName == "data") {
             var check_list = _.flatten(obj[0].child_id[0].att_list);
-            arch.arch = _.detect(xml_arch.childNodes[0].children, function(xml_child){
+            var children = _.filter(xml_arch.childNodes[0].childNodes, function (child) {
+                return child.nodeType == 1;
+            });
+            arch.arch = _.detect(children, function(xml_child){
                 var temp_obj = self.create_View_Node(xml_child);
                 var insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
                 if (insert.length == check_list.length ) {return xml_child;}

From 614b1f6e49b31b8c0b0df5d66b308ec779b45966 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 10 Nov 2011 10:24:03 +0530
Subject: [PATCH 037/114] [IMP]add _CHILDREN dictionary for add element
 functionality of view editor.

bzr revid: vme@tinyerp.com-20111110045403-8trt63vcqdfikelg
---
 addons/web/static/src/js/view_editor.js | 36 ++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8556b82bf56..639ade0e6a4 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -336,6 +336,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             switch (this.id) {
                 case "side-add":
+                     var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
+                    var tag = _.detect(_.keys(_CHILDREN),function(res){
+                        return _.includes(tr, res);
+                    });
+                    var properties = _CHILDREN[tag];
                     break;
                 case "side-remove":
                     break;
@@ -473,7 +478,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                 } else if (move_direct == "update_node") {
                     _.each(update_values, function(val){
-                        $(arch1).attr(val[0],val[1]);
+                        if(val[0] == "required"){
+                                $(arch1).attr("required", "true");
+                                console.log(arch1);
+                        }else{
+                            $(arch1).attr(val[0],val[1]);
+                        }
                     });
                     var new_obj = self.create_View_Node(arch1);
                     new_obj.id = obj.id,new_obj.child_id = obj.child_id;
@@ -548,7 +558,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
         _.each(properties, function(record) {
-            var id = record,
+            var id = record, 
             type_widget;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                 if (_.include(widget,id)){
@@ -562,7 +572,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 if (id == 'groups') type_widget.value = self.groups;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
                 type_widget.start();
-                type_widget.set_value(value)
+                type_widget.set_value(value);
                 self.edit_widget.push(type_widget);
             });
         });
@@ -769,6 +779,26 @@ var _PROPERTIES = {
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
     'view' : [],
 };
+_CHILDREN = {
+    'form': ['notebook', 'group', 'field', 'label', 'button', 'image', 'newline', 'separator'],
+    'tree': ['field'],
+    'graph': ['field'],
+    'calendar': ['field'],
+    'notebook': ['page'],
+    'page': ['notebook', 'group', 'field', 'label', 'button', 'image', 'newline', 'separator'],
+    'group': ['field', 'label', 'button', 'separator', 'newline'],
+    'hpaned': ['child1', 'child2'],
+    'vpaned': ['child1', 'child2'],
+    'child1': ['action'],
+    'child2': ['action'],
+    'action': [],
+    'field': ['form', 'tree', 'graph'],
+    'label': [],
+    'button' : [],
+    'image': [],
+    'newline': [],
+    'separator': [],
+};
 var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
             'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',

From a9290ac7f4f8efa575ffab92dd41db28e13942ec Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Nov 2011 11:20:31 +0530
Subject: [PATCH 038/114] [IMP] Vieweditor :- improve code.

bzr revid: ysa@tinyerp.com-20111110055031-hxu99dhrtljxal1t
---
 addons/web/static/src/js/view_editor.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8556b82bf56..f0067a7c10a 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -494,7 +494,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             }
         }
-    }, 
+    },
     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-']");
@@ -529,9 +529,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     "Update": function(){
                         var update_values = [];
                         _.each(self.edit_widget, function(widget) {
-                            var value = widget.get_value();
-                            if (value) {
-                                update_values.push(value);
+                            if (widget.dirty) {
+                                update_values.push(widget.get_value());
                             }
                         });
                         self.do_save_update_arch(obj, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "update_node", update_values);
@@ -630,9 +629,6 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         }
     },
     get_value: function() {
-        if (!this.dirty) {
-            return false;
-        }
         var value = this.$element.find("input[id=" + this.name + "]").is(':checked');
         return value ? [this.name, value] : [this.name, null];
     }
@@ -649,9 +645,6 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         value ? this.$element.find("input[id=" + this.name + "]").val(value[1]): this.$element.find("tr[id=" + this.name + "] input").val();
     },
     get_value: function() {
-        if (!this.dirty) {
-            return false;
-        }
         var value= this.$element.find("input[id=" + this.name + "]").val();
         return value ? [this.name, value] : [this.name, ""];
     }
@@ -674,9 +667,6 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
     },
     get_value: function() {
-        if (!this.dirty) {
-            return false;
-        }
         var value = this.$element.find("select[id=" + this.name + "]").val();
         return  value ? [this.name, value] : [this.name, ""];
     }

From 7ed871bc0d20cdac2052a5f4688d94f466c14d6b Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Nov 2011 14:39:20 +0530
Subject: [PATCH 039/114] [IMP] vieweditor:- remove unused argment.

bzr revid: ysa@tinyerp.com-20111110090920-fgluhnpkw9o1ifwm
---
 addons/web/static/src/js/view_editor.js | 39 ++++++++++++-------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f0067a7c10a..fbc3048c04f 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -551,9 +551,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             type_widget;
             self.ready  = $.when(self.on_groups(id)).then(function () {
                 if (_.include(widget,id)){
-                    type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, arch_val, id);
+                    type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, id);
                 } else {
-                    type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog,arch_val, id);
+                    type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog, id);
                 }
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, id);
@@ -601,9 +601,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
-    init: function(view, node, id) {
+    init: function(view, id) {
         this.$element = view.$element;
-        this.node = node;
         this.dirty = false;
         this.name = id;
         this.value = undefined;
@@ -672,8 +671,8 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.registry = openerp.web.form.widgets;
         var values = _.keys(this.registry.map);
         values.push('');
@@ -682,44 +681,44 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
     },
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.value = icons;
     },
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.value = [['', ''], ['new', 'New Window']];
     },
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
     },
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
     },
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
     },
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
     },
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, node, id) {
-        this._super(view, node, id);
+    init: function(view, id) {
+        this._super(view, id);
         this.multiple = true;
     },
     start: function () {

From 014fc455922d5c22d0e5646aef674ffd40b62de7 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Nov 2011 16:39:14 +0530
Subject: [PATCH 040/114] [IMP] vieweditor:- default view select in manage view
 dialog box.

bzr revid: ysa@tinyerp.com-20111110110914-o5scsgjqoaedd4wr
---
 addons/web/static/src/js/view_editor.js | 3 ++-
 addons/web/static/src/xml/base.xml      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index fbc3048c04f..602d43a1db0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -32,7 +32,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 action_buttons: false,
                 search_view: false,
                 pager: false,
-                radio: true
+                radio: true,
+                select_view_id: self.parent.fields_view.view_id
             },
         };
         this.view_edit_dialog = new openerp.web.Dialog(this, {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f5448168f5e..9d631b6ae01 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -625,7 +625,7 @@
     </t>
     <t t-if="options.radio">
         <th t-if="options.selectable" class="oe-record-selector" width="1">
-            <input type="radio" name ="radiogroup"/>
+            <input type="radio" name ="radiogroup" t-att-checked="options.select_view_id == record.get('id')? true: null"/>
         </th>
     </t>
     <t t-if="!options.radio">

From c71753e42a0149a100622bb77d06ba191c0768c9 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Nov 2011 16:40:21 +0530
Subject: [PATCH 041/114] [FIX] vieweditor :- fix problem of assign default
 view in variable.

bzr revid: ysa@tinyerp.com-20111110111021-7srfslh8bsqwnd56
---
 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 602d43a1db0..f901c2985dd 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -54,6 +54,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
             },
         }).start().open();
+        this.main_view_id = this.parent.fields_view.view_id;
         var action_manager = new openerp.web.ActionManager(this);
         action_manager.appendTo(this.view_edit_dialog);
         $.when(action_manager.do_action(action)).then(function() {

From 44af6726ce4c7b2ca170b85417c4bec937534a07 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 10 Nov 2011 17:45:50 +0530
Subject: [PATCH 042/114] [IMP] improve xml template for checkbox and radio
 button.

bzr revid: ysa@tinyerp.com-20111110121550-wg7k2oqgwh3v47km
---
 addons/web/static/src/xml/base.xml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 9d631b6ae01..fe2c9266493 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -623,18 +623,9 @@
 
         </td>
     </t>
-    <t t-if="options.radio">
-        <th t-if="options.selectable" class="oe-record-selector" width="1">
-            <input type="radio" name ="radiogroup" t-att-checked="options.select_view_id == record.get('id')? true: null"/>
-        </th>
-    </t>
-    <t t-if="!options.radio">
-        <th t-if="options.selectable" class="oe-record-selector" width="1">
-            <input type="checkbox"/>
-        </th>
-    </t>
-
-
+    <th t-if="options.selectable" class="oe-record-selector" width="1">
+        <input t-att-type="options.radio? 'radio': 'checkbox'" name ="radiogroup" t-att-checked="options.select_view_id == record.get('id')? true: null"/>
+    </th>
     <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"

From 453f747b1dda7ddcd9a2f2f3a627af3a12a33247 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 11 Nov 2011 10:42:58 +0530
Subject: [PATCH 043/114] [IMP] vieweditor :- improve variable name in widget.

bzr revid: ysa@tinyerp.com-20111111051258-aap5omofy15d79qw
---
 addons/web/static/src/js/view_editor.js | 23 +++++++++++------------
 addons/web/static/src/xml/base.xml      |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f901c2985dd..5ad94e4b5c2 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -560,7 +560,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, id);
                 });
-                if (id == 'groups') type_widget.value = self.groups;
+                if (id == 'groups') type_widget.selection = self.groups;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
                 type_widget.start();
                 type_widget.set_value(value)
@@ -607,7 +607,6 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.$element = view.$element;
         this.dirty = false;
         this.name = id;
-        this.value = undefined;
     },
     on_ui_change: function() {
         this.dirty = true;
@@ -662,8 +661,8 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         value = value === null ? false : value;
         value = value instanceof Array ? value[1] : value;
         var index = 0;
-        for (var i = 0, ii = this.value.length; i < ii; i++) {
-            if ((this.value[i] instanceof Array && this.value[i][1] === value) || this.value[i] === value) index = i;
+        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;
         }
         this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
     },
@@ -679,43 +678,43 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
         var values = _.keys(this.registry.map);
         values.push('');
         values.sort();
-        this.value = values;
+        this.selection = values;
     },
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = icons;
+        this.selection = icons;
     },
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['', ''], ['new', 'New Window']];
+        this.selection = [['', ''], ['new', 'New Window']];
     },
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
+        this.selection = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
     },
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
+        this.selection = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
     },
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
+        this.selection = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
     },
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.value = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
+        this.selection = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
     },
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -731,7 +730,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten
         var self = this;
         self.$element.find("#groups option").attr("selected",false);
         if (!value) return false;
-        _.each(this.value, function(item) {
+        _.each(this.selection, function(item) {
             if (_.include(value[1].split(','), item[0])) {
                 self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1)
             }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fe2c9266493..d8eb6a3f8f4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1317,7 +1317,7 @@
 </t>
 <t t-name="vieweditor_selection">
     <select t-att-id="widget.name" >
-        <t t-foreach="widget.value" t-as="option">
+        <t t-if="widget.selection" t-foreach="widget.selection" t-as="option">
             <option
                 t-att-value="typeof option === 'object' ? option[0] : option">
                 <t t-esc="typeof option === 'object' ? option[1] : option"/>

From d5c21085f91cb2e360e6f769e66b9add05206d57 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 Nov 2011 10:47:47 +0530
Subject: [PATCH 044/114] [IMP]hide fields column in add node functionality.

bzr revid: vme@tinyerp.com-20111111051747-nlswsv96o4glx6zy
---
 addons/web/static/src/js/view_editor.js | 57 +++++++------------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 39738f0d20e..2008a5d2129 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -619,7 +619,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var  render_list = [];
         render_list.push(["node_type",(_.keys(_CHILDREN)).sort()]);
         render_list.push(["position",positions]);
-        render_list.push([" ",fields]);
+        render_list.push(["Fields",fields]);
+        this.edit_widget = [];
         this.add_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
@@ -627,6 +628,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 300,
             buttons: {
                     "Update": function(){
+                        var update_values = [];
+                        _.each(self.edit_widget, function(widget) {
+                            if (widget.dirty) {
+                                update_values.push(widget.get_value());
+                            }
+                        });
                     },
                     "Cancel": function(){
                         self.add_node_dialog.close();
@@ -639,53 +646,17 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         _.each(render_list,function(node){
             type_widget = new openerp.web.ViewEditor.FieldSelect (self.add_node_dialog, node[0]);
             type_widget.value = node[1];
+            if(node[0]=="Fields"){ node[0] = "";}
             table_selector.append('<tr><td align="right">'+node[0]+'</td><td>'+type_widget.render()+'</td></tr>');
             type_widget.start();
+            self.edit_widget.push(type_widget);
         });
         table_selector.append('<tr><td align="right"> <button id="new_field">New Field</button></td></tr>');
-        self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1)
+        self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1);
+        
         self.add_node_dialog.$element.find('#new_field').click(function() {
             //to do
-            self.Add_new_field();
         });
-    },
-    Add_new_field : function(){
-        var self = this;
-        var action = {
-            name: _.sprintf("Manage Views (%s)", this.model),
-            res_model: 'ir.model.fields',
-            views: [['form']],
-            type: 'ir.actions.act_window',
-            target: "new",
-            limit: this.dataset.limit || 80,
-            auto_search: true,
-            flags: {
-                sidebar: false,
-                deletable: false,
-                views_switcher: false,
-                action_buttons: false,
-                search_view: false,
-                pager: false,
-                radio: true
-            },
-        };
-        this.add_new_field = new openerp.web.Dialog(this, {
-            modal: true,
-            title: 'ViewEditor',
-            width: 750,
-            height: 500,
-            buttons: {
-                "Save": function(){
-                    //to do
-                },
-                "Close": function(){
-                    self.add_new_field.close();
-                }
-            },
-        }).start().open();
-        var action_manager = new openerp.web.ActionManager(this);
-        action_manager.appendTo(this.add_new_field);
-        action_manager.do_action(action);
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
@@ -742,6 +713,10 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         var self = this;
         this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
+            add_node = self.get_value();
+            if(add_node[0] == "node_type" && add_node[1] == "field" ){
+                self.$element.find("select[id=Fields]").show();
+            }else{self.$element.find("select[id=Fields]").hide();}
         });
     },
     set_value: function(value) {

From 7d12fedaa3c2f1dcbe335d0ba951976f7fe2a5d9 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 11 Nov 2011 12:22:45 +0530
Subject: [PATCH 045/114] [IMP] vieweditor :- change properties related to
 new-style of dashboard.

bzr revid: ysa@tinyerp.com-20111111065245-wh5bs9277xpqgtio
---
 addons/web/static/src/js/view_editor.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 5ad94e4b5c2..fbf30f6a3c9 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -749,15 +749,12 @@ var _PROPERTIES = {
     'label': ['string', 'align', 'colspan', 'groups'],
     'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
     'newline' : [],
-    'hpaned': ['position', 'groups'],
-    'vpaned': ['position', 'groups'],
-    'child1' : ['groups'],
-    'child2' : ['groups'],
+    'board': ['style'],
+    'column' : [],
     'action' : ['name', 'string', 'colspan', 'groups'],
     'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'],
     'graph' : ['string', 'type'],
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
-    'view' : [],
 };
 var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',

From e6eb7c15fc49aca0c499e31071d5d2d2e39f38d8 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 Nov 2011 15:32:32 +0530
Subject: [PATCH 046/114] [IMP]make condition for when to update view in add
 node.

bzr revid: vme@tinyerp.com-20111111100232-6l0rhp55dn2e53q1
---
 addons/web/static/src/js/view_editor.js | 40 ++++++++++++++++---------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 376eed6fe71..578611edd5b 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -74,10 +74,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             return (node.getAttribute('name'))?
                 _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
                 _.sprintf( "<%s>",node.tagName.toLowerCase());
-        }else if(node.tagName.toLowerCase() == "group"){
-            return (node.getAttribute('string'))?
-                _.sprintf( "<%s>",node.getAttribute('string')):
-                _.sprintf( "<%s>",node.tagName.toLowerCase());
         }else{
             return (node.getAttribute('string'))?
                 _.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')):
@@ -338,15 +334,20 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
             switch (this.id) {
                 case "side-add":
-                    var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
-                    var tag = _.detect(_.keys(_CHILDREN),function(res){
-                        return _.includes(tr, res);
-                    });
+                    var tr = $(side).find('a').text();
+                    var parent_tr = ($(side).prevAll("tr[level="+String(clicked_tr_level - 1)+"]"))[0];
+                    parent_tr = $(parent_tr).find('a').text();
                     self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) {
                                 var fields = _.keys(result.fields);
-                                fields.push(" ");
-                                fields.sort();
-                                self.on_add_node(_CHILDREN[tag],fields);
+                                fields.push(" "),fields.sort();
+                                var property_to_check = [];
+                                _.each([tr,parent_tr],function(element){
+                                    property_to_check.push(
+                                        _.detect(_.keys(_CHILDREN),function(res){
+                                                return _.includes(element, res);
+                                            }));
+                                    });
+                                self.on_add_node(property_to_check, fields);
                             });
                     break;
                 case "side-remove":
@@ -630,10 +631,22 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 300,
             buttons: {
                     "Update": function(){
-                        var update_values = [];
+                        var node_type,position,fields;
+                        var check_add_node = true;
                         _.each(self.edit_widget, function(widget) {
-                            update_values.push(widget.get_value());
+                            (widget.name == "node_type")?node_type = widget.get_value()[1]:false;
+                            (widget.name == "position")?position = widget.get_value()[1]:false;
+                            (widget.name == "Fields")?fields = widget.get_value()[1]:false;
                         });
+                       (position == "Inside")?
+                        check_add_node =(_.include(_CHILDREN[properties[0]],node_type))?true:false:
+                        check_add_node =(_.include(_CHILDREN[properties[1]],node_type))?true:false;
+                        if(node_type == "field" &&  check_add_node )
+                            {check_add_node = (fields != " ")?true:false;
+                        }
+                        if(check_add_node){
+                            var tag = _.sprintf("<%s></%s>",node_type,node_type);
+                        }else{alert("Can't Update View");}
                     },
                     "Cancel": function(){
                         self.add_node_dialog.close();
@@ -653,7 +666,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         table_selector.append('<tr><td align="right"> <button id="new_field">New Field</button></td></tr>');
         self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1);
-        
         self.add_node_dialog.$element.find('#new_field').click(function() {
             //to do
         });

From 0b3900d31fd8364986af9e53362f7bf60b3c35e9 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Fri, 11 Nov 2011 16:14:09 +0530
Subject: [PATCH 047/114] [IMP] vieweditor :- node have no attributes then edit
 icon not display.

bzr revid: ysa@tinyerp.com-20111111104409-bvpizxka5a0i20dd
---
 addons/web/static/src/js/view_editor.js | 6 +++++-
 addons/web/static/src/xml/base.xml      | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index fbf30f6a3c9..2e91b65b118 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -295,7 +295,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
             }
         }).start().open();
-        this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object']}));
+        var no_property_att = [];
+        _.each(_PROPERTIES, function(val, key) {
+            if (! val.length) no_property_att.push(key);
+        });
+        this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object'], 'no_properties': no_property_att}));
         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');
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d8eb6a3f8f4..804b5e33c30 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1293,7 +1293,8 @@
                     <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"
+
+                    <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%">

From 81e8bce5a1625e33b380549a37389690ae86dd62 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 Nov 2011 19:00:02 +0530
Subject: [PATCH 048/114] [IMP]add node to xml according to its position.

bzr revid: vme@tinyerp.com-20111111133002-5shh06ts8vjumhqo
---
 addons/web/static/src/js/view_editor.js | 39 ++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d1ed9cbf867..f85d44710f2 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -70,6 +70,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
     },
     add_node_name : function(node) {
+        console.log("node",node);
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
             return (node.getAttribute('name'))?
                 _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
@@ -347,7 +348,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                                                 return _.includes(element, res);
                                             }));
                                     });
-                                self.on_add_node(property_to_check, fields);
+                                self.on_add_node(property_to_check, fields ,
+                                    clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
                             });
                     break;
                 case "side-remove":
@@ -491,19 +493,35 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         }else{
                             $(arch1).attr(val[0],val[1]);
                         }
+                        console.log("typeof",typeof arch1,arch1);
                     });
                     var new_obj = self.create_View_Node(arch1);
                     new_obj.id = obj.id,new_obj.child_id = obj.child_id;
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
+                }else if(move_direct == "add_node"){
+                    console.log(arch1,obj, update_values);
+                    $(arch1).add(update_values[0]);
+                    //self.create_View_Node(arch1); object not created here
+                     switch (update_values[1]) {
+                        case "After":
+                            $(arch1).after(update_values[0]);
+                            break;
+                        case "Before":
+                            $(arch1).before(update_values[0]);
+                            break;
+                        case "Inside":
+                            $(arch1).append(update_values[0]);
+                            break;
+                    }
                 }
                 var parent = $(arch1).parents();
                 var convert_to_utf = QWeb.tools.xml_node_to_string(parent[parent.length-1]);
                 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;
-                this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
-                });
+                /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
+                });*/
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
@@ -616,8 +634,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             })
         return def.promise();
     },
-    on_add_node: function(properties,fields){
+    on_add_node: function(properties,fields,clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level){
         var self = this;
+        console.log()
         var  positions = ['After','Before','Inside'];
         var  render_list = [];
         render_list.push(["node_type",(_.keys(_CHILDREN)).sort()]);
@@ -631,21 +650,25 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 300,
             buttons: {
                     "Update": function(){
-                        var node_type,position,fields;
+                        var node_type,position,field_value;
                         var check_add_node = true;
                         _.each(self.edit_widget, function(widget) {
                             (widget.name == "node_type")?node_type = widget.get_value()[1]:false;
                             (widget.name == "position")?position = widget.get_value()[1]:false;
-                            (widget.name == "Fields")?fields = widget.get_value()[1]:false;
+                            (widget.name == "Fields")?field_value = widget.get_value()[1]:false;
                         });
                        (position == "Inside")?
                         check_add_node =(_.include(_CHILDREN[properties[0]],node_type))?true:false:
                         check_add_node =(_.include(_CHILDREN[properties[1]],node_type))?true:false;
                         if(node_type == "field" &&  check_add_node )
-                            {check_add_node = (fields != " ")?true:false;
+                            {check_add_node = (field_value != " ")?true:false;
                         }
                         if(check_add_node){
-                            var tag = _.sprintf("<%s></%s>",node_type,node_type);
+                            var tag = (node_type == "field")?
+                                _.sprintf("<%s name='%s'> ",node_type,field_value,node_type):
+                                    _.sprintf("<%s>",node_type,node_type);
+                            self.do_save_update_arch(one_object, view_id, view_xml_id, 
+                                clicked_tr_id, clicked_tr_level, "add_node", [tag, position]);
                         }else{alert("Can't Update View");}
                     },
                     "Cancel": function(){

From a6891d08b0e4391f34b76feb22faf9088ae9566b Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 10:23:17 +0530
Subject: [PATCH 049/114] [IMP] Vieweditor :- improve xml template.

bzr revid: ysa@tinyerp.com-20111114045317-k04qusdxo9p3wa1h
---
 addons/web/static/src/xml/base.xml | 93 +++++++++++++++---------------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 804b5e33c30..ec76dc1d89d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1268,51 +1268,54 @@
         <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 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>
-    <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="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>
+                    <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>
+                        <img t-if="rec.att_list.length"
+                            id="side-add" src="/web/static/src/img/icons/gtk-add.png" style="cursor: pointer;"/>
+                    </td>
+                    <td>
+                        <img  id="side-remove" src="/web/static/src/img/icons/gtk-remove.png" style="cursor: pointer;"/>
+                    </td>
+                    <td>
+                        <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>
+                        <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>
+                        <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 t-name="vieweditor_char">
     <input type="text" t-att-id="widget.name" class="field_char" size="50"/>
 </t>

From 31c2c9ec261706eef12864904c549ece4d4a65ac Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 10:25:59 +0530
Subject: [PATCH 050/114] [IMP] imporve xml template of vieweditor.

bzr revid: ysa@tinyerp.com-20111114045559-hhmbhbudn4j0j1hs
---
 addons/web/static/src/xml/base.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ec76dc1d89d..0c27eee70b4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1286,24 +1286,24 @@
             </table>
         </td>
         <td align="left" class="oe_view_editor_colum"  width="15%">
-            <table  width="100%">
+            <table width="100%">
                 <tr>
-                    <td>
+                    <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>
+                    <td width="20%">
                         <img  id="side-remove" src="/web/static/src/img/icons/gtk-remove.png" style="cursor: pointer;"/>
                     </td>
-                    <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>
+                    <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>
+                    <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>

From ae593ef201444e176f99dd8031d41e2173b2eb78 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 11:00:04 +0530
Subject: [PATCH 051/114] [ADD] Vieweditor :- implement remove view
 functionality.

bzr revid: ysa@tinyerp.com-20111114053004-e7ye0bn24ideah4p
---
 addons/web/static/src/js/view_editor.js | 26 +++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 2e91b65b118..0e889cc429d 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,4 +1,5 @@
 openerp.web.view_editor = function(openerp) {
+var _t = openerp.web._t;
 var QWeb = openerp.web.qweb;
 openerp.web.ViewEditor =   openerp.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
@@ -49,16 +50,19 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     self.xml_element_id = 0;
                     self.get_arch();
                 },
+                "Remove": function(){
+                    self.do_delete_view();
+                },
                 "Close": function(){
                     self.view_edit_dialog.close();
                 }
             },
         }).start().open();
         this.main_view_id = this.parent.fields_view.view_id;
-        var action_manager = new openerp.web.ActionManager(this);
-        action_manager.appendTo(this.view_edit_dialog);
-        $.when(action_manager.do_action(action)).then(function() {
-            var viewmanager = action_manager.inner_viewmanager,
+        this.action_manager = new openerp.web.ActionManager(this);
+        this.action_manager.appendTo(this.view_edit_dialog);
+        $.when(this.action_manager.do_action(action)).then(function() {
+            var viewmanager = self.action_manager.inner_viewmanager,
                 controller = viewmanager.views[viewmanager.active_view].controller;
             controller.on_loaded.add_last(function(){
                 $(controller.groups).bind({
@@ -84,7 +88,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 _.sprintf( "<%s>",node.tagName.toLowerCase());
         }
     },
-
+    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();
+            });
+        }
+    },
     create_View_Node: function(node){
         var self = this;
         ViewNode = {
@@ -100,7 +111,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
        });
         return ViewNode;
     },
-
     append_child_object: function(main_object, parent_id, child_obj_list) {
         var self = this;
             if(main_object.id == parent_id){
@@ -113,7 +123,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             }
     },
-
     convert_arch_to_obj: function(xml_Node, main_object, parent_id){
         var self = this;
         var child_obj_list = [];
@@ -131,7 +140,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         return main_object;
     },
-
     parse_xml: function(arch, view_id) {
         main_object = {
             'level': 0,
@@ -143,7 +151,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var xml_arch = QWeb.load_xml(arch);
         return [this.convert_arch_to_obj(xml_arch.childNodes, main_object, this.xml_element_id)];
     },
-
     get_arch: function() {
         var self = this;
         var view_arch_list = [];
@@ -172,7 +179,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         return parent_list;
     },
-
     inherit_view : function(arch_object, result) {
         var self = this;
         var xml_list = [];

From cf75acd81327dc93af2e129aa7ccdf717bac8113 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 14 Nov 2011 11:58:41 +0530
Subject: [PATCH 052/114] [IMP]creating and saving new node in view editor.

bzr revid: vme@tinyerp.com-20111114062841-l3dwhedz0n3fm2in
---
 addons/web/static/src/js/view_editor.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f85d44710f2..1dfbc593461 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -70,7 +70,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
     },
     add_node_name : function(node) {
-        console.log("node",node);
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
             return (node.getAttribute('name'))?
                 _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
@@ -493,25 +492,30 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         }else{
                             $(arch1).attr(val[0],val[1]);
                         }
-                        console.log("typeof",typeof arch1,arch1);
                     });
                     var new_obj = self.create_View_Node(arch1);
                     new_obj.id = obj.id,new_obj.child_id = obj.child_id;
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
                 }else if(move_direct == "add_node"){
-                    console.log(arch1,obj, update_values);
                     $(arch1).add(update_values[0]);
-                    //self.create_View_Node(arch1); object not created here
+                    var temp_xml = QWeb.load_xml(update_values[0]);
+                    var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
                      switch (update_values[1]) {
                         case "After":
+                            object_xml.level = obj.level;
                             $(arch1).after(update_values[0]);
+                            child_list.splice(index + 1, 0, object_xml);
                             break;
                         case "Before":
+                            object_xml.level = obj.level;
                             $(arch1).before(update_values[0]);
+                            child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
+                            object_xml.level = obj.level + 1;
                             $(arch1).append(update_values[0]);
+                            obj.child_id.push(object_xml);
                             break;
                     }
                 }
@@ -520,8 +524,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 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;
-                /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
-                });*/
+                this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
+                });
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
@@ -636,7 +640,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     on_add_node: function(properties,fields,clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level){
         var self = this;
-        console.log()
         var  positions = ['After','Before','Inside'];
         var  render_list = [];
         render_list.push(["node_type",(_.keys(_CHILDREN)).sort()]);
@@ -665,8 +668,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         }
                         if(check_add_node){
                             var tag = (node_type == "field")?
-                                _.sprintf("<%s name='%s'> ",node_type,field_value,node_type):
-                                    _.sprintf("<%s>",node_type,node_type);
+                                _.sprintf("<%s name='%s'> </%s>",node_type,field_value,node_type):
+                                    _.sprintf("<%s> </%s>",node_type,node_type);
                             self.do_save_update_arch(one_object, view_id, view_xml_id, 
                                 clicked_tr_id, clicked_tr_level, "add_node", [tag, position]);
                         }else{alert("Can't Update View");}

From cdd20ff94cff6b466b6b6baaab34a2d60356db7a Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 14 Nov 2011 14:11:23 +0530
Subject: [PATCH 053/114] [imp]Rendered new fields view.

bzr revid: vme@tinyerp.com-20111114084123-el9szj2v0ukrcfqt
---
 addons/web/static/src/js/view_editor.js | 32 +++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 1dfbc593461..82c7be4745d 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -498,24 +498,15 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
                 }else if(move_direct == "add_node"){
-                    $(arch1).add(update_values[0]);
-                    var temp_xml = QWeb.load_xml(update_values[0]);
-                    var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
                      switch (update_values[1]) {
                         case "After":
-                            object_xml.level = obj.level;
                             $(arch1).after(update_values[0]);
-                            child_list.splice(index + 1, 0, object_xml);
                             break;
                         case "Before":
-                            object_xml.level = obj.level;
                             $(arch1).before(update_values[0]);
-                            child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
-                            object_xml.level = obj.level + 1;
                             $(arch1).append(update_values[0]);
-                            obj.child_id.push(object_xml);
                             break;
                     }
                 }
@@ -526,6 +517,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 arch.arch = convert_to_utf;
                 this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
                 });
+                if(move_direct == "add_node"){
+                    self.add_node_dialog.close();
+                    self.edit_xml_dialog.close();
+                    self.xml_element_id = 0;
+                    self.get_arch();}
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
@@ -693,7 +689,23 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         table_selector.append('<tr><td align="right"> <button id="new_field">New Field</button></td></tr>');
         self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1);
         self.add_node_dialog.$element.find('#new_field').click(function() {
-            //to do
+            var action = {
+                context: self.session.user_context,
+                res_model: "ir.model.fields",
+                views: [[false, 'form']],
+                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);
+
         });
     }
 });

From 712b3c83f4e49095c46c8a11edaef2b9d2b5d1a3 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 15:21:16 +0530
Subject: [PATCH 054/114] [ADD] vieweditor:- implement functionality of create
 new view.

bzr revid: ysa@tinyerp.com-20111114095116-us7a14avj84e4bi2
---
 addons/web/static/src/js/view_editor.js | 125 +++++++++++++++++++++---
 1 file changed, 113 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 0e889cc429d..841ca4ba81c 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -44,7 +44,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 500,
             buttons: {
                 "Create": function(){
-                    //to do
+                    self.on_create_view();
                 },
                 "Edit": function(){
                     self.xml_element_id = 0;
@@ -73,6 +73,80 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         });
     },
+    on_create_view: function() {
+        var self = this;
+        this.create_view_dialog = new openerp.web.Dialog(this,{
+            modal: true,
+            title: _.sprintf("Create a view (%s)", self.model),
+            width: 500,
+            height: 400,
+            buttons: {
+                    "Save": function(){
+                        var view_values = {};
+                        _.each(self.create_view_widget, function(widget) {
+                            if (widget.dirty && !widget.invalid) {
+                                view_values[widget.name] = widget.get_value();
+                            }
+                        });
+                        $.when(self.do_save_view(view_values)).then(function() {
+                            self.create_view_dialog.close();
+                            var controller = self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller;
+                            controller.reload_content();
+                        });
+                    },
+                    "Cancel": function(){
+                        self.create_view_dialog.close();
+                    }
+                }
+        });
+        this.create_view_dialog.start().open();
+        var view_widget = [{'name': 'view_name', 'type': 'char', 'required': true, 'value' : this.model + '.custom_' + Math.round(Math.random() * 1000)},
+                           {'name': 'view_type', 'type': 'selection', 'required': true, 'value': 'Form', 'selection': [['',''],['tree', 'Tree'],['form', 'Form'],['graph', 'Graph'],['calendar', 'Calender']]},
+                           {'name': 'pririty', 'type': 'char', 'required': true, 'value':'16'}];
+        this.create_view_dialog.$element.append('<table id="create_view"  style="width:400px" class="oe_forms"></table>');
+        this.create_view_widget = [];
+        _.each(view_widget, function(widget) {
+            var type_widget =  new (self.property.get_any([widget.type])) (self.create_view_dialog, widget.name);
+            if (widget.selection) {
+                type_widget.selection = widget.selection;
+            }
+            type_widget.required = widget.required;
+            self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td align="right">' + widget.name + ':</td><td  id="' +widget.name+ '">' + type_widget.render()+'</td></tr>');
+            var value = null;
+            if (widget.value) {
+                value = [widget.name, widget.value];
+                type_widget.dirty = true;
+            }
+            type_widget.start();
+            type_widget.set_value(value)
+            self.create_view_widget.push(type_widget);
+        });
+    },
+    do_save_view: function(values) {
+        def = $.Deferred();
+        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;
+        field_dataset.call( 'fields_get', [],  function(fields) {
+            _.each(['name', 'x_name'], function(value) {
+                if (_.include(_.keys(fields), value)) {
+                    field_name = value;
+                    return false;
+                }
+            });
+            if (field_name) {
+                model_dataset.read_slice(['name','field_id'], {"domain": [['model','=',self.model]]}, function(records) {
+                    if (records) {view_string = records[0].name;}
+                    var arch = _.sprintf("<?xml version='1.0'?>\n<%s string='%s'>\n\t<field name='%s'/>\n</%s>", values.view_type, view_string, field_name, values.view_type);
+                    var vals = {'model': self.model, 'name': values.view_name, 'priority': values.priority, 'type': values.view_type, 'arch': arch};
+                    self.dataset.create(vals, function(suc) {
+                        def.resolve();
+                    });
+                });
+            }
+        });
+        return def.promise();
+    },
     add_node_name : function(node) {
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
             return (node.getAttribute('name'))?
@@ -541,8 +615,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     "Update": function(){
                         var update_values = [];
                         _.each(self.edit_widget, function(widget) {
-                            if (widget.dirty) {
-                                update_values.push(widget.get_value());
+                            if (widget.dirty && !widget.invalid) {
+                                update_values.push([widget.name, widget.get_value()]);
                             }
                         });
                         self.do_save_update_arch(obj, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "update_node", update_values);
@@ -617,9 +691,26 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.$element = view.$element;
         this.dirty = false;
         this.name = id;
+        this.required = false;
+        this.invalid = false;
+    },
+    start: function () {
+        this.update_dom();
+    },
+    update_dom: function() {
+        this.$element.find("td[id="+ this.name+"]").toggleClass('invalid', this.invalid);
+        this.$element.find("td[id="+ this.name+"]").toggleClass('required', this.required);
     },
     on_ui_change: function() {
+        var value = this.get_value();
+        value = value instanceof Array ? value[1] : value;
+        if (this.required && !value) {
+            this.invalid = true;
+        } else {
+            this.invalid = false;
+        }
         this.dirty = true;
+        this.update_dom();
     },
     render: function() {
         return QWeb.render(this.template, {widget: this});
@@ -632,6 +723,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this.$element.find("input[id="+ self.name+"]").change(function() {
             self.on_ui_change();
         });
+        this._super();
     },
     set_value: function(value) {
         if (value) {
@@ -640,7 +732,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     },
     get_value: function() {
         var value = this.$element.find("input[id=" + this.name + "]").is(':checked');
-        return value ? [this.name, value] : [this.name, null];
+        return value ? value: null;
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -650,22 +742,28 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this.$element.find("input[id="+ this.name+"]").css('width','100%').change(function() {
             self.on_ui_change();
         });
+        this._super();
     },
     set_value: function(value) {
         value ? this.$element.find("input[id=" + this.name + "]").val(value[1]): this.$element.find("tr[id=" + this.name + "] input").val();
     },
     get_value: function() {
         var value= this.$element.find("input[id=" + this.name + "]").val();
-        return value ? [this.name, value] : [this.name, ""];
+        return value ? value: "";
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     template : "vieweditor_selection",
+    init: function(view, id) {
+        this._super(view, id);
+        this.selection = false;
+    },
     start: function () {
         var self = this;
         this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
         });
+        this._super();
     },
     set_value: function(value) {
         value = value === null ? false : value;
@@ -678,7 +776,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     },
     get_value: function() {
         var value = this.$element.find("select[id=" + this.name + "]").val();
-        return  value ? [this.name, value] : [this.name, ""];
+        return  value ? value: "";
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -735,6 +833,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten
     start: function () {
         this._super();
         this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple",true);
+        this._super();
     },
     set_value: function(value) {
         var self = this;
@@ -800,11 +899,13 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'completion' : 'openerp.web.ViewEditor.FieldBoolean',
     'widget' : 'openerp.web.ViewEditor.WidgetProperty',
     'groups' : 'openerp.web.ViewEditor.GroupsProperty',
-    'position': 'openerp.web.ViewEditor.PositionProperty',
-    'icon': 'openerp.web.ViewEditor.IconProperty',
-    'align': 'openerp.web.ViewEditor.AlignProperty',
-    'special': 'openerp.web.ViewEditor.ButtonSpecialProperty',
-    'type': 'openerp.web.ViewEditor.ButtonTypeProperty',
-    'target': 'openerp.web.ViewEditor.ButtonTargetProperty'
+    'position' : 'openerp.web.ViewEditor.PositionProperty',
+    'icon' : 'openerp.web.ViewEditor.IconProperty',
+    'align' : 'openerp.web.ViewEditor.AlignProperty',
+    'special' : 'openerp.web.ViewEditor.ButtonSpecialProperty',
+    'type' : 'openerp.web.ViewEditor.ButtonTypeProperty',
+    'target' : 'openerp.web.ViewEditor.ButtonTargetProperty',
+    'selection' : 'openerp.web.ViewEditor.FieldSelect',
+    'char' : 'openerp.web.ViewEditor.FieldChar',
 });
 };

From 5d9f64d56db4f2b976f56034e6cd047465bdabc9 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 15:36:14 +0530
Subject: [PATCH 055/114] [IMP] vieweditor :- add warning message for invalid
 field name in create view.

bzr revid: ysa@tinyerp.com-20111114100614-0fmzahtjx7uh9p2g
---
 addons/web/static/src/js/view_editor.js | 34 ++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 841ca4ba81c..f4d322542c8 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -83,16 +83,32 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             buttons: {
                     "Save": function(){
                         var view_values = {};
+                        var warn = false;
                         _.each(self.create_view_widget, function(widget) {
+                            if (widget.invalid) {
+                                warn = true
+                                return false;
+                            };
                             if (widget.dirty && !widget.invalid) {
                                 view_values[widget.name] = widget.get_value();
                             }
                         });
-                        $.when(self.do_save_view(view_values)).then(function() {
-                            self.create_view_dialog.close();
-                            var controller = self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller;
-                            controller.reload_content();
-                        });
+                        if (warn) {
+                            var msg = "<ul>";
+                            _.each(self.create_view_widget, function(widget) {
+                                if (widget.invalid) {
+                                    msg += "<li>" + widget.name + "</li>";
+                                }
+                            });
+                            msg += "</ul>";
+                            self.do_warn("The following fields are invalid :", msg);
+                        } else {
+                            $.when(self.do_save_view(view_values)).then(function() {
+                                self.create_view_dialog.close();
+                                var controller = self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller;
+                                controller.reload_content();
+                            });
+                        }
                     },
                     "Cancel": function(){
                         self.create_view_dialog.close();
@@ -100,9 +116,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
         });
         this.create_view_dialog.start().open();
-        var view_widget = [{'name': 'view_name', 'type': 'char', 'required': true, 'value' : this.model + '.custom_' + Math.round(Math.random() * 1000)},
-                           {'name': 'view_type', 'type': 'selection', 'required': true, 'value': 'Form', 'selection': [['',''],['tree', 'Tree'],['form', 'Form'],['graph', 'Graph'],['calendar', 'Calender']]},
-                           {'name': 'pririty', 'type': 'char', 'required': true, 'value':'16'}];
+        var view_widget = [{'name': 'view_name', 'string':'View Name', 'type': 'char', 'required': true, 'value' : this.model + '.custom_' + Math.round(Math.random() * 1000)},
+                           {'name': 'view_type', 'string': 'View Type', 'type': 'selection', 'required': true, 'value': 'Form', 'selection': [['',''],['tree', 'Tree'],['form', 'Form'],['graph', 'Graph'],['calendar', 'Calender']]},
+                           {'name': 'proirity', 'string': 'Priority', 'type': 'char', 'required': true, 'value':'16'}];
         this.create_view_dialog.$element.append('<table id="create_view"  style="width:400px" class="oe_forms"></table>');
         this.create_view_widget = [];
         _.each(view_widget, function(widget) {
@@ -111,7 +127,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 type_widget.selection = widget.selection;
             }
             type_widget.required = widget.required;
-            self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td align="right">' + widget.name + ':</td><td  id="' +widget.name+ '">' + type_widget.render()+'</td></tr>');
+            self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td align="right">' + widget.string + ':</td><td  id="' +widget.name+ '">' + type_widget.render()+'</td></tr>');
             var value = null;
             if (widget.value) {
                 value = [widget.name, widget.value];

From 7b8798df9caaeb65a38ae24e1da8eda3eb4bb7dd Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 14 Nov 2011 15:40:31 +0530
Subject: [PATCH 056/114] [IMP]corrent value for field type and model.

bzr revid: vme@tinyerp.com-20111114101031-ltmfz1786jcqfo0q
---
 addons/web/static/src/js/view_editor.js | 39 +++++++++++++------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 82c7be4745d..cc9f6051462 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -5,7 +5,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this._super(parent);
         this.element_id = element_id
         this.parent = parent
-        this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null);
+        this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null),
         this.model = dataset.model;
         this.xml_element_id = 0;
         this.property = openerp.web.ViewEditor.property_widget;
@@ -689,24 +689,27 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         table_selector.append('<tr><td align="right"> <button id="new_field">New Field</button></td></tr>');
         self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1);
         self.add_node_dialog.$element.find('#new_field').click(function() {
-            var action = {
-                context: self.session.user_context,
-                res_model: "ir.model.fields",
-                views: [[false, 'form']],
-                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);
-
+            model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);
+            model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) {
+                self.render_new_field(result[0].id);
+                    });
         });
+    },
+    render_new_field :function(id){
+        var action = {
+            context: {'default_model_id':id, 'manual':true},//self.session.user_context,
+            res_model: "ir.model.fields",
+            views: [[false, 'form']],
+            type: 'ir.actions.act_window',
+            target: "new",
+            flags: {
+                action_buttons: true,
+            },
+        };
+        var action_manager = new openerp.web.ActionManager(self);
+        action_manager.do_action(action);
+        });
+
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({

From eeede305423e8dd623ca76b3c047c58735d9d471 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 16:37:12 +0530
Subject: [PATCH 057/114] [IMP] vieweditor :- improve code and add warning
 message.

bzr revid: ysa@tinyerp.com-20111114110712-761wddi4f9low200
---
 addons/web/static/src/js/view_editor.js | 36 ++++++++++++++-----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f4d322542c8..487d5b55dc0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -75,7 +75,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     on_create_view: function() {
         var self = this;
-        this.create_view_dialog = new openerp.web.Dialog(this,{
+        this.create_view_dialog = new openerp.web.Dialog(this, {
             modal: true,
             title: _.sprintf("Create a view (%s)", self.model),
             width: 500,
@@ -86,7 +86,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         var warn = false;
                         _.each(self.create_view_widget, function(widget) {
                             if (widget.invalid) {
-                                warn = true
+                                warn = true;
                                 return false;
                             };
                             if (widget.dirty && !widget.invalid) {
@@ -179,10 +179,12 @@ 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() {
+            var controller = this.action_manager.inner_viewmanager.views[this.action_manager.inner_viewmanager.active_view].controller;
+            self.dataset.unlink([this.main_view_id]).then(function() {
                 controller.reload_content();
+                self.main_view_id = self.parent.fields_view.view_id;
             });
         }
     },
@@ -245,18 +247,22 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         var view_arch_list = [];
         this.dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function(arch) {
-            var arch_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});
-            self.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(arch_object, res);
+            if (arch.length) {
+                var arch_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});
+                self.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(arch_object, res);
+                    });
+                    return self.edit_view({"main_object": arch_object,
+                        "parent_child_id": self.parent_child_list(arch_object, []),
+                        "arch": view_arch_list});
                 });
-                return self.edit_view({"main_object": arch_object,
-                    "parent_child_id": self.parent_child_list(arch_object, []),
-                    "arch": view_arch_list});
-            });
+            } else {
+                self.do_warn("Please select view in list :");
+            }
         });
     },
     parent_child_list : function(one_object, parent_list) {

From 479ab434292f84fbf9396f3860b8ae8f72427d4c Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 16:57:34 +0530
Subject: [PATCH 058/114] [IMP] vieweditor:- simple value pass on set_value
 method instead of array..

bzr revid: ysa@tinyerp.com-20111114112734-l3d7v634sy1g9qsp
---
 addons/web/static/src/js/view_editor.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 487d5b55dc0..17b05cbf540 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -666,6 +666,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, id);
                 });
+                value = value instanceof Array ? value[1] : value;
                 if (id == 'groups') type_widget.selection = self.groups;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
                 type_widget.start();
@@ -749,7 +750,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     },
     set_value: function(value) {
         if (value) {
-            this.$element.find("input[id=" + this.name+ "]").attr('checked', value[1]);
+            this.$element.find("input[id=" + this.name+ "]").attr('checked', true);
         }
     },
     get_value: function() {
@@ -767,7 +768,7 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         this._super();
     },
     set_value: function(value) {
-        value ? this.$element.find("input[id=" + this.name + "]").val(value[1]): this.$element.find("tr[id=" + this.name + "] input").val();
+        value ? this.$element.find("input[id=" + this.name + "]").val(value): this.$element.find("tr[id=" + this.name + "] input").val();
     },
     get_value: function() {
         var value= this.$element.find("input[id=" + this.name + "]").val();
@@ -789,7 +790,6 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     },
     set_value: function(value) {
         value = value === null ? false : value;
-        value = value instanceof Array ? value[1] : value;
         var index = 0;
         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;
@@ -814,7 +814,7 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
     init: function(view, id) {
         this._super(view, id);
-        this.selection = icons;
+        this.selection = _ICONS;
     },
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -848,12 +848,7 @@ openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.ext
     },
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
-        this.multiple = true;
-    },
     start: function () {
-        this._super();
         this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple",true);
         this._super();
     },
@@ -862,7 +857,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten
         self.$element.find("#groups option").attr("selected",false);
         if (!value) return false;
         _.each(this.selection, function(item) {
-            if (_.include(value[1].split(','), item[0])) {
+            if (_.include(value.split(','), item[0])) {
                 self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1)
             }
          });
@@ -887,7 +882,7 @@ var _PROPERTIES = {
     'graph' : ['string', 'type'],
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
 };
-var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
+var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
             'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
             'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO',

From a58a66282bc6ba590fd4d0ae1ee9a3cb29445530 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 17:10:55 +0530
Subject: [PATCH 059/114] [IMP] vieweditor :- change variable name id to
 property.

bzr revid: ysa@tinyerp.com-20111114114055-d8tdfcvofsivhws6
---
 addons/web/static/src/js/view_editor.js | 61 ++++++++++++-------------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 17b05cbf540..61af4d194e3 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -385,8 +385,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             sidebar: false,
                             views_switcher: false,
                             action_buttons: false,
-                            search_view: false,
-                            pager: false,
                         },
                     };
                     var action_manager = new openerp.web.ActionManager(self);
@@ -654,21 +652,20 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
-        _.each(properties, function(record) {
-            var id = record,
-            type_widget;
-            self.ready  = $.when(self.on_groups(id)).then(function () {
-                if (_.include(widget,id)){
-                    type_widget =  new (self.property.get_any(['undefined' , id, arch_val[0]['att_list'][0]])) (self.edit_node_dialog, id);
+        _.each(properties, function(property) {
+            type_widget = false;
+            self.ready  = $.when(self.on_groups(property)).then(function () {
+                if (_.include(widget, property)){
+                    type_widget =  new (self.property.get_any([property])) (self.edit_node_dialog, property);
                 } else {
-                    type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog, id);
+                    type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog, property);
                 }
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
-                    return _.include(res, id);
+                    return _.include(res, property);
                 });
                 value = value instanceof Array ? value[1] : value;
-                if (id == 'groups') type_widget.selection = self.groups;
-                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">'+id+':</td><td>'+type_widget.render()+'</td></tr>');
+                if (property == 'groups') type_widget.selection = self.groups;
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + property + ':</td><td>' + type_widget.render() + '</td></tr>');
                 type_widget.start();
                 type_widget.set_value(value)
                 self.edit_widget.push(type_widget);
@@ -676,10 +673,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
     },
      //for getting groups
-    on_groups: function(id){
+    on_groups: function(property){
         var self = this,
         def = $.Deferred();
-        if (id != 'groups') {
+        if (property != 'groups') {
             self.groups = false;
             return false;
         }
@@ -710,10 +707,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
-    init: function(view, id) {
+    init: function(view, name) {
         this.$element = view.$element;
         this.dirty = false;
-        this.name = id;
+        this.name = name;
         this.required = false;
         this.invalid = false;
     },
@@ -777,8 +774,8 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     template : "vieweditor_selection",
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.selection = false;
     },
     start: function () {
@@ -802,8 +799,8 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.registry = openerp.web.form.widgets;
         var values = _.keys(this.registry.map);
         values.push('');
@@ -812,38 +809,38 @@ openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.exten
     },
 });
 openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.selection = _ICONS;
     },
 });
 openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.selection = [['', ''], ['new', 'New Window']];
     },
 });
 openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.selection = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
     },
 });
 openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.selection = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
     },
 });
 openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.selection = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
     },
 });
 openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, id) {
-        this._super(view, id);
+    init: function(view, name) {
+        this._super(view, name);
         this.selection = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
     },
 });

From 311b55260196db7b137b0d33382dab8deedf8e30 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Mon, 14 Nov 2011 17:49:33 +0530
Subject: [PATCH 060/114] [IMP] Improve code in vieweditor.

bzr revid: ysa@tinyerp.com-20111114121933-zmxgk4oy9e20p08u
---
 addons/web/static/src/js/view_editor.js | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 61af4d194e3..3988cfd84c4 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -94,14 +94,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             }
                         });
                         if (warn) {
-                            var msg = "<ul>";
-                            _.each(self.create_view_widget, function(widget) {
-                                if (widget.invalid) {
-                                    msg += "<li>" + widget.name + "</li>";
-                                }
-                            });
-                            msg += "</ul>";
-                            self.do_warn("The following fields are invalid :", msg);
+                            self.on_valid_create_view();
                         } else {
                             $.when(self.do_save_view(view_values)).then(function() {
                                 self.create_view_dialog.close();
@@ -130,7 +123,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td align="right">' + widget.string + ':</td><td  id="' +widget.name+ '">' + type_widget.render()+'</td></tr>');
             var value = null;
             if (widget.value) {
-                value = [widget.name, widget.value];
+                value = widget.value;
                 type_widget.dirty = true;
             }
             type_widget.start();
@@ -163,6 +156,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         return def.promise();
     },
+    on_valid_create_view: function() {
+        var msg = "<ul>";
+        _.each(self.create_view_widget, function(widget) {
+            if (widget.invalid) {
+                msg += "<li>" + widget.name + "</li>";
+            }
+        });
+        msg += "</ul>";
+        self.do_warn("The following fields are invalid :", msg);
+    },
     add_node_name : function(node) {
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
             return (node.getAttribute('name'))?
@@ -751,8 +754,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         }
     },
     get_value: function() {
-        var value = this.$element.find("input[id=" + this.name + "]").is(':checked');
-        return value ? value: null;
+        return this.$element.find("input[id=" + this.name + "]").is(':checked') || null;
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -768,8 +770,7 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         value ? this.$element.find("input[id=" + this.name + "]").val(value): this.$element.find("tr[id=" + this.name + "] input").val();
     },
     get_value: function() {
-        var value= this.$element.find("input[id=" + this.name + "]").val();
-        return value ? value: "";
+        return this.$element.find("input[id=" + this.name + "]").val();
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
@@ -794,8 +795,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
     },
     get_value: function() {
-        var value = this.$element.find("select[id=" + this.name + "]").val();
-        return  value ? value: "";
+        return this.$element.find("select[id=" + this.name + "]").val();
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({

From 4b250ebee88b70d0ded96174ec6d19cf3aa68592 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 15 Nov 2011 10:20:27 +0530
Subject: [PATCH 061/114] [IMP] vieweditor:- improve code and set element in
 start method.

bzr revid: ysa@tinyerp.com-20111115045027-b7j0qpw31d2zoqii
---
 addons/web/static/src/js/view_editor.js | 40 +++++++++++++------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 3988cfd84c4..8e630089e3f 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -120,7 +120,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 type_widget.selection = widget.selection;
             }
             type_widget.required = widget.required;
-            self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td align="right">' + widget.string + ':</td><td  id="' +widget.name+ '">' + type_widget.render()+'</td></tr>');
+            self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td width="100px" align="right">' + widget.string + ':</td>' + type_widget.render()+'</tr>');
             var value = null;
             if (widget.value) {
                 value = widget.value;
@@ -668,7 +668,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
                 value = value instanceof Array ? value[1] : value;
                 if (property == 'groups') type_widget.selection = self.groups;
-                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + property + ':</td><td>' + type_widget.render() + '</td></tr>');
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + property + ':</td>' + type_widget.render() + '</tr>');
                 type_widget.start();
                 type_widget.set_value(value)
                 self.edit_widget.push(type_widget);
@@ -718,11 +718,12 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.invalid = false;
     },
     start: function () {
+        this.$element = this.$element.find("td[id="+ this.name+"]");
         this.update_dom();
     },
     update_dom: function() {
-        this.$element.find("td[id="+ this.name+"]").toggleClass('invalid', this.invalid);
-        this.$element.find("td[id="+ this.name+"]").toggleClass('required', this.required);
+        this.$element.toggleClass('invalid', this.invalid);
+        this.$element.toggleClass('required', this.required);
     },
     on_ui_change: function() {
         var value = this.get_value();
@@ -736,41 +737,42 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.update_dom();
     },
     render: function() {
-        return QWeb.render(this.template, {widget: this});
+        return _.sprintf("<td id = %s>%s</td>", this.name, QWeb.render(this.template, {widget: this}))
     },
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     template : "vieweditor_boolean",
     start: function() {
         var self = this;
-        this.$element.find("input[id="+ self.name+"]").change(function() {
+        this._super();
+        this.$element.find("input").change(function() {
             self.on_ui_change();
         });
-        this._super();
+
     },
     set_value: function(value) {
         if (value) {
-            this.$element.find("input[id=" + this.name+ "]").attr('checked', true);
+            this.$element.find("input").attr('checked', true);
         }
     },
     get_value: function() {
-        return this.$element.find("input[id=" + this.name + "]").is(':checked') || null;
+        return this.$element.find("input").is(':checked') || null;
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
     template : "vieweditor_char",
     start: function () {
         var self = this;
-        this.$element.find("input[id="+ this.name+"]").css('width','100%').change(function() {
+        this._super();
+        this.$element.find("input").css('width','100%').change(function() {
             self.on_ui_change();
         });
-        this._super();
     },
     set_value: function(value) {
-        value ? this.$element.find("input[id=" + this.name + "]").val(value): this.$element.find("tr[id=" + this.name + "] input").val();
+        this.$element.find("input").val(value);
     },
     get_value: function() {
-        return this.$element.find("input[id=" + this.name + "]").val();
+        return this.$element.find("input").val();
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
@@ -781,10 +783,10 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     },
     start: function () {
         var self = this;
-        this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
+        this._super();
+        this.$element.find("select").css('width', '100%').change(function() {
             self.on_ui_change();
         });
-        this._super();
     },
     set_value: function(value) {
         value = value === null ? false : value;
@@ -792,10 +794,10 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         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;
         }
-        this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
+        this.$element.find("select")[0].selectedIndex = index;
     },
     get_value: function() {
-        return this.$element.find("select[id=" + this.name + "]").val();
+        return this.$element.find("select").val();
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -846,8 +848,8 @@ openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.ext
 });
 openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
     start: function () {
-        this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple",true);
         this._super();
+        this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple",true);
     },
     set_value: function(value) {
         var self = this;
@@ -855,7 +857,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten
         if (!value) return false;
         _.each(this.selection, function(item) {
             if (_.include(value.split(','), item[0])) {
-                self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1)
+                self.$element.find("select option[value='" + item[0] +"']").attr("selected",1)
             }
          });
     }

From 17c81331aaf7457cb2789df448819f57aca2623e Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 15 Nov 2011 11:24:53 +0530
Subject: [PATCH 062/114] [IMP] vieweditor :- add property attribute.

bzr revid: ysa@tinyerp.com-20111115055453-5b3zse1uz29yl4lb
---
 addons/web/static/src/js/view_editor.js | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8e630089e3f..eb0cceb387e 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -881,6 +881,43 @@ var _PROPERTIES = {
     'graph' : ['string', 'type'],
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
 };
+var _PROPERTIES_ATTRIBUTES = {
+    'name' : {'string': 'Name', 'type': 'char'},
+    'string' : {'string': 'String', 'type': 'char'},
+    'required' : {'string': 'Required', 'type': 'boolean'},
+    'readonly' : {'string': 'Readonly', 'type': 'boolean'},
+    'domain' : {'string': 'Domain', 'type': 'char'},
+    'context' : {'string': 'Context', 'type': 'char'},
+    'limit' : {'string': 'Limit', 'type': 'selection'},
+    'min_rows' : {'string': 'Minimum rows', 'type': 'char'},
+    'date_start' : {'string': 'Start date', 'type': 'char'},
+    'date_delay' : {'string': 'Delay date', 'type': 'char'},
+    'day_length' : {'string': 'Day length', 'type': 'char'},
+    'mode' : {'string': 'Mode', 'type': 'char'},
+    'align' : {'string': 'Alignment ', 'type': 'selection'},
+    'icon' : {'string': 'Icon', 'type': 'selection'},
+    'type' : {'string': 'Type', 'type': 'selection'},
+    'special' : {'string': 'Special', 'type': 'selection'},
+    'target' : {'string': 'Target', 'type': 'selection'},
+    'confirm' : {'string': 'Confirm', 'type': 'char'},
+    'style' : {'string': 'Style', 'type': 'selection'},
+    'filename' : {'string': 'File Name', 'type': 'char'},
+    'width' : {'string': 'Width', 'type': 'char'},
+    'height' : {'string': 'Height', 'type': 'char'},
+    'groups' : {'string': 'Groups', 'type': 'seleciton_multi'},
+    'attrs' : {'string': 'Attrs', 'type': 'char'},
+    'col' : {'string': 'col', 'type': 'char'},
+    'link' : {'string': 'Link', 'type': 'char'},
+    'position' : {'string': 'Position', 'type': 'selection'},
+    'states' : {'string': 'states', 'type': 'char'},
+    'eval' : {'string': 'Eval', 'type': 'char'},
+    'ref' : {'string': 'Ref', 'type': 'char'},
+    'on_change' : {'string': 'On change', 'type': 'char'},
+    'nolabel' : {'string': 'No label', 'type': 'boolean'},
+    'completion' : {'string': 'Completion', 'type': 'boolean'},
+    'colspan' : {'string': 'Colspan', 'type': 'char'},
+    'widget' : {'string': 'widget', 'type': 'selection'},
+};
 var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
             'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',

From 41ee96e532d02837b35a5cc999dcc69a6413a9e6 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 15 Nov 2011 13:11:11 +0530
Subject: [PATCH 063/114] [IMP] vieweditor :- improve selector in widget.

bzr revid: ysa@tinyerp.com-20111115074111-ij7kp2kr7rlxr0v6
---
 addons/web/static/src/js/view_editor.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8e630089e3f..ba68e55c3a0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -718,12 +718,11 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.invalid = false;
     },
     start: function () {
-        this.$element = this.$element.find("td[id="+ this.name+"]");
         this.update_dom();
     },
     update_dom: function() {
-        this.$element.toggleClass('invalid', this.invalid);
-        this.$element.toggleClass('required', this.required);
+        this.$element.find("td[id="+ this.name+"]").toggleClass('invalid', this.invalid);
+        this.$element.find("td[id="+ this.name+"]").toggleClass('required', this.required);
     },
     on_ui_change: function() {
         var value = this.get_value();
@@ -745,18 +744,18 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
     start: function() {
         var self = this;
         this._super();
-        this.$element.find("input").change(function() {
+        this.$element.find("input[id="+ self.name+"]").change(function() {
             self.on_ui_change();
         });
 
     },
     set_value: function(value) {
         if (value) {
-            this.$element.find("input").attr('checked', true);
+            this.$element.find("input[id=" + this.name+ "]").attr('checked', true);
         }
     },
     get_value: function() {
-        return this.$element.find("input").is(':checked') || null;
+        return this.$element.find("input[id=" + this.name + "]").is(':checked') || null;
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -764,15 +763,15 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
     start: function () {
         var self = this;
         this._super();
-        this.$element.find("input").css('width','100%').change(function() {
+        this.$element.find("input[id="+ this.name+"]").css('width','100%').change(function() {
             self.on_ui_change();
         });
     },
     set_value: function(value) {
-        this.$element.find("input").val(value);
+        this.$element.find("input[id=" + this.name + "]").val(value);
     },
     get_value: function() {
-        return this.$element.find("input").val();
+        return this.$element.find("input[id=" + this.name + "]").val();
     }
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
@@ -784,7 +783,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     start: function () {
         var self = this;
         this._super();
-        this.$element.find("select").css('width', '100%').change(function() {
+        this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
         });
     },
@@ -794,10 +793,10 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         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;
         }
-        this.$element.find("select")[0].selectedIndex = index;
+        this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index;
     },
     get_value: function() {
-        return this.$element.find("select").val();
+        return this.$element.find("select[id=" + this.name + "]").val();
     }
 });
 openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
@@ -857,7 +856,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten
         if (!value) return false;
         _.each(this.selection, function(item) {
             if (_.include(value.split(','), item[0])) {
-                self.$element.find("select option[value='" + item[0] +"']").attr("selected",1)
+                self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1)
             }
          });
     }

From 322bbae26a4d01671ca4d2eaa27e250c5203a80b Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 15 Nov 2011 14:46:15 +0530
Subject: [PATCH 064/114] [IMP] vieweditor :- add selection and value attribute
 on properties attribute and render attributes

bzr revid: ysa@tinyerp.com-20111115091615-w6v2wq3acf5twm6s
---
 addons/web/static/src/js/view_editor.js | 164 ++++++++----------------
 1 file changed, 54 insertions(+), 110 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index eb0cceb387e..c45d5eed4da 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -651,24 +651,61 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
         });
         this.edit_node_dialog.start().open();
+        var _PROPERTIES_ATTRIBUTES = {
+            'name' : {'string': 'Name', 'type': 'char'},
+            'string' : {'string': 'String', 'type': 'char'},
+            'required' : {'string': 'Required', 'type': 'boolean'},
+            'readonly' : {'string': 'Readonly', 'type': 'boolean'},
+            'domain' : {'string': 'Domain', 'type': 'char'},
+            'context' : {'string': 'Context', 'type': 'char'},
+            'limit' : {'string': 'Limit', 'type': 'char'},
+            'min_rows' : {'string': 'Minimum rows', 'type': 'char'},
+            'date_start' : {'string': 'Start date', 'type': 'char'},
+            'date_delay' : {'string': 'Delay date', 'type': 'char'},
+            'day_length' : {'string': 'Day length', 'type': 'char'},
+            'mode' : {'string': 'Mode', 'type': 'char'},
+            'align' : {'string': 'Alignment ', 'type': 'selection', 'selection': [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']]},
+            'icon' : {'string': 'Icon', 'type': 'selection', 'selection': _ICONS},
+            'type' : {'string': 'Type', 'type': 'selection', 'selection': [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']]},
+            'special' : {'string': 'Special', 'type': 'selection', 'selection': [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']]},
+            'target' : {'string': 'Target', 'type': 'selection', 'selection': [['', ''], ['new', 'New Window']]},
+            'confirm' : {'string': 'Confirm', 'type': 'char'},
+            'style' : {'string': 'Style', 'type': 'selection', 'selection':[["",""],["1", "1"],["1-1", "1-1"],["1-2", "1-2"],["2-1", "2-1"],["1-1-1", "1-1-1"]]},
+            'filename' : {'string': 'File Name', 'type': 'char'},
+            'width' : {'string': 'Width', 'type': 'char'},
+            'height' : {'string': 'Height', 'type': 'char'},
+            'attrs' : {'string': 'Attrs', 'type': 'char'},
+            'col' : {'string': 'col', 'type': 'char'},
+            'link' : {'string': 'Link', 'type': 'char'},
+            'position' : {'string': 'Position', 'type': 'selection', 'selection': [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']]},
+            'states' : {'string': 'states', 'type': 'char'},
+            'eval' : {'string': 'Eval', 'type': 'char'},
+            'ref' : {'string': 'Ref', 'type': 'char'},
+            'on_change' : {'string': 'On change', 'type': 'char'},
+            'nolabel' : {'string': 'No label', 'type': 'boolean'},
+            'completion' : {'string': 'Completion', 'type': 'boolean'},
+            'colspan' : {'string': 'Colspan', 'type': 'char'},
+            'widget' : {'string': 'widget', 'type': 'selection'},
+            'groups' : {'string': 'Groups', 'type': 'seleciton_multi'},
+        };
         var widget = _.keys(self.property.map);
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
-        _.each(properties, function(property) {
-            type_widget = false;
-            self.ready  = $.when(self.on_groups(property)).then(function () {
-                if (_.include(widget, property)){
-                    type_widget =  new (self.property.get_any([property])) (self.edit_node_dialog, property);
-                } else {
-                    type_widget = new openerp.web.ViewEditor.FieldChar (self.edit_node_dialog, property);
-                }
+        self.ready  = $.when(self.on_groups(properties)).then(function () {
+            _PROPERTIES_ATTRIBUTES['groups']['selection'] = self.groups;
+            var values = _.keys( openerp.web.form.widgets.map);
+            values.push('');
+            values.sort();
+            _PROPERTIES_ATTRIBUTES['widget']['selection'] = values;
+            _.each(properties, function(property) {
+                var type_widget =  new (self.property.get_any([_PROPERTIES_ATTRIBUTES[property].type])) (self.edit_node_dialog, property);
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
                     return _.include(res, property);
                 });
+                type_widget.selection = _PROPERTIES_ATTRIBUTES[property].selection
                 value = value instanceof Array ? value[1] : value;
-                if (property == 'groups') type_widget.selection = self.groups;
-                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + property + ':</td>' + type_widget.render() + '</tr>');
+                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + _PROPERTIES_ATTRIBUTES[property].string + ':</td>' + type_widget.render() + '</tr>');
                 type_widget.start();
                 type_widget.set_value(value)
                 self.edit_widget.push(type_widget);
@@ -676,12 +713,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
     },
      //for getting groups
-    on_groups: function(property){
+    on_groups: function(properties){
         var self = this,
         def = $.Deferred();
-        if (property != 'groups') {
+        if (!_.include(properties, 'groups')) {
             self.groups = false;
-            return false;
+            def.resolve();
         }
         var group_ids = [],
         group_names = {},
@@ -800,53 +837,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         return this.$element.find("select").val();
     }
 });
-openerp.web.ViewEditor.WidgetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, name) {
-        this._super(view, name);
-        this.registry = openerp.web.form.widgets;
-        var values = _.keys(this.registry.map);
-        values.push('');
-        values.sort();
-        this.selection = values;
-    },
-});
-openerp.web.ViewEditor.IconProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, name) {
-        this._super(view, name);
-        this.selection = _ICONS;
-    },
-});
-openerp.web.ViewEditor.ButtonTargetProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, name) {
-        this._super(view, name);
-        this.selection = [['', ''], ['new', 'New Window']];
-    },
-});
-openerp.web.ViewEditor.ButtonTypeProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, name) {
-        this._super(view, name);
-        this.selection = [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']];
-    },
-});
-openerp.web.ViewEditor.AlignProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, name) {
-        this._super(view, name);
-        this.selection = [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']];
-    },
-});
-openerp.web.ViewEditor.ButtonSpecialProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, name) {
-        this._super(view, name);
-        this.selection = [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']];
-    },
-});
-openerp.web.ViewEditor.PositionProperty = openerp.web.ViewEditor.FieldSelect.extend({
-    init: function(view, name) {
-        this._super(view, name);
-        this.selection = [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']];
-    },
-});
-openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.extend({
+openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.extend({
     start: function () {
         this._super();
         this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple",true);
@@ -864,7 +855,7 @@ openerp.web.ViewEditor.GroupsProperty = openerp.web.ViewEditor.FieldSelect.exten
 });
 var _PROPERTIES = {
     'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
-               'colspan', 'widget', 'eval', 'ref', 'on_change', 'groups', 'attrs'],
+               'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs', 'groups'],
     'form' : ['string', 'col', 'link'],
     'notebook' : ['colspan', 'position', 'groups'],
     'page' : ['string', 'states', 'attrs', 'groups'],
@@ -881,43 +872,6 @@ var _PROPERTIES = {
     'graph' : ['string', 'type'],
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'],
 };
-var _PROPERTIES_ATTRIBUTES = {
-    'name' : {'string': 'Name', 'type': 'char'},
-    'string' : {'string': 'String', 'type': 'char'},
-    'required' : {'string': 'Required', 'type': 'boolean'},
-    'readonly' : {'string': 'Readonly', 'type': 'boolean'},
-    'domain' : {'string': 'Domain', 'type': 'char'},
-    'context' : {'string': 'Context', 'type': 'char'},
-    'limit' : {'string': 'Limit', 'type': 'selection'},
-    'min_rows' : {'string': 'Minimum rows', 'type': 'char'},
-    'date_start' : {'string': 'Start date', 'type': 'char'},
-    'date_delay' : {'string': 'Delay date', 'type': 'char'},
-    'day_length' : {'string': 'Day length', 'type': 'char'},
-    'mode' : {'string': 'Mode', 'type': 'char'},
-    'align' : {'string': 'Alignment ', 'type': 'selection'},
-    'icon' : {'string': 'Icon', 'type': 'selection'},
-    'type' : {'string': 'Type', 'type': 'selection'},
-    'special' : {'string': 'Special', 'type': 'selection'},
-    'target' : {'string': 'Target', 'type': 'selection'},
-    'confirm' : {'string': 'Confirm', 'type': 'char'},
-    'style' : {'string': 'Style', 'type': 'selection'},
-    'filename' : {'string': 'File Name', 'type': 'char'},
-    'width' : {'string': 'Width', 'type': 'char'},
-    'height' : {'string': 'Height', 'type': 'char'},
-    'groups' : {'string': 'Groups', 'type': 'seleciton_multi'},
-    'attrs' : {'string': 'Attrs', 'type': 'char'},
-    'col' : {'string': 'col', 'type': 'char'},
-    'link' : {'string': 'Link', 'type': 'char'},
-    'position' : {'string': 'Position', 'type': 'selection'},
-    'states' : {'string': 'states', 'type': 'char'},
-    'eval' : {'string': 'Eval', 'type': 'char'},
-    'ref' : {'string': 'Ref', 'type': 'char'},
-    'on_change' : {'string': 'On change', 'type': 'char'},
-    'nolabel' : {'string': 'No label', 'type': 'boolean'},
-    'completion' : {'string': 'Completion', 'type': 'boolean'},
-    'colspan' : {'string': 'Colspan', 'type': 'char'},
-    'widget' : {'string': 'widget', 'type': 'selection'},
-};
 var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER',
             'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE',
@@ -946,18 +900,8 @@ var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
 ];
 openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
-    'required' : 'openerp.web.ViewEditor.FieldBoolean',
-    'readonly' : 'openerp.web.ViewEditor.FieldBoolean',
-    'nolabel' : 'openerp.web.ViewEditor.FieldBoolean',
-    'completion' : 'openerp.web.ViewEditor.FieldBoolean',
-    'widget' : 'openerp.web.ViewEditor.WidgetProperty',
-    'groups' : 'openerp.web.ViewEditor.GroupsProperty',
-    'position' : 'openerp.web.ViewEditor.PositionProperty',
-    'icon' : 'openerp.web.ViewEditor.IconProperty',
-    'align' : 'openerp.web.ViewEditor.AlignProperty',
-    'special' : 'openerp.web.ViewEditor.ButtonSpecialProperty',
-    'type' : 'openerp.web.ViewEditor.ButtonTypeProperty',
-    'target' : 'openerp.web.ViewEditor.ButtonTargetProperty',
+    'boolean' : 'openerp.web.ViewEditor.FieldBoolean',
+    'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti',
     'selection' : 'openerp.web.ViewEditor.FieldSelect',
     'char' : 'openerp.web.ViewEditor.FieldChar',
 });

From b1f0df7418d25ea2a5e365dbbc637ae66bab5c9f Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 15 Nov 2011 16:15:39 +0530
Subject: [PATCH 065/114] [IMP] Vieweditor:- implement functionality of
 floatwidget.

bzr revid: ysa@tinyerp.com-20111115104539-418py0oj656q1gr5
---
 addons/web/static/src/js/view_editor.js | 68 +++++++++++++++++--------
 1 file changed, 47 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index c45d5eed4da..5a789856678 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -85,11 +85,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         var view_values = {};
                         var warn = false;
                         _.each(self.create_view_widget, function(widget) {
-                            if (widget.invalid) {
+                            if (widget.is_invalid) {
                                 warn = true;
                                 return false;
                             };
-                            if (widget.dirty && !widget.invalid) {
+                            if (widget.dirty && !widget.is_invalid) {
                                 view_values[widget.name] = widget.get_value();
                             }
                         });
@@ -111,7 +111,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.create_view_dialog.start().open();
         var view_widget = [{'name': 'view_name', 'string':'View Name', 'type': 'char', 'required': true, 'value' : this.model + '.custom_' + Math.round(Math.random() * 1000)},
                            {'name': 'view_type', 'string': 'View Type', 'type': 'selection', 'required': true, 'value': 'Form', 'selection': [['',''],['tree', 'Tree'],['form', 'Form'],['graph', 'Graph'],['calendar', 'Calender']]},
-                           {'name': 'proirity', 'string': 'Priority', 'type': 'char', 'required': true, 'value':'16'}];
+                           {'name': 'proirity', 'string': 'Priority', 'type': 'float', 'required': true, 'value':'16'}];
         this.create_view_dialog.$element.append('<table id="create_view"  style="width:400px" class="oe_forms"></table>');
         this.create_view_widget = [];
         _.each(view_widget, function(widget) {
@@ -120,6 +120,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 type_widget.selection = widget.selection;
             }
             type_widget.required = widget.required;
+            type_widget.type = widget.type;
             self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td width="100px" align="right">' + widget.string + ':</td>' + type_widget.render()+'</tr>');
             var value = null;
             if (widget.value) {
@@ -159,12 +160,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     on_valid_create_view: function() {
         var msg = "<ul>";
         _.each(self.create_view_widget, function(widget) {
-            if (widget.invalid) {
+            if (widget.is_invalid) {
                 msg += "<li>" + widget.name + "</li>";
             }
         });
         msg += "</ul>";
-        self.do_warn("The following fields are invalid :", msg);
+        this.do_warn("The following fields are invalid :", msg);
     },
     add_node_name : function(node) {
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
@@ -636,14 +637,23 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 400,
             buttons: {
                     "Update": function(){
+                        var warn = false;
                         var update_values = [];
                         _.each(self.edit_widget, function(widget) {
-                            if (widget.dirty && !widget.invalid) {
+                            if (widget.is_invalid) {
+                                warn = true;
+                                return false;
+                            };
+                            if (widget.dirty && !widget.is_invalid) {
                                 update_values.push([widget.name, widget.get_value()]);
                             }
                         });
-                        self.do_save_update_arch(obj, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "update_node", update_values);
-                        self.edit_node_dialog.close();
+                        if (warn) {
+                            self.on_valid_create_view();
+                        } else {
+                            self.do_save_update_arch(obj, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "update_node", update_values);
+                            self.edit_node_dialog.close();
+                        }
                     },
                     "Cancel": function(){
                         self.edit_node_dialog.close();
@@ -658,8 +668,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             'readonly' : {'string': 'Readonly', 'type': 'boolean'},
             'domain' : {'string': 'Domain', 'type': 'char'},
             'context' : {'string': 'Context', 'type': 'char'},
-            'limit' : {'string': 'Limit', 'type': 'char'},
-            'min_rows' : {'string': 'Minimum rows', 'type': 'char'},
+            'limit' : {'string': 'Limit', 'type': 'float'},
+            'min_rows' : {'string': 'Minimum rows', 'type': 'float'},
             'date_start' : {'string': 'Start date', 'type': 'char'},
             'date_delay' : {'string': 'Delay date', 'type': 'char'},
             'day_length' : {'string': 'Day length', 'type': 'char'},
@@ -672,10 +682,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             'confirm' : {'string': 'Confirm', 'type': 'char'},
             'style' : {'string': 'Style', 'type': 'selection', 'selection':[["",""],["1", "1"],["1-1", "1-1"],["1-2", "1-2"],["2-1", "2-1"],["1-1-1", "1-1-1"]]},
             'filename' : {'string': 'File Name', 'type': 'char'},
-            'width' : {'string': 'Width', 'type': 'char'},
-            'height' : {'string': 'Height', 'type': 'char'},
+            'width' : {'string': 'Width', 'type': 'float'},
+            'height' : {'string': 'Height', 'type': 'float'},
             'attrs' : {'string': 'Attrs', 'type': 'char'},
-            'col' : {'string': 'col', 'type': 'char'},
+            'col' : {'string': 'col', 'type': 'float'},
             'link' : {'string': 'Link', 'type': 'char'},
             'position' : {'string': 'Position', 'type': 'selection', 'selection': [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']]},
             'states' : {'string': 'states', 'type': 'char'},
@@ -684,8 +694,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             'on_change' : {'string': 'On change', 'type': 'char'},
             'nolabel' : {'string': 'No label', 'type': 'boolean'},
             'completion' : {'string': 'Completion', 'type': 'boolean'},
-            'colspan' : {'string': 'Colspan', 'type': 'char'},
+            'colspan' : {'string': 'Colspan', 'type': 'float'},
             'widget' : {'string': 'widget', 'type': 'selection'},
+            'colors' : {'string': 'Colors', 'type': 'char'},
+            'editable' : {'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]},
             'groups' : {'string': 'Groups', 'type': 'seleciton_multi'},
         };
         var widget = _.keys(self.property.map);
@@ -704,6 +716,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     return _.include(res, property);
                 });
                 type_widget.selection = _PROPERTIES_ATTRIBUTES[property].selection
+                type_widget.type = _PROPERTIES_ATTRIBUTES[property].type
                 value = value instanceof Array ? value[1] : value;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + _PROPERTIES_ATTRIBUTES[property].string + ':</td>' + type_widget.render() + '</tr>');
                 type_widget.start();
@@ -752,27 +765,36 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.dirty = false;
         this.name = name;
         this.required = false;
-        this.invalid = false;
+        this.is_invalid = false;
     },
     start: function () {
         this.$element = this.$element.find("td[id="+ this.name+"]");
         this.update_dom();
     },
     update_dom: function() {
-        this.$element.toggleClass('invalid', this.invalid);
+        this.$element.toggleClass('invalid', this.is_invalid);
         this.$element.toggleClass('required', this.required);
     },
     on_ui_change: function() {
+        this.validate();
         var value = this.get_value();
-        value = value instanceof Array ? value[1] : value;
-        if (this.required && !value) {
-            this.invalid = true;
+        if (this.is_invalid) {
+            this.is_invalid = true;
         } else {
-            this.invalid = false;
+            this.is_invalid = false;
         }
         this.dirty = true;
         this.update_dom();
     },
+    validate: function() {
+        this.is_invalid = false;
+        try {
+            var value = openerp.web.parse_value(this.get_value(), this, '');
+            this.is_invalid = this.required && value === '';
+        } catch(e) {
+            this.is_invalid = true;
+        }
+    },
     render: function() {
         return _.sprintf("<td id = %s>%s</td>", this.name, QWeb.render(this.template, {widget: this}))
     },
@@ -785,7 +807,6 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         this.$element.find("input").change(function() {
             self.on_ui_change();
         });
-
     },
     set_value: function(value) {
         if (value) {
@@ -853,6 +874,10 @@ openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.ext
          });
     }
 });
+openerp.web.ViewEditor.FieldFloat = openerp.web.ViewEditor.FieldChar.extend({
+
+});
+
 var _PROPERTIES = {
     'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion',
                'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs', 'groups'],
@@ -904,5 +929,6 @@ openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
     'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti',
     'selection' : 'openerp.web.ViewEditor.FieldSelect',
     'char' : 'openerp.web.ViewEditor.FieldChar',
+    'float' : 'openerp.web.ViewEditor.FieldFloat',
 });
 };

From a42aeec255b27ab34dbc6533c2be8ca8c27dedcf Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 15 Nov 2011 16:22:03 +0530
Subject: [PATCH 066/114] [IMP] vieweidtor :- improve warning method.

bzr revid: ysa@tinyerp.com-20111115105203-umsohg7hz8evuh79
---
 addons/web/static/src/js/view_editor.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 5a789856678..5c576b2267d 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -94,7 +94,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             }
                         });
                         if (warn) {
-                            self.on_valid_create_view();
+                            self.on_valid_create_view(self.create_view_widget);
                         } else {
                             $.when(self.do_save_view(view_values)).then(function() {
                                 self.create_view_dialog.close();
@@ -157,9 +157,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         return def.promise();
     },
-    on_valid_create_view: function() {
+    on_valid_create_view: function(widgets) {
         var msg = "<ul>";
-        _.each(self.create_view_widget, function(widget) {
+        _.each(widgets, function(widget) {
             if (widget.is_invalid) {
                 msg += "<li>" + widget.name + "</li>";
             }
@@ -649,7 +649,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             }
                         });
                         if (warn) {
-                            self.on_valid_create_view();
+                            self.on_valid_create_view(self.edit_widget);
                         } else {
                             self.do_save_update_arch(obj, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "update_node", update_values);
                             self.edit_node_dialog.close();

From 8ec52797ad2b63c900087506cf945d6aaeb792d9 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 15 Nov 2011 16:51:19 +0530
Subject: [PATCH 067/114] [IMP] Vieweditor :- improve on_ui_change method.

bzr revid: ysa@tinyerp.com-20111115112119-vopxmyqheoyci7vu
---
 addons/web/static/src/js/view_editor.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index fcfe7e5bd34..f023db74bbd 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -776,12 +776,6 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     },
     on_ui_change: function() {
         this.validate();
-        var value = this.get_value();
-        if (this.is_invalid) {
-            this.is_invalid = true;
-        } else {
-            this.is_invalid = false;
-        }
         this.dirty = true;
         this.update_dom();
     },

From 915ec137ab90a38caaea81eb808345640aff891d Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 15 Nov 2011 17:44:34 +0530
Subject: [PATCH 068/114] [IMP] implement code for remove element in view
 editor.

bzr revid: vme@tinyerp.com-20111115121434-u0x8pf6nf9clcp6r
---
 addons/web/static/src/js/view_editor.js | 35 ++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 4dc4eab5301..9f89ac0314b 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -459,6 +459,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             });
                     break;
                 case "side-remove":
+                    self.do_save_update_arch
+                        (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node");
                     break;
                 case "side-edit":
                     var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
@@ -591,11 +593,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     $(next).after(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
+                    var parent = $(arch1).parents();
                 } else if (move_direct == "up") {
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
+                    var parent = $(arch1).parents();
                 } else if (move_direct == "update_node") {
                     _.each(update_values, function(val){
                         if(val[0] == "required"){
@@ -608,6 +612,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     new_obj.id = obj.id,new_obj.child_id = obj.child_id;
                     self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
+                    var parent = $(arch1).parents();
                 }else if(move_direct == "add_node"){
                      switch (update_values[1]) {
                         case "After":
@@ -620,8 +625,17 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             $(arch1).append(update_values[0]);
                             break;
                     }
+                    var parent = $(arch1).parents();
+                }else if(move_direct == "remove_node"){
+                    var parent = $(arch1).parents();
+                    $(arch1).remove();
+                    child_list.splice(index,1);
+                    var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']");
+                    _.each(self.get_list_tr(cur_tr,obj.level), function(tr_element){
+                        tr_element.remove();
+                    });
+                    cur_tr.remove();
                 }
-                var parent = $(arch1).parents();
                 var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1;
                 convert_to_utf = QWeb.tools.xml_node_to_string(convert_to_utf);
                 convert_to_utf = convert_to_utf.replace('xmlns="http://www.w3.org/1999/xhtml"', "");
@@ -645,12 +659,18 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     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-']");
+        _.each(this.get_list_tr(cur_tr,level), function(tr_element){
+            tr_element.hide();
+        });
+    },
+    get_list_tr: function(cur_tr,level){
+        tr_list = [];
         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;
+                tr_list.push(nxt_tr);
+            } else return tr_list;
         }
     },
     on_collapse: function(collapse_img, parent_child_id, id, main_object) {
@@ -807,7 +827,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     render_new_field :function(id){
         var action = {
-            context: {'default_model_id':id, 'manual':true},//self.session.user_context,
+            context: {'default_model_id':id, 'manual':true},
             res_model: "ir.model.fields",
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
@@ -818,6 +838,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         var action_manager = new openerp.web.ActionManager(self);
         action_manager.do_action(action);
+        $.when(action_manager.do_action(action)).then(function() {
+            var add_controller = action_manager.dialog_viewmanager.views['form'].controller;
+            add_controller.do_set_readonly.add_last(function(){
+                var aa = controller;
+            });
+        });
+
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({

From 5ed7d8a8c262cb32a127c92b8b754d36128f5f16 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 16 Nov 2011 13:14:41 +0530
Subject: [PATCH 069/114] [IMP]improve code for remove view in remove node
 functionality.

bzr revid: vme@tinyerp.com-20111116074441-eduxxr9o2ceno92h
---
 addons/web/static/src/js/view_editor.js | 57 ++++++++++++++++---------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 9f89ac0314b..b4ca58eb8ee 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -415,7 +415,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() {
             var side = $(this).closest("tr[id^='viewedit-']");
-            var clicked_tr_id = (side.attr('id')).split('-')[1];
+            var clicked_tr_id = parseInt((side.attr('id')).split('-')[1]);
             var img = side.find("img[id='parentimg-" + clicked_tr_id + "']").attr('src');
             var clicked_tr_level = parseInt(side.attr('level'));
             var cur_tr = side;
@@ -427,16 +427,24 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             var view_xml_id;
             var view_find = side;
             var min_level = clicked_tr_level;
-            while (1) {
-                view_find = view_find.prev();
-                if ((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 = (view_find.attr('id')).split('-')[1];
-                    break;
-                }
-                if(view_find.attr('level') < min_level){
-                    min_level = parseInt(view_find.attr('level'));
+            if(($(side).find('a').text()).search("view_id") != -1){
+                view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
+                view_xml_id = (view_find.attr('id')).split('-')[1];
+                clicked_tr_id  += 1;
+                clicked_tr_level += 1;
+            }else{
+                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 = (view_find.attr('id')).split('-')[1];
+                        break;
+                    }
+                    if(view_find.attr('level') < min_level){
+                        min_level = parseInt(view_find.attr('level'));
+                    }
                 }
             }
             switch (this.id) {
@@ -563,6 +571,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], 
                     parseInt(clicked_tr_id), [], parseInt(clicked_tr_level),
                             parseInt(view_id), arch, move_direct, update_values);
@@ -628,21 +637,31 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     var parent = $(arch1).parents();
                 }else if(move_direct == "remove_node"){
                     var parent = $(arch1).parents();
+                    if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){
+                        id = id -1;
+                        level = level - 1;
+                        (parent.length == 0)?parent.push("remove_view"):false;
+                    }
                     $(arch1).remove();
                     child_list.splice(index,1);
-                    var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']");
-                    _.each(self.get_list_tr(cur_tr,obj.level), function(tr_element){
+                    var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id +"']");
+                    _.each(self.get_list_tr(cur_tr,level), function(tr_element){
                         tr_element.remove();
                     });
                     cur_tr.remove();
                 }
                 var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1;
-                convert_to_utf = QWeb.tools.xml_node_to_string(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;
-                this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
-                });
+                if(convert_to_utf != "remove_view"){
+                    convert_to_utf = QWeb.tools.xml_node_to_string(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;
+                    /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
+                    });*/
+                }else{
+                    /*this.dataset.unlink([parseInt(view_id)],function(res) {
+                    });*/
+                }
                 if(move_direct == "add_node"){
                     self.add_node_dialog.close();
                     self.edit_xml_dialog.close();

From d9d16da37b151c19f069761be3151dcc2c27b267 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 16 Nov 2011 14:33:32 +0530
Subject: [PATCH 070/114] [IMP] Vieweditor :- improve code .

bzr revid: ysa@tinyerp.com-20111116090332-jol5v8k7ahq5nhuu
---
 addons/web/static/src/js/view_editor.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f023db74bbd..fbdaa6ed7de 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -376,7 +376,15 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 500,
             buttons: {
                 "Inherited View": function() {
-                    //todo
+                    var selected_row = self.edit_xml_dialog.$element.find('.ui-selected');
+                    if (selected_row.length) {
+                        var xml_arch = QWeb.load_xml(selected_row.find('a').text());
+                        var tag_name = xml_arch.childNodes? xml_arch.childNodes[0].tagName: "";
+                        console.log(" xml_arch.childNodes[0]::::", xml_arch.childNodes[0].getAttribute());
+                        if (tag_name == 'field') {
+                            return true;
+                        }
+                    }
                 },
                 "Preview": function() {
                     var action = {
@@ -700,7 +708,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             'editable' : {'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]},
             'groups' : {'string': 'Groups', 'type': 'seleciton_multi'},
         };
-        var widget = _.keys(self.property.map);
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
@@ -746,7 +753,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     group_names[key]=res.name;
                     group_ids.push(res.id);
                 });
-            model_data
+                model_data
                 .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]})
                 .done(function(model_grp) {
                     _.each(model_grp,function(res_group){
@@ -807,7 +814,8 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         }
     },
     get_value: function() {
-        return this.$element.find("input[id=" + this.name + "]").is(':checked') || null;
+        var value = this.$element.find("input[id=" + this.name + "]").is(':checked')
+        return  value? "1" : null;
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({

From a03506d84a45429dcfade2e33625dcadd0a554ad Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 16 Nov 2011 14:34:21 +0530
Subject: [PATCH 071/114] [IMP]improve code in view editor.

bzr revid: vme@tinyerp.com-20111116090421-qri7wmviyiygoxlo
---
 addons/web/static/src/js/view_editor.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index b4ca58eb8ee..77d61a2d228 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -467,8 +467,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             });
                     break;
                 case "side-remove":
-                    self.do_save_update_arch
-                        (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node");
+                    if (confirm(_t("Do you really want to remove this node?"))) {
+                        self.do_save_update_arch
+                            (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node");
+                    }
                     break;
                 case "side-edit":
                     var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
@@ -656,11 +658,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     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;
-                    /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
-                    });*/
+                    this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
+                    });
                 }else{
-                    /*this.dataset.unlink([parseInt(view_id)],function(res) {
-                    });*/
+                    this.dataset.unlink([parseInt(view_id)],function(res) {
+                    });
                 }
                 if(move_direct == "add_node"){
                     self.add_node_dialog.close();

From a081cdf79bb1ea53997a3c8a36deaaa857e9e160 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 16 Nov 2011 14:53:08 +0530
Subject: [PATCH 072/114] [IMP] vieweditor :- improve code in fetch tagname on
 edit node.

bzr revid: ysa@tinyerp.com-20111116092308-9iv5coeqbu1cgdsb
---
 addons/web/static/src/js/view_editor.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index fbdaa6ed7de..9bbfbdf8f9a 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -458,12 +458,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-remove":
                     break;
                 case "side-edit":
-                    var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
-                    var tag = _.detect(_.keys(_PROPERTIES),function(res){
-                        return _.includes(tr, res);
-                    });
-                    var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+                    var xml_arch = QWeb.load_xml($(this).closest("tr[id^='viewedit-']").find('a').text());
+                    var tag_name = xml_arch.childNodes? xml_arch.childNodes[0].tagName: false;
+                    if (tag_name) {
+                        var properties = _PROPERTIES[tag_name];
+                        self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+                    }
                     break;
                 case "side-up":
                     while (1) {

From bc3a1f52940ec65db7b72141490711aacb6703a5 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Wed, 16 Nov 2011 17:06:24 +0530
Subject: [PATCH 073/114] [IMP] vieweditor :- remove inherit button code and
 improve code.

bzr revid: ysa@tinyerp.com-20111116113624-p1dwbl4oefut2lse
---
 addons/web/static/src/js/view_editor.js | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 9bbfbdf8f9a..e2f818870ec 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -376,15 +376,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 500,
             buttons: {
                 "Inherited View": function() {
-                    var selected_row = self.edit_xml_dialog.$element.find('.ui-selected');
-                    if (selected_row.length) {
-                        var xml_arch = QWeb.load_xml(selected_row.find('a').text());
-                        var tag_name = xml_arch.childNodes? xml_arch.childNodes[0].tagName: "";
-                        console.log(" xml_arch.childNodes[0]::::", xml_arch.childNodes[0].getAttribute());
-                        if (tag_name == 'field') {
-                            return true;
-                        }
-                    }
+                    //TODO
                 },
                 "Preview": function() {
                     var action = {
@@ -458,12 +450,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-remove":
                     break;
                 case "side-edit":
-                    var xml_arch = QWeb.load_xml($(this).closest("tr[id^='viewedit-']").find('a').text());
-                    var tag_name = xml_arch.childNodes? xml_arch.childNodes[0].tagName: false;
-                    if (tag_name) {
-                        var properties = _PROPERTIES[tag_name];
-                        self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
-                    }
+                    var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
+                    var tag = _.detect(_.keys(_PROPERTIES),function(res){
+                        return _.include(tr, res);
+                    });
+                    var properties = _PROPERTIES[tag];
+                    self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
                     break;
                 case "side-up":
                     while (1) {

From a2bc7dc12c7824299881dd1ccfb7613c849e81e0 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Nov 2011 11:24:36 +0530
Subject: [PATCH 074/114] [FIX] Vieweditor :- fix some merge problem like
 change _.sprintf to _.str.sprintf.

bzr revid: ysa@tinyerp.com-20111117055436-3pqgbd7exh4h18sm
---
 addons/web/static/src/js/view_editor.js | 43 +++++++++++++------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index e2f818870ec..d2e9cb84dc0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -17,7 +17,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     init_view_editor: function() {
         var self = this;
         var action = {
-            name: _.sprintf("Manage Views (%s)", this.model),
+            name: _.str.sprintf("Manage Views (%s)", this.model),
             context: this.session.user_context,
             domain: [["model", "=", this.model]],
             res_model: 'ir.ui.view',
@@ -77,7 +77,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         this.create_view_dialog = new openerp.web.Dialog(this, {
             modal: true,
-            title: _.sprintf("Create a view (%s)", self.model),
+            title: _.str.sprintf("Create a view (%s)", self.model),
             width: 500,
             height: 400,
             buttons: {
@@ -147,7 +147,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             if (field_name) {
                 model_dataset.read_slice(['name','field_id'], {"domain": [['model','=',self.model]]}, function(records) {
                     if (records) {view_string = records[0].name;}
-                    var arch = _.sprintf("<?xml version='1.0'?>\n<%s string='%s'>\n\t<field name='%s'/>\n</%s>", values.view_type, view_string, field_name, values.view_type);
+                    var arch = _.str.sprintf("<?xml version='1.0'?>\n<%s string='%s'>\n\t<field name='%s'/>\n</%s>", values.view_type, view_string, field_name, values.view_type);
                     var vals = {'model': self.model, 'name': values.view_name, 'priority': values.priority, 'type': values.view_type, 'arch': arch};
                     self.dataset.create(vals, function(suc) {
                         def.resolve();
@@ -170,16 +170,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     add_node_name : function(node) {
         if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){
             return (node.getAttribute('name'))?
-                _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
-                _.sprintf( "<%s>",node.tagName.toLowerCase());
+                _.str.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')):
+                _.str.sprintf( "<%s>",node.tagName.toLowerCase());
         }else if(node.tagName.toLowerCase() == "group"){
             return (node.getAttribute('string'))?
-                _.sprintf( "<%s>",node.getAttribute('string')):
-                _.sprintf( "<%s>",node.tagName.toLowerCase());
+                _.str.sprintf( "<%s>",node.getAttribute('string')):
+                _.str.sprintf( "<%s>",node.tagName.toLowerCase());
         }else{
             return (node.getAttribute('string'))?
-                _.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')):
-                _.sprintf( "<%s>",node.tagName.toLowerCase());
+                _.str.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')):
+                _.str.sprintf( "<%s>",node.tagName.toLowerCase());
         }
     },
     do_delete_view: function() {
@@ -241,7 +241,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             'level': 0,
             'id': this.xml_element_id +=1,
             'att_list': [],
-            'name': _.sprintf("<view view_id = %s>", view_id),
+            'name': _.str.sprintf("<view view_id = %s>", view_id),
             'child_id': []
         };
         var xml_arch = QWeb.load_xml(arch);
@@ -298,7 +298,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"), ""));
                 });
             }else{
-                var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
+                var temp = _.str.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
                     return _.include(list, "position")
                 });
                 expr_to_list = [_.flatten(temp)];
@@ -371,7 +371,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         this.edit_xml_dialog = new openerp.web.Dialog(this, {
             modal: true,
-            title: _.sprintf("View Editor %d - %s", self.main_view_id, self.model),
+            title: _.str.sprintf("View Editor %d - %s", self.main_view_id, self.model),
             width: 750,
             height: 500,
             buttons: {
@@ -450,12 +450,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-remove":
                     break;
                 case "side-edit":
-                    var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
-                    var tag = _.detect(_.keys(_PROPERTIES),function(res){
-                        return _.include(tr, res);
-                    });
-                    var properties = _PROPERTIES[tag];
-                    self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+                    var row_id = $(this).closest("tr[id^='viewedit-']").attr('id').split("-")[1];
+                    var result = self.get_object_by_id(row_id, one_object['main_object'], []);
+                    if (result.length && result[0] && result[0].att_list) {
+                        var properties = _PROPERTIES[result[0].att_list[0]];
+                        self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+                    }
                     break;
                 case "side-up":
                     while (1) {
@@ -712,7 +712,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             _.each(properties, function(property) {
                 var type_widget =  new (self.property.get_any([_PROPERTIES_ATTRIBUTES[property].type])) (self.edit_node_dialog, property);
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
-                    return _.include(res, property);
+                    if (res instanceof Array) {
+                        return _.include(res, property);
+                    }
+                    return false;
                 });
                 type_widget.selection = _PROPERTIES_ATTRIBUTES[property].selection
                 type_widget.type = _PROPERTIES_ATTRIBUTES[property].type
@@ -788,7 +791,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         }
     },
     render: function() {
-        return _.sprintf("<td id = %s>%s</td>", this.name, QWeb.render(this.template, {widget: this}))
+        return _.str.sprintf("<td id = %s>%s</td>", this.name, QWeb.render(this.template, {widget: this}))
     },
 });
 openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({

From 1d76679c4ac1cf2130c589346d87670be877d231 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Nov 2011 11:35:20 +0530
Subject: [PATCH 075/114] [IMP] vieweditor :- used setAttribute and
 removeAttribute instead of attr.

bzr revid: ysa@tinyerp.com-20111117060520-x0z8xvb4q5s8s1yt
---
 addons/web/static/src/js/view_editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index d2e9cb84dc0..8747e597b79 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -583,7 +583,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                 } else if (move_direct == "update_node") {
                     _.each(update_values, function(val){
-                        $(arch1).attr(val[0],val[1]);
+                        if (val[1]) $(arch1)[0].setAttribute(val[0], val[1]);
+                        else $(arch1)[0].removeAttribute(val[0]);
                     });
                     var new_obj = self.create_View_Node(arch1);
                     new_obj.id = obj.id,new_obj.child_id = obj.child_id;

From 7a71c2c821fd0548edc4e819d91b1b07a4ead8db Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Nov 2011 11:41:36 +0530
Subject: [PATCH 076/114] [IMP] vieweditor :- improve some small issue.

bzr revid: ysa@tinyerp.com-20111117061136-h4eh9ksi2kydqaz5
---
 addons/web/static/src/js/view_editor.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8747e597b79..ae1d8e9c2ed 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -569,7 +569,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var list_obj_xml = _.zip(children_list, obj.child_id);
         if (id) {
             if (obj.id == id) {
-                var id;
+                var id = false;;
                 var index = _.indexOf(child_list, obj);
                 if (move_direct == "down") {
                     var next = $(arch1).next();
@@ -594,10 +594,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 var parent = $(arch1).parents();
                 var convert_to_utf = QWeb.tools.xml_node_to_string(parent[parent.length-1]);
                 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;
-                this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
-                });
+                arch.arch = '<?xml version="1.0"?>' + convert_to_utf;
+                this.dataset.write(parseInt(view_id), {"arch":convert_to_utf});
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {

From d272f9d03b03049da42378fce434c4713f613eb6 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Thu, 17 Nov 2011 12:25:25 +0530
Subject: [PATCH 077/114] [IMP] implement functionlity of new field add.

bzr revid: vme@tinyerp.com-20111117065525-60ooggze1xh38v63
---
 addons/web/static/src/js/view_editor.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 77d61a2d228..8ebd617e0c2 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -847,6 +847,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
     },
     render_new_field :function(id){
+        var self = this;
         var action = {
             context: {'default_model_id':id, 'manual':true},
             res_model: "ir.model.fields",
@@ -858,14 +859,21 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         }
         var action_manager = new openerp.web.ActionManager(self);
-        action_manager.do_action(action);
         $.when(action_manager.do_action(action)).then(function() {
-            var add_controller = action_manager.dialog_viewmanager.views['form'].controller;
-            add_controller.do_set_readonly.add_last(function(){
-                var aa = controller;
+            var controller = action_manager.dialog_viewmanager.views['form'].controller;
+            controller.do_set_readonly.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'], function(result) {
+                self.add_node_dialog.$element.
+                    find('select[id=field_value]'). append($("<option></option>").
+                    attr("value",result[0].name).text(result[0].name));
+                    _.detect(self.add_widget,function(widget){
+                        (widget.name == "field_value")?widget.selection.push(result[0].name):false;
+                      });
+                });
             });
         });
-
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({

From 3da3b4873a486df35fb6a315757eda260a71b7b7 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Nov 2011 12:38:40 +0530
Subject: [PATCH 078/114] [IMP] Vieweditor :- improve widget.

bzr revid: ysa@tinyerp.com-20111117070840-obtnw5c98e7ywncz
---
 addons/web/static/src/js/view_editor.js | 103 +++++++++++-------------
 1 file changed, 47 insertions(+), 56 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ae1d8e9c2ed..8051aa8f7cd 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -115,12 +115,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.create_view_dialog.$element.append('<table id="create_view"  style="width:400px" class="oe_forms"></table>');
         this.create_view_widget = [];
         _.each(view_widget, function(widget) {
-            var type_widget =  new (self.property.get_any([widget.type])) (self.create_view_dialog, widget.name);
-            if (widget.selection) {
-                type_widget.selection = widget.selection;
-            }
-            type_widget.required = widget.required;
-            type_widget.type = widget.type;
+            var type_widget =  new (self.property.get_any([widget.type])) (self.create_view_dialog, widget);
             self.create_view_dialog.$element.find('table[id=create_view]').append('<tr><td width="100px" align="right">' + widget.string + ':</td>' + type_widget.render()+'</tr>');
             var value = null;
             if (widget.value) {
@@ -450,8 +445,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 case "side-remove":
                     break;
                 case "side-edit":
-                    var row_id = $(this).closest("tr[id^='viewedit-']").attr('id').split("-")[1];
-                    var result = self.get_object_by_id(row_id, one_object['main_object'], []);
+                    var result = self.get_object_by_id(clicked_tr_id, one_object['main_object'], []);
                     if (result.length && result[0] && result[0].att_list) {
                         var properties = _PROPERTIES[result[0].att_list[0]];
                         self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
@@ -661,43 +655,43 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         this.edit_node_dialog.start().open();
         var _PROPERTIES_ATTRIBUTES = {
-            'name' : {'string': 'Name', 'type': 'char'},
-            'string' : {'string': 'String', 'type': 'char'},
-            'required' : {'string': 'Required', 'type': 'boolean'},
-            'readonly' : {'string': 'Readonly', 'type': 'boolean'},
-            'domain' : {'string': 'Domain', 'type': 'char'},
-            'context' : {'string': 'Context', 'type': 'char'},
-            'limit' : {'string': 'Limit', 'type': 'float'},
-            'min_rows' : {'string': 'Minimum rows', 'type': 'float'},
-            'date_start' : {'string': 'Start date', 'type': 'char'},
-            'date_delay' : {'string': 'Delay date', 'type': 'char'},
-            'day_length' : {'string': 'Day length', 'type': 'char'},
-            'mode' : {'string': 'Mode', 'type': 'char'},
-            'align' : {'string': 'Alignment ', 'type': 'selection', 'selection': [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']]},
-            'icon' : {'string': 'Icon', 'type': 'selection', 'selection': _ICONS},
-            'type' : {'string': 'Type', 'type': 'selection', 'selection': [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']]},
-            'special' : {'string': 'Special', 'type': 'selection', 'selection': [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']]},
-            'target' : {'string': 'Target', 'type': 'selection', 'selection': [['', ''], ['new', 'New Window']]},
-            'confirm' : {'string': 'Confirm', 'type': 'char'},
-            'style' : {'string': 'Style', 'type': 'selection', 'selection':[["",""],["1", "1"],["1-1", "1-1"],["1-2", "1-2"],["2-1", "2-1"],["1-1-1", "1-1-1"]]},
-            'filename' : {'string': 'File Name', 'type': 'char'},
-            'width' : {'string': 'Width', 'type': 'float'},
-            'height' : {'string': 'Height', 'type': 'float'},
-            'attrs' : {'string': 'Attrs', 'type': 'char'},
-            'col' : {'string': 'col', 'type': 'float'},
-            'link' : {'string': 'Link', 'type': 'char'},
-            'position' : {'string': 'Position', 'type': 'selection', 'selection': [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']]},
-            'states' : {'string': 'states', 'type': 'char'},
-            'eval' : {'string': 'Eval', 'type': 'char'},
-            'ref' : {'string': 'Ref', 'type': 'char'},
-            'on_change' : {'string': 'On change', 'type': 'char'},
-            'nolabel' : {'string': 'No label', 'type': 'boolean'},
-            'completion' : {'string': 'Completion', 'type': 'boolean'},
-            'colspan' : {'string': 'Colspan', 'type': 'float'},
-            'widget' : {'string': 'widget', 'type': 'selection'},
-            'colors' : {'string': 'Colors', 'type': 'char'},
-            'editable' : {'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]},
-            'groups' : {'string': 'Groups', 'type': 'seleciton_multi'},
+            'name' : {'name':'name', 'string': 'Name', 'type': 'char'},
+            'string' : {'name':'string', 'string': 'String', 'type': 'char'},
+            'required' : {'name':'required', 'string': 'Required', 'type': 'boolean'},
+            'readonly' : {'name':'readonly', 'string': 'Readonly', 'type': 'boolean'},
+            'domain' : {'name':'domain', 'string': 'Domain', 'type': 'char'},
+            'context' : {'name':'context', 'string': 'Context', 'type': 'char'},
+            'limit' : {'name':'limit', 'string': 'Limit', 'type': 'float'},
+            'min_rows' : {'name':'min_rows', 'string': 'Minimum rows', 'type': 'float'},
+            'date_start' : {'name':'date_start', 'string': 'Start date', 'type': 'char'},
+            'date_delay' : {'name':'date_delay', 'string': 'Delay date', 'type': 'char'},
+            'day_length' : {'name':'day_length', 'string': 'Day length', 'type': 'char'},
+            'mode' : {'name':'mode', 'string': 'Mode', 'type': 'char'},
+            'align' : {'name':'align', 'string': 'Alignment ', 'type': 'selection', 'selection': [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']]},
+            'icon' : {'name':'icon', 'string': 'Icon', 'type': 'selection', 'selection': _ICONS},
+            'type' : {'name':'type', 'string': 'Type', 'type': 'selection', 'selection': [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']]},
+            'special' : {'name':'special', 'string': 'Special', 'type': 'selection', 'selection': [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']]},
+            'target' : {'name':'target', 'string': 'Target', 'type': 'selection', 'selection': [['', ''], ['new', 'New Window']]},
+            'confirm' : {'name':'confirm', 'string': 'Confirm', 'type': 'char'},
+            'style' : {'name':'style', 'string': 'Style', 'type': 'selection', 'selection':[["",""],["1", "1"],["1-1", "1-1"],["1-2", "1-2"],["2-1", "2-1"],["1-1-1", "1-1-1"]]},
+            'filename' : {'name':'filename', 'string': 'File Name', 'type': 'char'},
+            'width' : {'name':'width', 'string': 'Width', 'type': 'float'},
+            'height' : {'name':'height', 'string': 'Height', 'type': 'float'},
+            'attrs' : {'name':'attrs', 'string': 'Attrs', 'type': 'char'},
+            'col' : {'name':'col', 'string': 'col', 'type': 'float'},
+            'link' : {'name':'link', 'string': 'Link', 'type': 'char'},
+            'position' : {'name':'position', 'string': 'Position', 'type': 'selection', 'selection': [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']]},
+            'states' : {'name':'states', 'string': 'states', 'type': 'char'},
+            'eval' : {'name':'eval', 'string': 'Eval', 'type': 'char'},
+            'ref' : {'name':'ref', 'string': 'Ref', 'type': 'char'},
+            'on_change' : {'name':'on_change', 'string': 'On change', 'type': 'char'},
+            'nolabel' : {'name':'nolabel', 'string': 'No label', 'type': 'boolean'},
+            'completion' : {'name':'completion', 'string': 'Completion', 'type': 'boolean'},
+            'colspan' : {'name':'colspan', 'string': 'Colspan', 'type': 'float'},
+            'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'},
+            'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'},
+            'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]},
+            'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'},
         };
         var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
@@ -709,15 +703,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             values.sort();
             _PROPERTIES_ATTRIBUTES['widget']['selection'] = values;
             _.each(properties, function(property) {
-                var type_widget =  new (self.property.get_any([_PROPERTIES_ATTRIBUTES[property].type])) (self.edit_node_dialog, property);
+                var type_widget =  new (self.property.get_any([_PROPERTIES_ATTRIBUTES[property].type])) (self.edit_node_dialog, _PROPERTIES_ATTRIBUTES[property]);
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
                     if (res instanceof Array) {
                         return _.include(res, property);
                     }
                     return false;
                 });
-                type_widget.selection = _PROPERTIES_ATTRIBUTES[property].selection
-                type_widget.type = _PROPERTIES_ATTRIBUTES[property].type
                 value = value instanceof Array ? value[1] : value;
                 self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + _PROPERTIES_ATTRIBUTES[property].string + ':</td>' + type_widget.render() + '</tr>');
                 type_widget.start();
@@ -761,11 +753,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     }
 });
 openerp.web.ViewEditor.Field = openerp.web.Class.extend({
-    init: function(view, name) {
+    init: function(view, widget) {
         this.$element = view.$element;
         this.dirty = false;
-        this.name = name;
-        this.required = false;
+        this.name = widget.name;
+        this.selection =  widget.selection || [];
+        this.required = widget.required || false;
+        this.string = widget.string || "";
+        this.type = widget.type;
         this.is_invalid = false;
     },
     start: function () {
@@ -830,10 +825,6 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
 });
 openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
     template : "vieweditor_selection",
-    init: function(view, name) {
-        this._super(view, name);
-        this.selection = false;
-    },
     start: function () {
         var self = this;
         this._super();
@@ -883,7 +874,7 @@ var _PROPERTIES = {
     'image' : ['filename', 'width', 'height', 'groups'],
     'separator' : ['string', 'colspan', 'groups'],
     'label': ['string', 'align', 'colspan', 'groups'],
-    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'groups','colspan'],
+    'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'colspan', 'groups'],
     'newline' : [],
     'board': ['style'],
     'column' : [],

From fa3998b7440cc8a3a17f85c6fb0de9e5102db9ba Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Nov 2011 14:17:39 +0530
Subject: [PATCH 079/114] [IMP] Vieweditor :- improve edit field dialog box.

bzr revid: ysa@tinyerp.com-20111117084739-lzj2jw8woj984054
---
 addons/web/static/src/js/view_editor.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8051aa8f7cd..e3f78968d86 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -702,16 +702,15 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             values.push('');
             values.sort();
             _PROPERTIES_ATTRIBUTES['widget']['selection'] = values;
-            _.each(properties, function(property) {
-                var type_widget =  new (self.property.get_any([_PROPERTIES_ATTRIBUTES[property].type])) (self.edit_node_dialog, _PROPERTIES_ATTRIBUTES[property]);
+            var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function(property){ return _.include(properties, property.name)})
+            _.each(widgets, function(widget) {
+                var type_widget =  new (self.property.get_any([widget.type])) (self.edit_node_dialog, widget);
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
-                    if (res instanceof Array) {
-                        return _.include(res, property);
-                    }
-                    return false;
+                    if (res instanceof Array) return _.include(res, widget.name);
+                    else return false;
                 });
                 value = value instanceof Array ? value[1] : value;
-                self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + _PROPERTIES_ATTRIBUTES[property].string + ':</td>' + type_widget.render() + '</tr>');
+                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();
                 type_widget.set_value(value)
                 self.edit_widget.push(type_widget);

From fa079e79f5108dec64d30bd4dce52071874b0d48 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Nov 2011 15:28:54 +0530
Subject: [PATCH 080/114] [FIX]

bzr revid: ysa@tinyerp.com-20111117095854-w7ivkrucm32g5ug9
---
 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 e3f78968d86..f4bb3b99f63 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -293,7 +293,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"), ""));
                 });
             }else{
-                var temp = _.str.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
+                var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
                     return _.include(list, "position")
                 });
                 expr_to_list = [_.flatten(temp)];

From aa08bb9368d96e260e5416130be2b491e4546c04 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Thu, 17 Nov 2011 15:43:16 +0530
Subject: [PATCH 081/114] [FIX] Vieweditor :- if type is tree then pass list
 view in action.

bzr revid: ysa@tinyerp.com-20111117101316-9t8saf6t9wfgr9yz
---
 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 f4bb3b99f63..825b8f6f689 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -248,7 +248,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], 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
+                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)]]}, function(result) {
                     _.each(result, function(res) {

From 379c9fab24836c91b42e216afa7371f2533785e3 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 18 Nov 2011 11:29:03 +0530
Subject: [PATCH 082/114] [IMP]code refactor.

bzr revid: vme@tinyerp.com-20111118055903-llouzhuhdw5j64mh
---
 addons/web/static/src/js/view_editor.js | 74 ++++++++++++++++++-------
 1 file changed, 55 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 8ebd617e0c2..af73b3c31fa 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -10,6 +10,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         this.model = dataset.model;
         this.xml_element_id = 0;
         this.property = openerp.web.ViewEditor.property_widget;
+        this.one_object;
     },
     start: function() {
         this.init_view_editor();
@@ -402,6 +403,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         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');
+            console.log(self);
         });
         this.edit_xml_dialog.$element.find("img[id^='parentimg-']").click(function() {
             if ($(this).attr('src') == '/web/static/src/img/collapse.gif') {
@@ -414,6 +416,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             }
         });
         this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() {
+
+        });
+    },
+    what_to_do: function(){
+            var self = this;
             var side = $(this).closest("tr[id^='viewedit-']");
             var clicked_tr_id = parseInt((side.attr('id')).split('-')[1]);
             var img = side.find("img[id='parentimg-" + clicked_tr_id + "']").attr('src');
@@ -468,6 +475,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     break;
                 case "side-remove":
                     if (confirm(_t("Do you really want to remove this node?"))) {
+            
                         self.do_save_update_arch
                             (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node");
                     }
@@ -478,6 +486,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         return _.includes(tr, res);
                     });
                     var properties = _PROPERTIES[tag];
+                    console.log("properties",properties);
                     self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
                     break;
                 case "side-up":
@@ -508,7 +517,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         _.each(tr_to_move, function(rec) {
                              $(last_tr).before(rec);
                         });
-                        self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up");
+                        self.do_save_update_arch
+                            (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up");
                     }
                 break;
             case "side-down":
@@ -551,8 +561,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
                 break;
             }
-        });
-    },
+    }
+
+
     do_save_update_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, move_direct, update_values) {
         var self = this;
         var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;});
@@ -625,7 +636,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     child_list.splice(index, 1, new_obj);
                     var parent = $(arch1).parents();
                 }else if(move_direct == "add_node"){
-                     switch (update_values[1]) {
+                //not working
+                var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone();
+                self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone);
+                clone.find("img[id^='side-']").click(function(){
+                    console.log("this",this);
+                });
+               clone.bind("click", function(){
+                    console.log("thissss",this);
+                });
+                switch (update_values[1]) {
                         case "After":
                             $(arch1).after(update_values[0]);
                             break;
@@ -639,6 +659,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     var parent = $(arch1).parents();
                 }else if(move_direct == "remove_node"){
                     var parent = $(arch1).parents();
+                    console.log("vidhin",obj);
                     if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){
                         id = id -1;
                         level = level - 1;
@@ -665,10 +686,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     });
                 }
                 if(move_direct == "add_node"){
-                    self.add_node_dialog.close();
-                    self.edit_xml_dialog.close();
-                    self.xml_element_id = 0;
-                    self.get_arch();}
+                    //self.add_node_dialog.close();
+                    //self.edit_xml_dialog.close();
+                    //self.xml_element_id = 0;
+                    //self.get_arch(id);
+                    }
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
@@ -793,14 +815,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var  render_list = [];
         var  render_list =[{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 
                             'value': 'field', 'string': 'Node Type'},
-                {'name': 'position','selection': positions, 'value': false, 'string': 'Position'},
-                {'name': 'field_value','selection': fields, 'value': false, 'string': ''}];
+                {'name': 'field_value','selection': fields, 'value': false, 'string': ''},
+                {'name': 'position','selection': positions, 'value': false, 'string': 'Position'}];
         this.add_widget = [];
         this.add_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
-            width: 500,
-            height: 300,
+            width: 430,
+            height: 190,
             buttons: {
                     "Update": function(){
                         var check_add_node = true;
@@ -828,17 +850,27 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
            }
         }).start().open();
         this.add_node_dialog.$element.
-        append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
-        var table_selector = self.add_node_dialog.$element.find('table[id=rec_table]');
+        append('<table id="rec_table" style="width:400px" class="oe_forms"><tbody><tr></tbody></table>');
+        var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody');
         _.each(render_list,function(node){
             type_widget = new openerp.web.ViewEditor.FieldSelect (self.add_node_dialog, node.name);
             type_widget.selection = node.selection;
-            table_selector.append('<tr><td align="right">' + node.string + ':</td>' + type_widget.render() + '</tr>');
+            if(node.name == "position"){
+            table_selector.append
+                ('</tr><tr><td align="right" width ="100px">' + node.string + ':</td>' + type_widget.render() + '<td></tr>');
+            }else{
+            table_selector.append
+                ('<td align="right" width = "100px">' + node.string + '</td>' + type_widget.render());
+                if(node.name == "field_value"){
+                table_selector.append
+                    ('<td align="right" width="100px"> <button id="new_field">New Field</button></td>');
+                }
+            }
             type_widget.start();
             type_widget.set_value(node.value);
             self.add_widget.push(type_widget);
         });
-        table_selector.append('<tr><td align="right"> <button id="new_field">New Field</button></td></tr>');
+        table_selector.find("td").attr("width","100px");
         self.add_node_dialog.$element.find('#new_field').click(function() {
             model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);
             model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) {
@@ -953,9 +985,13 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
             if(self.name == "node_type"){
-                (self.get_value() == "field")?
-                    self.$element.find("select[id=field_value]").show():
-                        self.$element.find("select[id=field_value]").hide();
+                if(self.get_value() == "field"){
+                    self.$element.find('#new_field').show();
+                    self.$element.find("select[id=field_value]").show();
+                }else{
+                    self.$element.find('#new_field').hide();
+                    self.$element.find("select[id=field_value]").hide();
+                }
             }
         });
       

From 2f13563b21865f8354b1998bbb717c52e40eb02a Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 18 Nov 2011 18:57:35 +0530
Subject: [PATCH 083/114] [IMP]add event for clone element.

bzr revid: vme@tinyerp.com-20111118132735-35gkiai7l4oq0pin
---
 addons/web/static/src/js/view_editor.js | 417 +++++++++++++-----------
 1 file changed, 220 insertions(+), 197 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index af73b3c31fa..547b6e582f5 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -363,8 +363,23 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             self.increase_level(val, level + 1);
         });
     },
+    do_select_row: function(id){
+        this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected');
+        this.edit_xml_dialog.$element.find("tr[id=viewedit-"+id+"]").addClass('ui-selected');
+    },
+    do_parent_img_hide_show: function(img){
+        var self = this;
+        if ($(img).attr('src') == '/web/static/src/img/collapse.gif') {
+            $(img).attr('src', '/web/static/src/img/expand.gif');
+            self.on_expand(img);
+        } else {
+            $(img).attr('src', '/web/static/src/img/collapse.gif');
+            this.on_collapse(img);
+        }
+    },
     edit_view: function(one_object) {
         var self = this;
+        this.one_object = one_object;
         this.edit_xml_dialog = new openerp.web.Dialog(this, {
             modal: true,
             title: _.sprintf("View Editor %d - %s", self.main_view_id, self.model),
@@ -395,175 +410,187 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
             }
         }).start().open();
+
         var no_property_att = [];
         _.each(_PROPERTIES, function(val, key) {
             if (! val.length) no_property_att.push(key);
         });
+
         this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object'], 'no_properties': no_property_att}));
+
         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');
-            console.log(self);
+            self.do_select_row(this.id.split('-')[1]);
         });
+
         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']);
-            }
+            self.do_parent_img_hide_show(this);
         });
         this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() {
-
+            self.on_select_img(this);
         });
     },
-    what_to_do: function(){
-            var self = this;
-            var side = $(this).closest("tr[id^='viewedit-']");
-            var clicked_tr_id = parseInt((side.attr('id')).split('-')[1]);
-            var img = side.find("img[id='parentimg-" + clicked_tr_id + "']").attr('src');
-            var clicked_tr_level = parseInt(side.attr('level'));
-            var cur_tr = side;
-            var last_tr;
-            var next_tr;
-            var tr_to_move = [];
-            tr_to_move.push(side);
-            var view_id;
-            var view_xml_id;
-            var view_find = side;
-            var min_level = clicked_tr_level;
-            if(($(side).find('a').text()).search("view_id") != -1){
-                view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
-                view_xml_id = (view_find.attr('id')).split('-')[1];
-                clicked_tr_id  += 1;
-                clicked_tr_level += 1;
-            }else{
-                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 = (view_find.attr('id')).split('-')[1];
-                        break;
-                    }
-                    if(view_find.attr('level') < min_level){
-                        min_level = parseInt(view_find.attr('level'));
-                    }
+
+    on_select_img: function(element_img){
+        var self = this;
+        var side = $(element_img).closest("tr[id^='viewedit-']");
+        this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]);
+        this.one_object.clicked_tr_level = parseInt(side.attr('level'));
+        var img = side.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']").attr('src');
+        var view_id,view_xml_id;
+        var view_find = side;
+
+        //for view id found
+        var min_level = this.one_object.clicked_tr_id;
+        if(($(side).find('a').text()).search("view_id") != -1){
+            view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
+            view_xml_id = (view_find.attr('id')).split('-')[1];
+            this.one_object.clicked_tr_id  += 1;
+            this.one_object.clicked_tr_level += 1;
+        }else{
+            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 = (view_find.attr('id')).split('-')[1];
+                    break;
+                }
+                if(view_find.attr('level') < min_level){
+                    min_level = parseInt(view_find.attr('level'));
                 }
             }
-            switch (this.id) {
-                case "side-add":
-                    var tr = $(side).find('a').text();
-                    var parent_tr = ($(side).prevAll("tr[level="+String(clicked_tr_level - 1)+"]"))[0];
-                    parent_tr = $(parent_tr).find('a').text();
-                    self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) {
-                                var fields = _.keys(result.fields);
-                                fields.push(" "),fields.sort();
-                                var property_to_check = [];
-                                _.each([tr,parent_tr],function(element){
-                                    property_to_check.push(
-                                        _.detect(_.keys(_CHILDREN),function(res){
-                                                return _.includes(element, res);
-                                            }));
-                                    });
-                                self.on_add_node(property_to_check, fields ,
-                                    clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
-                            });
-                    break;
-                case "side-remove":
-                    if (confirm(_t("Do you really want to remove this node?"))) {
-            
-                        self.do_save_update_arch
-                            (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node");
-                    }
-                    break;
-                case "side-edit":
-                    var tr = $(this).closest("tr[id^='viewedit-']").find('a').text();
-                    var tag = _.detect(_.keys(_PROPERTIES),function(res){
-                        return _.includes(tr, res);
-                    });
-                    var properties = _PROPERTIES[tag];
-                    console.log("properties",properties);
-                    self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
-                    break;
-                case "side-up":
-                    while (1) {
-                        var prev_tr = cur_tr.prev();
-                        if (clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) {
-                           last_tr = prev_tr;
-                           break;
-                        }
-                        cur_tr = prev_tr;
-                    }
-                    if (img) {
-                    self.edit_xml_dialog.$element.find("img[id='parentimg-" + clicked_tr_id + "']").
-                            attr('src', '/web/static/src/img/expand.gif');
-                        while (1) {
-                            next_tr = side.next();
-                            if (parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) {
-                                break;
-                            } else {
-                                next_tr.hide();
-                                tr_to_move.push(next_tr);
-                                side = next_tr;
-                            }
-                        }
-                    }
-                    if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level &&
-                            (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
-                        _.each(tr_to_move, function(rec) {
-                             $(last_tr).before(rec);
-                        });
-                        self.do_save_update_arch
-                            (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up");
-                    }
+        }
+        this.one_object.clicked_tr_view = [view_id, view_xml_id];
+        switch (element_img.id) {
+            case "side-add":
+                self.do_node_add(side);
+                break;
+            case "side-remove":
+                if (confirm(_t("Do you really want to remove this node?"))) {
+                self.do_save_update_arch
+                (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node");
+                }
+                break;
+            case "side-edit":
+                self.do_node_edit(side);
+                break;
+            case "side-up":
+                self.do_node_up(side, img);
                 break;
             case "side-down":
-                if (img) {
-                    while (1) {
-                        next_tr = cur_tr.next();
-                        if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) {
-                            last_tr = next_tr;
-                            break;
-                        } else {
-                            tr_to_move.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')) == clicked_tr_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') <= clicked_tr_level || next_tr.length == 0) break;
-                            next_tr.hide();
-                            last_tr = next_tr;
-                        }
-                    }
-                    tr_to_move.reverse();
-                    _.each(tr_to_move, function(rec) {
-                       $(last_tr).after(rec);
-                    });
-                    self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down");
-                }
+                self.do_node_down(side, img);
                 break;
+        }
+    },
+    do_node_add: function(side){
+        var self = this;
+        var tr = $(side).find('a').text();
+        var parent_tr = ($(side).prevAll("tr[level="+String(this.one_object.clicked_tr_level - 1)+"]"))[0];
+        parent_tr = $(parent_tr).find('a').text();
+        self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) {
+                    var fields = _.keys(result.fields);
+                    fields.push(" "),fields.sort();
+                    var property_to_check = [];
+                    _.each([tr,parent_tr],function(element){
+                        property_to_check.push(
+                            _.detect(_.keys(_CHILDREN),function(res){
+                                    return _.includes(element, res);
+                                }));
+                        });
+                    console.log(property_to_check,fields);
+                    //self.on_add_node(property_to_check, fields ,
+                    //    clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+                });
+    },
+    do_node_edit: function(side){
+        var self = this;
+        var tr = $(side).find('a').text();
+        var tag = _.detect(_.keys(_PROPERTIES),function(res){
+            return _.includes(tr, res);
+        });
+        var properties = _PROPERTIES[tag];
+        console.log(properties);
+        //self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+    },
+    do_node_down: function(cur_tr, img){
+        var self = this;
+        var next_tr,last_tr;
+        tr_to_move=[];
+        tr_to_move.push(cur_tr);
+        if (img) {
+            while (1) {
+                next_tr = cur_tr.next();
+                if ( parseInt(next_tr.attr('level')) <= this.one_object.clicked_tr_level || next_tr.length == 0) {
+                    last_tr = next_tr;
+                    break;
+                } else {
+                    tr_to_move.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')) == this.one_object.clicked_tr_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') <= this.one_object.clicked_tr_level || next_tr.length == 0) break;
+                    next_tr.hide();
+                    last_tr = next_tr;
+                }
             }
-    }
-
-
+            tr_to_move.reverse();
+            _.each(tr_to_move, function(rec) {
+               $(last_tr).after(rec);
+            });
+           // self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down");
+        }
+    },
+    do_node_up: function(cur_tr, img){
+        var self = this;
+        var side = cur_tr;
+        tr_to_move=[];
+        tr_to_move.push(side);
+        while (1) {
+            var prev_tr = cur_tr.prev();
+            if (this.one_object.clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) {
+               last_tr = prev_tr;
+               break;
+            }
+            cur_tr = prev_tr;
+        }
+        if (img) {
+        self.edit_xml_dialog.$element.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']").
+                attr('src', '/web/static/src/img/expand.gif');
+            while (1) {
+                next_tr = side.next();
+                if (parseInt(next_tr.attr('level')) <= this.one_object.clicked_tr_level || next_tr.length == 0) {
+                    break;
+                } else {
+                    next_tr.hide();
+                    tr_to_move.push(next_tr);
+                    side = next_tr;
+                }
+            }
+        }
+        if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == this.one_object.clicked_tr_level &&
+                (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
+            _.each(tr_to_move, function(rec) {
+                 $(last_tr).before(rec);
+            });
+            //self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up");
+        }
+    },
     do_save_update_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, move_direct, update_values) {
         var self = this;
         var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;});
@@ -636,30 +663,41 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     child_list.splice(index, 1, new_obj);
                     var parent = $(arch1).parents();
                 }else if(move_direct == "add_node"){
-                //not working
-                var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone();
-                self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone);
-                clone.find("img[id^='side-']").click(function(){
-                    console.log("this",this);
-                });
-               clone.bind("click", function(){
-                    console.log("thissss",this);
-                });
-                switch (update_values[1]) {
-                        case "After":
+                    var temp_xml = QWeb.load_xml(update_values[0]);
+                    var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
+                    var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone();
+                    clone.find('a').text(object_xml.name);
+                    clone.attr("id","viewedit-" + object_xml.id );
+                    clone.bind("click",function(){
+                        self.do_select_row(object_xml.id);
+                    });
+                    clone.find("img[id^='side-']").click(function() {
+                        self.on_select_img(this);
+                    });
+                    clone.find("img[id^='parentimg-']").click(function() {
+                        self.do_parent_img_hide_show(this);
+                    });
+                     switch (update_values[1]) {
+                         case "After":
+                            object_xml.level = obj.level;
                             $(arch1).after(update_values[0]);
+                            child_list.splice(index + 1, 0, object_xml);
                             break;
                         case "Before":
+                            object_xml.level = obj.level;
                             $(arch1).before(update_values[0]);
+                            child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
+                            object_xml.level = obj.level + 1;
                             $(arch1).append(update_values[0]);
+                            obj.child_id.push(object_xml);
                             break;
-                    }
+                   }
+                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone);
                     var parent = $(arch1).parents();
                 }else if(move_direct == "remove_node"){
                     var parent = $(arch1).parents();
-                    console.log("vidhin",obj);
                     if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){
                         id = id -1;
                         level = level - 1;
@@ -674,7 +712,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     cur_tr.remove();
                 }
                 var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1;
-                if(convert_to_utf != "remove_view"){
+                /*if(convert_to_utf != "remove_view"){
                     convert_to_utf = QWeb.tools.xml_node_to_string(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;
@@ -686,11 +724,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     });
                 }
                 if(move_direct == "add_node"){
-                    //self.add_node_dialog.close();
-                    //self.edit_xml_dialog.close();
-                    //self.xml_element_id = 0;
-                    //self.get_arch(id);
-                    }
+                    self.add_node_dialog.close();
+                    self.edit_xml_dialog.close();
+                    self.xml_element_id = 0;
+                    self.get_arch();}*/
             }
             if (obj.level <= level) {
                 _.each(list_obj_xml, function(child_node) {
@@ -716,10 +753,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             } else return tr_list;
         }
     },
-    on_collapse: function(collapse_img, parent_child_id, id, main_object) {
+    on_collapse: function(collapse_img) {
         var self = this;
         var id = collapse_img.id.split('-')[1];
-        var datas = _.detect(parent_child_id, function(res) {
+        var datas = _.detect(self.one_object['parent_child_id'] , function(res) {
             return res.key == id;
         });
         _.each(datas.value, function (rec) {
@@ -815,14 +852,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var  render_list = [];
         var  render_list =[{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 
                             'value': 'field', 'string': 'Node Type'},
-                {'name': 'field_value','selection': fields, 'value': false, 'string': ''},
-                {'name': 'position','selection': positions, 'value': false, 'string': 'Position'}];
+                {'name': 'position','selection': positions, 'value': false, 'string': 'Position'},
+                {'name': 'field_value','selection': fields, 'value': false, 'string': ''}];
         this.add_widget = [];
         this.add_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
-            width: 430,
-            height: 190,
+            width: 500,
+            height: 300,
             buttons: {
                     "Update": function(){
                         var check_add_node = true;
@@ -850,27 +887,17 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
            }
         }).start().open();
         this.add_node_dialog.$element.
-        append('<table id="rec_table" style="width:400px" class="oe_forms"><tbody><tr></tbody></table>');
-        var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody');
+        append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
+        var table_selector = self.add_node_dialog.$element.find('table[id=rec_table]');
         _.each(render_list,function(node){
             type_widget = new openerp.web.ViewEditor.FieldSelect (self.add_node_dialog, node.name);
             type_widget.selection = node.selection;
-            if(node.name == "position"){
-            table_selector.append
-                ('</tr><tr><td align="right" width ="100px">' + node.string + ':</td>' + type_widget.render() + '<td></tr>');
-            }else{
-            table_selector.append
-                ('<td align="right" width = "100px">' + node.string + '</td>' + type_widget.render());
-                if(node.name == "field_value"){
-                table_selector.append
-                    ('<td align="right" width="100px"> <button id="new_field">New Field</button></td>');
-                }
-            }
+            table_selector.append('<tr><td align="right">' + node.string + ':</td>' + type_widget.render() + '</tr>');
             type_widget.start();
             type_widget.set_value(node.value);
             self.add_widget.push(type_widget);
         });
-        table_selector.find("td").attr("width","100px");
+        table_selector.append('<tr><td align="right"> <button id="new_field">New Field</button></td></tr>');
         self.add_node_dialog.$element.find('#new_field').click(function() {
             model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);
             model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) {
@@ -985,13 +1012,9 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
             if(self.name == "node_type"){
-                if(self.get_value() == "field"){
-                    self.$element.find('#new_field').show();
-                    self.$element.find("select[id=field_value]").show();
-                }else{
-                    self.$element.find('#new_field').hide();
-                    self.$element.find("select[id=field_value]").hide();
-                }
+                (self.get_value() == "field")?
+                    self.$element.find("select[id=field_value]").show():
+                        self.$element.find("select[id=field_value]").hide();
             }
         });
       

From 96212584c4a1e07aee66b5dfb0e64fa5fbafcaca Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 21 Nov 2011 15:43:26 +0530
Subject: [PATCH 084/114] [IMP]make sequence for add node and edit node dialog
 box.

bzr revid: vme@tinyerp.com-20111121101326-xyhlum8idixqgkhr
---
 addons/web/static/src/js/view_editor.js | 139 +++++++++++++-----------
 addons/web/static/src/xml/base.xml      |   2 +-
 2 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 547b6e582f5..f578d9da006 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -432,6 +432,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 
     on_select_img: function(element_img){
         var self = this;
+        console.log("kooooo",element_img);
         var side = $(element_img).closest("tr[id^='viewedit-']");
         this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]);
         this.one_object.clicked_tr_level = parseInt(side.attr('level'));
@@ -453,7 +454,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     (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 = (view_find.attr('id')).split('-')[1];
+                    view_xml_id = parseInt((view_find.attr('id')).split('-')[1]);
                     break;
                 }
                 if(view_find.attr('level') < min_level){
@@ -468,8 +469,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 break;
             case "side-remove":
                 if (confirm(_t("Do you really want to remove this node?"))) {
-                self.do_save_update_arch
-                (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node");
+                    self.do_save_update_arch("remove_node");
                 }
                 break;
             case "side-edit":
@@ -498,9 +498,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                                     return _.includes(element, res);
                                 }));
                         });
-                    console.log(property_to_check,fields);
-                    //self.on_add_node(property_to_check, fields ,
-                    //    clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+                    self.on_add_node(property_to_check, fields);
                 });
     },
     do_node_edit: function(side){
@@ -510,8 +508,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             return _.includes(tr, res);
         });
         var properties = _PROPERTIES[tag];
-        console.log(properties);
-        //self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level);
+        self.on_edit_node(properties);
     },
     do_node_down: function(cur_tr, img){
         var self = this;
@@ -553,7 +550,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             _.each(tr_to_move, function(rec) {
                $(last_tr).after(rec);
             });
-           // self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down");
+            self.do_save_update_arch("down");
         }
     },
     do_node_up: function(cur_tr, img){
@@ -588,13 +585,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             _.each(tr_to_move, function(rec) {
                  $(last_tr).before(rec);
             });
-            //self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up");
+            self.do_save_update_arch("up");
         }
     },
-    do_save_update_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, move_direct, update_values) {
+    do_save_update_arch: function(move_direct, update_values) {
         var self = this;
-        var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;});
-        var obj = self.get_object_by_id(view_xml_id, one_object['main_object'], []);
+        var arch = _.detect(self.one_object['arch'], function(element) 
+            {return element.view_id == self.one_object.clicked_tr_view[0]});
+        var obj = self.get_object_by_id(this.one_object.clicked_tr_view[1],this.one_object['main_object'], []);
          //for finding xpath tag from inherit view
         var xml_arch = QWeb.load_xml(arch.arch);
         if (xml_arch.childNodes[0].tagName == "data") {
@@ -612,44 +610,63 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 return child.nodeType == 1;
             });
         
-        return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0], 
-                    parseInt(clicked_tr_id), [], parseInt(clicked_tr_level),
-                            parseInt(view_id), arch, move_direct, update_values);
+        return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0],[], move_direct, update_values,arch);
     },
-    get_object_by_id: function(view_xml_id, one_object, result) {
+    get_object_by_id: function(id ,one_object, result) {
         var self = this;
         if (result.length == 0 ) {
             var check = _.detect(one_object , function(obj) {
-                return view_xml_id == obj.id;
+                return self.one_object.clicked_tr_view[1] == obj.id;
             });
             if (check) {result.push(check);};
             _.each(one_object, function(obj) {
-               self.get_object_by_id(view_xml_id, obj.child_id, result);
+               self.get_object_by_id(id,obj.child_id, result);
             });
         }
         return result;
     },
-    do_save_xml: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){
+    create_clone: function(clone, new_node_obj){
+        var self = this;
+        clone.find('a').text(new_node_obj.name);
+        clone.attr("id","viewedit-" + new_node_obj.id);
+        clone.attr("level",new_node_obj.level);
+        clone.find("img[id^='parentimg-']").remove();
+        clone.bind("click",function(){
+            self.do_select_row(this.id.split('-')[1]);
+        });
+        clone.find("img[id^='side-']").click(function() {
+            self.on_select_img(this);
+        });
+        clone.find("img[id^='parentimg-']").click(function() {
+            self.do_parent_img_hide_show(this);
+        });
+        return clone;
+    },
+    do_save_xml: function(arch1, obj, child_list, move_direct, update_values, arch){
         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;
+        if (this.one_object.clicked_tr_id) {
+            if (obj.id == this.one_object.clicked_tr_id) {
+                var parent;
                 var index = _.indexOf(child_list, obj);
                 if (move_direct == "down") {
                     var next = $(arch1).next();
                     $(next).after(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
-                    var parent = $(arch1).parents();
+                    parent = $(arch1).parents();
+
                 } else if (move_direct == "up") {
+
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
-                    var parent = $(arch1).parents();
+                    parent = $(arch1).parents();
+
                 } else if (move_direct == "update_node") {
+
                     _.each(update_values, function(val){
                         if(val[0] == "required"){
                                 $(arch1).attr("required", "true");
@@ -659,45 +676,40 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     });
                     var new_obj = self.create_View_Node(arch1);
                     new_obj.id = obj.id,new_obj.child_id = obj.child_id;
-                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name);
+                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']")
+                            .find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
-                    var parent = $(arch1).parents();
+                    parent = $(arch1).parents();
+
                 }else if(move_direct == "add_node"){
                     var temp_xml = QWeb.load_xml(update_values[0]);
                     var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
-                    var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone();
-                    clone.find('a').text(object_xml.name);
-                    clone.attr("id","viewedit-" + object_xml.id );
-                    clone.bind("click",function(){
-                        self.do_select_row(object_xml.id);
-                    });
-                    clone.find("img[id^='side-']").click(function() {
-                        self.on_select_img(this);
-                    });
-                    clone.find("img[id^='parentimg-']").click(function() {
-                        self.do_parent_img_hide_show(this);
-                    });
+                    (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level;
+                    var clone = self.create_clone(self.edit_xml_dialog.$element.
+                        find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").clone(),object_xml);
                      switch (update_values[1]) {
                          case "After":
-                            object_xml.level = obj.level;
                             $(arch1).after(update_values[0]);
                             child_list.splice(index + 1, 0, object_xml);
                             break;
                         case "Before":
-                            object_xml.level = obj.level;
                             $(arch1).before(update_values[0]);
                             child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
-                            object_xml.level = obj.level + 1;
                             $(arch1).append(update_values[0]);
                             obj.child_id.push(object_xml);
                             break;
                    }
-                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone);
-                    var parent = $(arch1).parents();
+                    self.edit_xml_dialog.$element.
+                        find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").after(clone);
+                    self.edit_xml_dialog.$element.
+                        find("tr[id='viewedit-" + object_xml.id + "']").removeClass('ui-selected');
+                    parent = $(arch1).parents();
+
                 }else if(move_direct == "remove_node"){
-                    var parent = $(arch1).parents();
+
+                    parent = $(arch1).parents();
                     if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){
                         id = id -1;
                         level = level - 1;
@@ -705,33 +717,35 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     }
                     $(arch1).remove();
                     child_list.splice(index,1);
-                    var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id +"']");
-                    _.each(self.get_list_tr(cur_tr,level), function(tr_element){
+                    var cur_tr = self.edit_xml_dialog.$element.
+                            find("tr[id='viewedit-" + self.one_object.clicked_tr_id + "']");
+                    _.each(self.get_list_tr(cur_tr,self.one_object.clicked_tr_level), function(tr_element){
                         tr_element.remove();
                     });
                     cur_tr.remove();
                 }
+                
                 var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1;
-                /*if(convert_to_utf != "remove_view"){
+                if(convert_to_utf != "remove_view"){
                     convert_to_utf = QWeb.tools.xml_node_to_string(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;
-                    this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) {
-                    });
+                    /*this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) {
+                    });*/
                 }else{
-                    this.dataset.unlink([parseInt(view_id)],function(res) {
-                    });
+                    //this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) {
+                    //});
                 }
                 if(move_direct == "add_node"){
                     self.add_node_dialog.close();
-                    self.edit_xml_dialog.close();
-                    self.xml_element_id = 0;
-                    self.get_arch();}*/
+                    self.on_select_img(clone.find("img[id='side-edit']")[0]);
+                    }
             }
-            if (obj.level <= level) {
+            if (obj.level <= this.one_object.clicked_tr_level) {
                 _.each(list_obj_xml, function(child_node) {
-                    self.do_save_xml(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values);
+                    self.do_save_xml(child_node[0], child_node[1], obj.child_id, 
+                                    move_direct, update_values, arch);
                 });
             }
         }
@@ -765,7 +779,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties, clicked_tr_id, obj, view_id, view_xml_id, clicked_tr_level){
+    on_edit_node:function(properties){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -780,7 +794,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                                 update_values.push([widget.name, widget.get_value()]);
                             }
                         });
-                        self.do_save_update_arch(obj, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "update_node", update_values);
+                        self.do_save_update_arch("update_node", update_values);
                         self.edit_node_dialog.close();
                     },
                     "Cancel": function(){
@@ -790,7 +804,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         this.edit_node_dialog.start().open();
         var widget = _.keys(self.property.map);
-        var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []);
+        var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
         this.edit_widget = [];
         _.each(properties, function(property) {
@@ -846,7 +860,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             })
         return def.promise();
     },
-    on_add_node: function(properties,fields,clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level){
+    on_add_node: function(properties, fields){
         var self = this;
         var  positions = ['After','Before','Inside'];
         var  render_list = [];
@@ -877,8 +891,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             var tag = (values.node_type == "field")?
                                 _.sprintf("<%s name='%s'> </%s>",values.node_type,values.field_value,values.node_type):
                                     _.sprintf("<%s> </%s>",values.node_type,values.node_type);
-                            self.do_save_update_arch(one_object, view_id, view_xml_id, 
-                                clicked_tr_id, clicked_tr_level, "add_node", [tag, values.position]);
+                            self.do_save_update_arch("add_node", [tag, values.position]);
                         }else{alert("Can't Update View");}
                     },
                     "Cancel": function(){
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 9b1c5175571..25cfaee1232 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1692,4 +1692,4 @@
 <t t-name="EmptyComponent">
     <div></div>
 </t>
-</templates>
\ No newline at end of file
+</templates>

From d206d8dc42f4c364a407637d346e18d01ae4eaad Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 21 Nov 2011 18:32:31 +0530
Subject: [PATCH 085/114] [IMP]add new node last in group.

bzr revid: vme@tinyerp.com-20111121130231-zsv1py2lnljy5t3x
---
 addons/web/static/src/js/view_editor.js | 46 ++++++++++++++++---------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f578d9da006..033c2a31850 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -432,7 +432,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
 
     on_select_img: function(element_img){
         var self = this;
-        console.log("kooooo",element_img);
         var side = $(element_img).closest("tr[id^='viewedit-']");
         this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]);
         this.one_object.clicked_tr_level = parseInt(side.attr('level'));
@@ -616,7 +615,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         if (result.length == 0 ) {
             var check = _.detect(one_object , function(obj) {
-                return self.one_object.clicked_tr_view[1] == obj.id;
+                return id == obj.id;
             });
             if (check) {result.push(check);};
             _.each(one_object, function(obj) {
@@ -625,9 +624,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
         return result;
     },
-    create_clone: function(clone, new_node_obj){
+    create_clone: function(clone, new_node_obj, position){
         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);
         clone.attr("id","viewedit-" + new_node_obj.id);
         clone.attr("level",new_node_obj.level);
         clone.find("img[id^='parentimg-']").remove();
@@ -637,9 +637,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         clone.find("img[id^='side-']").click(function() {
             self.on_select_img(this);
         });
-        clone.find("img[id^='parentimg-']").click(function() {
-            self.do_parent_img_hide_show(this);
-        });
         return clone;
     },
     do_save_xml: function(arch1, obj, child_list, move_direct, update_values, arch){
@@ -682,33 +679,48 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     parent = $(arch1).parents();
 
                 }else if(move_direct == "add_node"){
+                    var tr_click = 
+                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']");
                     var temp_xml = QWeb.load_xml(update_values[0]);
                     var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
                     (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level;
-                    var clone = self.create_clone(self.edit_xml_dialog.$element.
-                        find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").clone(),object_xml);
+                    var clone = self.create_clone(tr_click.clone(),object_xml);
                      switch (update_values[1]) {
                          case "After":
+                            tr_click.after(clone);
                             $(arch1).after(update_values[0]);
                             child_list.splice(index + 1, 0, object_xml);
                             break;
                         case "Before":
+                            tr_click.before(clone);
                             $(arch1).before(update_values[0]);
                             child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
+                            var after_append = _.detect(self.one_object['parent_child_id'],function(ele){
+                                    return self.one_object.clicked_tr_id == ele.key;
+                            });
+                            after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id;
+                            if(tr_click.find("img[id^='parentimg-']").length == 0){
+                            ($(tr_click.find('a').parent()).siblings('td'))
+                                .append($('<img width="16" height="16"></img>').
+                                    attr('src', '/web/static/src/img/collapse.gif').
+                                    attr('id','parentimg-'+ self.one_object.clicked_tr_id)
+                                    .click(function(){
+                                        self.do_parent_img_hide_show(this);
+                                    }));
+                            }
+                            self.edit_xml_dialog.$element.
+                                find("tr[id='viewedit-"+after_append+"']").after(clone);
                             $(arch1).append(update_values[0]);
                             obj.child_id.push(object_xml);
                             break;
                    }
-                    self.edit_xml_dialog.$element.
-                        find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").after(clone);
                     self.edit_xml_dialog.$element.
                         find("tr[id='viewedit-" + object_xml.id + "']").removeClass('ui-selected');
                     parent = $(arch1).parents();
 
                 }else if(move_direct == "remove_node"){
-
                     parent = $(arch1).parents();
                     if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){
                         id = id -1;
@@ -723,6 +735,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         tr_element.remove();
                     });
                     cur_tr.remove();
+                    self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
                 }
                 
                 var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1;
@@ -731,15 +744,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     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;
-                    /*this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) {
-                    });*/
+                    this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) {
+                    });
                 }else{
-                    //this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) {
-                    //});
+                    this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) {
+                    });
                 }
                 if(move_direct == "add_node"){
                     self.add_node_dialog.close();
                     self.on_select_img(clone.find("img[id='side-edit']")[0]);
+                    self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
                     }
             }
             if (obj.level <= this.one_object.clicked_tr_level) {
@@ -779,7 +793,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     },
-    on_edit_node:function(properties){
+    on_edit_node: function(properties){
         var self = this;
         this.edit_node_dialog = new openerp.web.Dialog(this,{
             modal: true,

From c9830bb353fbbe93d00971f85b31002f733674bc Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Nov 2011 10:52:34 +0530
Subject: [PATCH 086/114] [FIX] vieweditor :- fix problem of _.include method/

bzr revid: ysa@tinyerp.com-20111122052234-gbdj2bj6vinfg1n8
---
 addons/web/static/src/js/view_editor.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 825b8f6f689..620581528ae 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -294,7 +294,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 });
             }else{
                 var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
-                    return _.include(list, "position")
+                    return list instanceof Array? _.include(list, "position"): false;
                 });
                 expr_to_list = [_.flatten(temp)];
             }
@@ -706,8 +706,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             _.each(widgets, function(widget) {
                 var type_widget =  new (self.property.get_any([widget.type])) (self.edit_node_dialog, widget);
                 var value = _.detect(arch_val[0]['att_list'],function(res) {
-                    if (res instanceof Array) return _.include(res, widget.name);
-                    else return false;
+                    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>');

From 5c0b707510bf4ebcbbf873f28456c81f7e166048 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 22 Nov 2011 12:51:57 +0530
Subject: [PATCH 087/114] [IMP] fix view for new field dialog box.

bzr revid: vme@tinyerp.com-20111122072157-rw2h87p6u4dyrjak
---
 addons/web/static/src/js/view_editor.js | 45 +++++++++++++++----------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index f907612bc1c..bb0ffba5b73 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -507,12 +507,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             var properties = _PROPERTIES[result[0].att_list[0]];
             self.on_edit_node(properties);
         }
-/*        var tr = $(side).find('a').text();
-        var tag = _.detect(_.keys(_PROPERTIES),function(res){
-            return _.includes(tr, res);
-        });
-        var properties = _PROPERTIES[tag];
-        self.on_edit_node(properties);*/
     },
     do_node_down: function(cur_tr, img){
         var self = this;
@@ -930,14 +924,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var  render_list = [];
         var  render_list =[{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 
                             'value': 'field', 'string': 'Node Type','type': 'selection'},
-                {'name': 'position','selection': positions, 'value': false, 'string': 'Position','type': 'selection'},
-                {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'}];
+                {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
+            {'name': 'position','selection': positions, 'value': false, 'string': 'Position','type': 'selection'}   ];
         this.add_widget = [];
         this.add_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
             title: 'Properties',
-            width: 500,
-            height: 300,
+            width: 450,
+            height: 190,
             buttons: {
                     "Update": function(){
                         var check_add_node = true;
@@ -964,16 +958,27 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
            }
         }).start().open();
         this.add_node_dialog.$element.
-        append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
-        var table_selector = self.add_node_dialog.$element.find('table[id=rec_table]');
+        append('<table id="rec_table"  style="width:420px" class="oe_forms"><tbody><tr></tbody></table>');
+        var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody');
         _.each(render_list,function(node){
             type_widget = new (self.property.get_any([node.type])) (self.add_node_dialog, node);
-            table_selector.append('<tr><td align="right">' + node.string + ':</td>' + type_widget.render() + '</tr>');
+            if(node.name == "position"){
+                table_selector.
+                    append('</tr><tr><td align="right" width="100px">' + node.string + '</td>' + type_widget.render() + '</tr>');
+            }else{
+                table_selector.
+                    append('<td align="right">' + node.string + '</td>' + type_widget.render() );
+                if(node.name == "field_value"){
+                    table_selector.
+                        append('<td id="new_field" align="right"  width="100px"> <button>New Field</button></td>');
+                }
+            }
             type_widget.start();
             type_widget.set_value(node.value);
             self.add_widget.push(type_widget);
         });
-        table_selector.append('<tr><td align="right"> <button id="new_field">New Field</button></td></tr>');
+        console.log("table_selector.find", table_selector.find("td[id^=]"));
+        table_selector.find("td[id^=]").attr("width","100px");
         self.add_node_dialog.$element.find('#new_field').click(function() {
             model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);
             model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) {
@@ -1001,7 +1006,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 new_fields_name = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 new_fields_name.read_ids([controller.datarecord.id], ['name'], function(result) {
                 self.add_node_dialog.$element.
-                    find('select[id=field_value]'). append($("<option></option>").
+                    find('select[id=field_value]').append($("<option></option>").
                     attr("value",result[0].name).text(result[0].name));
                     _.detect(self.add_widget,function(widget){
                         (widget.name == "field_value")?widget.selection.push(result[0].name):false;
@@ -1090,9 +1095,13 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
             if(self.name == "node_type"){
-                (self.get_value() == "field")?
-                    self.$element.find("select[id=field_value]").show():
-                        self.$element.find("select[id=field_value]").hide();
+                if(self.get_value() == "field"){
+                    self.$element.find('#new_field').show();
+                    self.$element.find("select[id=field_value]").show();
+                }else{
+                    self.$element.find('#new_field').hide();
+                    self.$element.find("select[id=field_value]").hide();
+                }
             }
         });
       

From 37f2f7cd4ca1817f3bcc61ff073f547a11b7ce91 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 22 Nov 2011 14:14:47 +0530
Subject: [PATCH 088/114] [IMP]improvement in code.

bzr revid: vme@tinyerp.com-20111122084447-jny55ehsiksd3v0d
---
 addons/web/static/src/js/view_editor.js | 39 +++++++++++++------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index bb0ffba5b73..173b3bfc4f0 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -486,19 +486,21 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         var tr = $(side).find('a').text();
         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();
-        self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) {
-                    var fields = _.keys(result.fields);
-                    fields.push(" "),fields.sort();
-                    var property_to_check = [];
-                    _.each([tr,parent_tr],function(element){
-                        property_to_check.push(
-                            _.detect(_.keys(_CHILDREN),function(res){
-                                    return _.str.include(element, res);
-                                }));
-                        });
-                    self.on_add_node(property_to_check, fields);
+        field_dataset.call( 'fields_get', [],  function(result) {
+            var fields = _.keys(result);
+            fields.push(" "),fields.sort();
+            var property_to_check = [];
+            _.each([tr,parent_tr],function(element){
+                property_to_check.push(
+                    _.detect(_.keys(_CHILDREN),function(res){
+                            return _.str.include(element, res);
+                        }));
                 });
+            self.on_add_node(property_to_check, fields);
+            });
+
     },
     do_node_edit: function(side){
         var self = this;
@@ -681,9 +683,15 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
                     (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level;
                     var clone = self.create_clone(tr_click.clone(),object_xml);
+                    var after_append = _.detect(self.one_object['parent_child_id'],function(ele){
+                            return self.one_object.clicked_tr_id == ele.key;
+                    });
+                    after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id;
+
                      switch (update_values[1]) {
                          case "After":
-                            tr_click.after(clone);
+                            self.edit_xml_dialog.$element.
+                                find("tr[id='viewedit-"+after_append+"']").after(clone);
                             $(arch1).after(update_values[0]);
                             child_list.splice(index + 1, 0, object_xml);
                             break;
@@ -693,10 +701,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
-                            var after_append = _.detect(self.one_object['parent_child_id'],function(ele){
-                                    return self.one_object.clicked_tr_id == ele.key;
-                            });
-                            after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id;
                             if(tr_click.find("img[id^='parentimg-']").length == 0){
                             ($(tr_click.find('a').parent()).siblings('td'))
                                 .append($('<img width="16" height="16"></img>').
@@ -706,9 +710,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                                         self.do_parent_img_hide_show(this);
                                     }));
                             }
+                            $(arch1).append(update_values[0]);
                             self.edit_xml_dialog.$element.
                                 find("tr[id='viewedit-"+after_append+"']").after(clone);
-                            $(arch1).append(update_values[0]);
                             obj.child_id.push(object_xml);
                             break;
                    }
@@ -977,7 +981,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             type_widget.set_value(node.value);
             self.add_widget.push(type_widget);
         });
-        console.log("table_selector.find", table_selector.find("td[id^=]"));
         table_selector.find("td[id^=]").attr("width","100px");
         self.add_node_dialog.$element.find('#new_field').click(function() {
             model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);

From 2417d91e5786f59ed993279ebded502298027c2d Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Nov 2011 15:21:53 +0530
Subject: [PATCH 089/114] [IMP] code refactor in vieweditor.

bzr revid: ysa@tinyerp.com-20111122095153-jox0cz1ocj6tz57l
---
 addons/web/static/src/js/view_editor.js | 223 ++++++++++--------------
 1 file changed, 90 insertions(+), 133 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index ff90f6604a7..3341f323467 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -179,56 +179,54 @@ 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;
+            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();
-                self.main_view_id = self.parent.fields_view.view_id;
+                this.main_view_id = self.parent.fields_view.view_id;
             });
         }
     },
     create_View_Node: function(node){
-        var self = this;
         ViewNode = {
             'level': ($(node).parents()).length + 1,
-            'id': self.xml_element_id += 1,
+            'id': this.xml_element_id += 1,
             'att_list': [],
-            'name': self.add_node_name(node),
+            'name': this.add_node_name(node),
             'child_id': []
         }
         ViewNode.att_list.push(node.tagName.toLowerCase());
-        _.each(node.attributes ,function(att){
-           ViewNode.att_list.push([att.nodeName,att.nodeValue]);
+        _.each(node.attributes, function(att) {
+            ViewNode.att_list.push([att.nodeName, att.nodeValue]);
        });
         return ViewNode;
     },
     append_child_object: function(main_object, parent_id, child_obj_list) {
         var self = this;
-            if(main_object.id == parent_id){
-                var pare
-                main_object.child_id = child_obj_list;
-                return main_object;
-            }else{
-                _.each(main_object.child_id ,function(child_object){
-                    self.append_child_object(child_object, parent_id, child_obj_list);
-                });
-            }
+        if (main_object.id == parent_id) {
+            main_object.child_id = child_obj_list;
+            return main_object;
+        } else {
+            _.each(main_object.child_id, function(child_object) {
+                self.append_child_object(child_object, parent_id, child_obj_list);
+            });
+        }
     },
-    convert_arch_to_obj: function(xml_Node, main_object, parent_id){
+    convert_arch_to_obj: function(xml_Node, main_object, parent_id) {
         var self = this;
         var child_obj_list = [];
-        _.each(xml_Node,function(element){
-           child_obj_list.push(self.create_View_Node(element)) ;
+        _.each(xml_Node, function(element) {
+           child_obj_list.push(self.create_View_Node(element));
         });
         this.append_child_object(main_object, parent_id, child_obj_list);
-        var obj_xml_list = _.zip(xml_Node,child_obj_list);
-        _.each(obj_xml_list, function(node){
-            var children = _.filter(node[0].childNodes, function (child) {
+        var obj_xml_list = _.zip(xml_Node, child_obj_list);
+        _.each(obj_xml_list, function(node) {
+            var children = _.filter(node[0].childNodes, function(child) {
                 return child.nodeType == 1;
             });
-            if(children){
-            self.convert_arch_to_obj(children, main_object, node[1].id);}
+            if (children) {
+                self.convert_arch_to_obj(children, main_object, node[1].id);
+            }
         });
         return main_object;
     },
@@ -276,24 +274,22 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         return parent_list;
     },
     inherit_view : function(arch_object, result) {
-        var self = this;
-        var xml_list = [];
-        var xml_arch = QWeb.load_xml(result.arch);
-        if(xml_arch.childNodes[0].tagName == "data"){
-            xml_list = _.filter(xml_arch.childNodes[0].childNodes, function (child) {
-                            return child.nodeType == 1;
-                        });
-        }else{ xml_list.push( xml_arch.childNodes[0] ); }
-
+        var self = this, xml_list = [], xml_arch = QWeb.load_xml(result.arch);
+        if (xml_arch.childNodes[0].tagName == "data") {
+            xml_list = _.filter(xml_arch.childNodes[0].childNodes, function(child) {
+                return child.nodeType == 1;
+            });
+        } else {
+            xml_list.push( xml_arch.childNodes[0]);
+        }
         _.each(xml_list, function(xml) {
-            var expr_to_list = [];
-            var xpath_arch_object = self.parse_xml(QWeb.tools.xml_node_to_string(xml), result.id);
-            if(xml.tagName == "xpath"){
+            var expr_to_list = [], xpath_arch_object = self.parse_xml(QWeb.tools.xml_node_to_string(xml), result.id);
+            if (xml.tagName == "xpath") {
                 var part_expr = _.without(xml.getAttribute('expr').split("/"), "");
                 _.each(part_expr, function(part) {
                     expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"), ""));
                 });
-            }else{
+            } else {
                 var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
                     return list instanceof Array? _.include(list, "position"): false;
                 });
@@ -305,8 +301,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) {
         var self = this;
         if (xpath_arch_object.length) {
-            var check = expr_list[0];
-            var obj;
+            var check = expr_list[0], obj = false;
             switch (check.length) {
                 case 2:
                     if (parseInt(check[1])) {
@@ -363,15 +358,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             self.increase_level(val, level + 1);
         });
     },
-    do_select_row: function(id){
+    do_select_row: function(row_id) {
         this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected');
-        this.edit_xml_dialog.$element.find("tr[id=viewedit-"+id+"]").addClass('ui-selected');
+        this.edit_xml_dialog.$element.find("tr[id=viewedit-" + row_id + "]").addClass('ui-selected');
     },
-    do_parent_img_hide_show: function(img){
-        var self = this;
+    do_parent_img_hide_show: function(img) {
         if ($(img).attr('src') == '/web/static/src/img/collapse.gif') {
             $(img).attr('src', '/web/static/src/img/expand.gif');
-            self.on_expand(img);
+            this.on_expand(img);
         } else {
             $(img).attr('src', '/web/static/src/img/collapse.gif');
             this.on_collapse(img);
@@ -386,9 +380,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             width: 750,
             height: 500,
             buttons: {
-                "Inherited View": function() {
-                    //TODO
-                },
                 "Preview": function() {
                     var action = {
                         context: self.session.user_context,
@@ -410,18 +401,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }
             }
         }).start().open();
-
         var no_property_att = [];
         _.each(_PROPERTIES, function(val, key) {
             if (! val.length) no_property_att.push(key);
         });
-
         this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object'], 'no_properties': no_property_att}));
-
         this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").click(function() {
             self.do_select_row(this.id.split('-')[1]);
         });
-
         this.edit_xml_dialog.$element.find("img[id^='parentimg-']").click(function() {
             self.do_parent_img_hide_show(this);
         });
@@ -429,19 +416,16 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             self.on_select_img(this);
         });
     },
-
-    on_select_img: function(element_img){
+    on_select_img: function(element_img) {
         var self = this;
         var side = $(element_img).closest("tr[id^='viewedit-']");
         this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]);
         this.one_object.clicked_tr_level = parseInt(side.attr('level'));
         var img = side.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']").attr('src');
-        var view_id,view_xml_id;
-        var view_find = side;
-
+        var view_id = 0, view_xml_id = 0, view_find = side;
         //for view id finding
         var min_level = this.one_object.clicked_tr_id;
-        if(($(side).find('a').text()).search("view_id") != -1){
+        if (($(side).find('a').text()).search("view_id") != -1) {
             view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
             view_xml_id = (view_find.attr('id')).split('-')[1];
             this.one_object.clicked_tr_id  += 1;
@@ -456,7 +440,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     view_xml_id = parseInt((view_find.attr('id')).split('-')[1]);
                     break;
                 }
-                if(view_find.attr('level') < min_level){
+                if (view_find.attr('level') < min_level) {
                     min_level = parseInt(view_find.attr('level'));
                 }
             }
@@ -485,35 +469,33 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     do_node_add: function(side){
         var self = this;
         var tr = $(side).find('a').text();
-        var parent_tr = ($(side).prevAll("tr[level="+String(this.one_object.clicked_tr_level - 1)+"]"))[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();
         field_dataset.call( 'fields_get', [],  function(result) {
             var fields = _.keys(result);
             fields.push(" "),fields.sort();
             var property_to_check = [];
-            _.each([tr,parent_tr],function(element){
+            _.each([tr, parent_tr],function(element) {
                 property_to_check.push(
-                    _.detect(_.keys(_CHILDREN),function(res){
-                            return _.str.include(element, res);
-                        }));
-                });
-            self.on_add_node(property_to_check, fields);
+                _.detect(_.keys(_CHILDREN),function(res){
+                    return _.str.include(element, res);
+                }));
             });
-
+            self.on_add_node(property_to_check, fields);
+        });
     },
-    do_node_edit: function(side){
+    do_node_edit: function(side) {
         var self = this;
-        var result = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []);
+        var result = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], []);
         if (result.length && result[0] && result[0].att_list) {
             var properties = _PROPERTIES[result[0].att_list[0]];
             self.on_edit_node(properties);
         }
     },
-    do_node_down: function(cur_tr, img){
-        var self = this;
-        var next_tr,last_tr;
-        tr_to_move=[];
+    do_node_down: function(cur_tr, img) {
+        var self = this, next_tr, last_tr;
+        tr_to_move = [];
         tr_to_move.push(cur_tr);
         if (img) {
             while (1) {
@@ -529,9 +511,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         } else {
             last_tr = cur_tr.next();
         }
-
         if ((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1) {
-            return;
+            return false;
         }
         if (last_tr.length != 0 &&  parseInt(last_tr.attr('level')) == this.one_object.clicked_tr_level) {
             var last_tr_id = (last_tr.attr('id')).split('-')[1];
@@ -553,10 +534,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             self.do_save_update_arch("down");
         }
     },
-    do_node_up: function(cur_tr, img){
-        var self = this;
-        var side = cur_tr;
-        tr_to_move=[];
+    do_node_up: function(cur_tr, img) {
+        var self = this, side = cur_tr;
+        tr_to_move = [];
         tr_to_move.push(side);
         while (1) {
             var prev_tr = cur_tr.prev();
@@ -607,12 +587,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             });
         }
         arch_to_pass = _.filter($(arch.arch), function (child) {
-                return child.nodeType == 1;
-            });
-
+            return child.nodeType == 1;
+        });
         return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0],[], move_direct, update_values,arch);
     },
-    get_object_by_id: function(id ,one_object, result) {
+    get_object_by_id: function(id, one_object, result) {
         var self = this;
         if (result.length == 0 ) {
             var check = _.detect(one_object , function(obj) {
@@ -629,8 +608,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         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);
-        clone.attr("id","viewedit-" + new_node_obj.id);
-        clone.attr("level",new_node_obj.level);
+        clone.attr("id", "viewedit-" + new_node_obj.id);
+        clone.attr("level", new_node_obj.level);
         clone.find("img[id^='parentimg-']").remove();
         clone.bind("click",function(){
             self.do_select_row(this.id.split('-')[1]);
@@ -641,28 +620,22 @@ 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;
-        var children_list =  $(arch1).children();
-        var list_obj_xml = _.zip(children_list, obj.child_id);
+        var self = this, children_list =  $(arch1).children(), list_obj_xml = _.zip(children_list, obj.child_id);
         if (this.one_object.clicked_tr_id) {
             if (obj.id == this.one_object.clicked_tr_id) {
-                var parent;
-                var index = _.indexOf(child_list, obj);
+                var parent = false, index = _.indexOf(child_list, obj);
                 if (move_direct == "down") {
                     var next = $(arch1).next();
                     $(next).after(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index+1, 0, re_insert_obj[0]);
                     parent = $(arch1).parents();
-
                 } else if (move_direct == "up") {
-
                     var prev = $(arch1).prev();
                     $(prev).before(arch1);
                     var re_insert_obj = child_list.splice(index, 1);
                     child_list.splice(index-1, 0, re_insert_obj[0]);
                     parent = $(arch1).parents();
-
                 } else if (move_direct == "update_node") {
                     _.each(update_values, function(val){
                         if (val[1]) $(arch1)[0].setAttribute(val[0], val[1]);
@@ -675,10 +648,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
                     parent = $(arch1).parents();
-
                 }else if(move_direct == "add_node"){
-                    var tr_click =
-                    self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']");
+                    var tr_click = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']");
                     var temp_xml = QWeb.load_xml(update_values[0]);
                     var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
                     (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level;
@@ -687,7 +658,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             return self.one_object.clicked_tr_id == ele.key;
                     });
                     after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id;
-
                      switch (update_values[1]) {
                          case "After":
                             self.edit_xml_dialog.$element.
@@ -719,10 +689,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     self.edit_xml_dialog.$element.
                         find("tr[id='viewedit-" + object_xml.id + "']").removeClass('ui-selected');
                     parent = $(arch1).parents();
-
-                }else if(move_direct == "remove_node"){
+                } else if (move_direct == "remove_node") {
                     parent = $(arch1).parents();
-                    if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){
+                    if (parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")) {
                         self.one_object.clicked_tr_id = self.one_object.clicked_tr_id -1;
                         self.one_object.clicked_tr_level = self.one_object.clicked_tr_level - 1;
                         (parent.length == 0)?parent.push("remove_view"):false;
@@ -737,29 +706,25 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     cur_tr.remove();
                     self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
                 }
-
-                var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1;
-                if(convert_to_utf != "remove_view"){
+                var convert_to_utf = (parent.length != 0)? parent[parent.length-1]: arch1;
+                if (convert_to_utf != "remove_view") {
                     convert_to_utf = QWeb.tools.xml_node_to_string(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;
-                    this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) {
-                    });
-                }else{
-                    this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) {
-                    });
+                    this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) {});
+                } else {
+                    this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) {});
                 }
                 if(move_direct == "add_node"){
                     self.add_node_dialog.close();
                     self.on_select_img(clone.find("img[id='side-edit']")[0]);
                     self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
-                    }
+                }
             }
             if (obj.level <= this.one_object.clicked_tr_level) {
                 _.each(list_obj_xml, function(child_node) {
-                    self.do_save_xml(child_node[0], child_node[1], obj.child_id,
-                                    move_direct, update_values, arch);
+                    self.do_save_xml(child_node[0], child_node[1], obj.child_id, move_direct, update_values, arch);
                 });
             }
         }
@@ -782,8 +747,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
     },
     on_collapse: function(collapse_img) {
-        var self = this;
-        var id = collapse_img.id.split('-')[1];
+        var self = this, id = collapse_img.id.split('-')[1];
         var datas = _.detect(self.one_object['parent_child_id'] , function(res) {
             return res.key == id;
         });
@@ -923,12 +887,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     },
     on_add_node: function(properties, fields){
         var self = this;
-        var  positions = ['After','Before','Inside'];
-        var  render_list = [];
-        var  render_list =[{'name': 'node_type','selection': _.keys(_CHILDREN).sort(),
-                            'value': 'field', 'string': 'Node Type','type': 'selection'},
-                {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
-            {'name': 'position','selection': positions, 'value': false, 'string': 'Position','type': 'selection'}   ];
+        var  render_list = [{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type','type': 'selection'},
+                            {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
+                            {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}
+                           ];
         this.add_widget = [];
         this.add_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -966,14 +928,11 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         _.each(render_list,function(node){
             type_widget = new (self.property.get_any([node.type])) (self.add_node_dialog, node);
             if(node.name == "position"){
-                table_selector.
-                    append('</tr><tr><td align="right" width="100px">' + node.string + '</td>' + type_widget.render() + '</tr>');
+                table_selector.append('</tr><tr><td align="right" width="100px">' + node.string + '</td>' + type_widget.render() + '</tr>');
             }else{
-                table_selector.
-                    append('<td align="right">' + node.string + '</td>' + type_widget.render() );
+                table_selector.append('<td align="right">' + node.string + '</td>' + type_widget.render() );
                 if(node.name == "field_value"){
-                    table_selector.
-                        append('<td id="new_field" align="right"  width="100px"> <button>New Field</button></td>');
+                    table_selector.append('<td id="new_field" align="right"  width="100px"> <button>New Field</button></td>');
                 }
             }
             type_widget.start();
@@ -985,13 +944,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);
             model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) {
                 self.render_new_field(result[0].id);
-                    });
+            });
         });
     },
     render_new_field :function(id){
         var self = this;
         var action = {
-            context: {'default_model_id':id, 'manual':true},
+            context: {'default_model_id': id, 'manual':true},
             res_model: "ir.model.fields",
             views: [[false, 'form']],
             type: 'ir.actions.act_window',
@@ -1008,7 +967,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 new_fields_name = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
                 new_fields_name.read_ids([controller.datarecord.id], ['name'], function(result) {
                 self.add_node_dialog.$element.
-                    find('select[id=field_value]').append($("<option></option>").
+                    find('select[id=field_value]').append($("<option selected></option>").
                     attr("value",result[0].name).text(result[0].name));
                     _.detect(self.add_widget,function(widget){
                         (widget.name == "field_value")?widget.selection.push(result[0].name):false;
@@ -1033,8 +992,8 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         this.update_dom();
     },
     update_dom: function() {
-        this.$element.find("td[id="+ this.name+"]").toggleClass('invalid', this.is_invalid);
-        this.$element.find("td[id="+ this.name+"]").toggleClass('required', this.required);
+        this.$element.find("td[id=" + this.name + "]").toggleClass('invalid', this.is_invalid);
+        this.$element.find("td[id=" + this.name + "]").toggleClass('required', this.required);
     },
     on_ui_change: function() {
         this.validate();
@@ -1106,7 +1065,6 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
                 }
             }
         });
-
     },
     set_value: function(value) {
         value = value === null ? false : value;
@@ -1133,11 +1091,10 @@ openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.ext
             if (_.include(value.split(','), item[0])) {
                 self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1)
             }
-         });
+        });
     }
 });
 openerp.web.ViewEditor.FieldFloat = openerp.web.ViewEditor.FieldChar.extend({
-
 });
 
 var _PROPERTIES = {

From 2a75b1e935897162aa09e0427a29bcb656d9b011 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 22 Nov 2011 15:34:54 +0530
Subject: [PATCH 090/114] [IMP] Improve code in vieweditor.

bzr revid: ysa@tinyerp.com-20111122100454-nzr2tn6mi1112usq
---
 addons/web/static/src/js/view_editor.js | 118 +++++++++++-------------
 1 file changed, 52 insertions(+), 66 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 3341f323467..20610274a67 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -494,8 +494,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
     },
     do_node_down: function(cur_tr, img) {
-        var self = this, next_tr, last_tr;
-        tr_to_move = [];
+        var self = this, next_tr, last_tr, tr_to_move = [];
         tr_to_move.push(cur_tr);
         if (img) {
             while (1) {
@@ -535,8 +534,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         }
     },
     do_node_up: function(cur_tr, img) {
-        var self = this, side = cur_tr;
-        tr_to_move = [];
+        var self = this, side = cur_tr, tr_to_move = [];
         tr_to_move.push(side);
         while (1) {
             var prev_tr = cur_tr.prev();
@@ -580,9 +578,9 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             var children = _.filter(xml_arch.childNodes[0].childNodes, function (child) {
                 return child.nodeType == 1;
             });
-            arch.arch = _.detect(children, function(xml_child){
-                var temp_obj = self.create_View_Node(xml_child);
-                var insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
+            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;}
             });
         }
@@ -648,13 +646,13 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             find('a').text(new_obj.name);
                     child_list.splice(index, 1, new_obj);
                     parent = $(arch1).parents();
-                }else if(move_direct == "add_node"){
-                    var tr_click = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']");
-                    var temp_xml = QWeb.load_xml(update_values[0]);
-                    var object_xml = self.create_View_Node(temp_xml.childNodes[0]);
+                } else if(move_direct == "add_node") {
+                    var tr_click = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']"),
+                        temp_xml = QWeb.load_xml(update_values[0]),
+                        object_xml = self.create_View_Node(temp_xml.childNodes[0]);
                     (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level;
-                    var clone = self.create_clone(tr_click.clone(),object_xml);
-                    var after_append = _.detect(self.one_object['parent_child_id'],function(ele){
+                    var clone = self.create_clone(tr_click.clone(),object_xml),
+                        after_append = _.detect(self.one_object['parent_child_id'],function(ele){
                             return self.one_object.clicked_tr_id == ele.key;
                     });
                     after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id;
@@ -671,14 +669,12 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             child_list.splice(index - 1, 0, object_xml);
                             break;
                         case "Inside":
-                            if(tr_click.find("img[id^='parentimg-']").length == 0){
-                            ($(tr_click.find('a').parent()).siblings('td'))
-                                .append($('<img width="16" height="16"></img>').
-                                    attr('src', '/web/static/src/img/collapse.gif').
-                                    attr('id','parentimg-'+ self.one_object.clicked_tr_id)
-                                    .click(function(){
+                            if (tr_click.find("img[id^='parentimg-']").length == 0) {
+                                ($(tr_click.find('a').parent()).siblings('td'))
+                                    .append($('<img width="16" height="16"></img>').attr('src', '/web/static/src/img/collapse.gif').
+                                    attr('id','parentimg-'+ self.one_object.clicked_tr_id).click(function(){
                                         self.do_parent_img_hide_show(this);
-                                    }));
+                                }));
                             }
                             $(arch1).append(update_values[0]);
                             self.edit_xml_dialog.$element.
@@ -765,29 +761,28 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             width: 500,
             height: 400,
             buttons: {
-                    "Update": function(){
-                        var warn = false;
-                        var update_values = [];
-                        _.each(self.edit_widget, function(widget) {
-                            if (widget.is_invalid) {
-                                warn = true;
-                                return false;
-                            };
-                            if (widget.dirty && !widget.is_invalid) {
-                                update_values.push([widget.name, widget.get_value()]);
-                            }
-                        });
-                        if (warn) {
-                            self.on_valid_create_view(self.edit_widget);
-                        } else {
-                            self.do_save_update_arch("update_node", update_values);
-                            self.edit_node_dialog.close();
+                "Update": function(){
+                    var warn = false, update_values = [];
+                    _.each(self.edit_widget, function(widget) {
+                        if (widget.is_invalid) {
+                            warn = true;
+                            return false;
+                        };
+                        if (widget.dirty && !widget.is_invalid) {
+                            update_values.push([widget.name, widget.get_value()]);
                         }
-                    },
-                    "Cancel": function(){
+                    });
+                    if (warn) {
+                        self.on_valid_create_view(self.edit_widget);
+                    } else {
+                        self.do_save_update_arch("update_node", update_values);
                         self.edit_node_dialog.close();
                     }
+                },
+                "Cancel": function(){
+                    self.edit_node_dialog.close();
                 }
+            }
         });
         this.edit_node_dialog.start().open();
         var _PROPERTIES_ATTRIBUTES = {
@@ -860,9 +855,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             self.groups = false;
             def.resolve();
         }
-        var group_ids = [],
-        group_names = {},
-        groups = [];
+        var group_ids = [], group_names = {}, groups = [];
         var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
             model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
             res_groups
@@ -876,7 +869,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 model_data
                 .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]})
                 .done(function(model_grp) {
-                    _.each(model_grp,function(res_group){
+                    _.each(model_grp, function(res_group) {
                         groups.push([res_group.module + "." + res_group.name,group_names[res_group.res_id]]);
                     });
                     self.groups = groups;
@@ -889,8 +882,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var self = this;
         var  render_list = [{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type','type': 'selection'},
                             {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
-                            {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}
-                           ];
+                            {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}];
         this.add_widget = [];
         this.add_node_dialog = new openerp.web.Dialog(this,{
             modal: true,
@@ -899,8 +891,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             height: 190,
             buttons: {
                     "Update": function(){
-                        var check_add_node = true;
-                        var values = {};
+                        var check_add_node = true, values = {};
                         _.each(self.add_widget, function(widget) {
                             values[widget.name] = widget.get_value() || false;
                         });
@@ -922,16 +913,15 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                     }
            }
         }).start().open();
-        this.add_node_dialog.$element.
-        append('<table id="rec_table"  style="width:420px" class="oe_forms"><tbody><tr></tbody></table>');
+        this.add_node_dialog.$element.append('<table id="rec_table"  style="width:420px" class="oe_forms"><tbody><tr></tbody></table>');
         var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody');
-        _.each(render_list,function(node){
+        _.each(render_list, function(node) {
             type_widget = new (self.property.get_any([node.type])) (self.add_node_dialog, node);
-            if(node.name == "position"){
+            if (node.name == "position") {
                 table_selector.append('</tr><tr><td align="right" width="100px">' + node.string + '</td>' + type_widget.render() + '</tr>');
-            }else{
+            } else {
                 table_selector.append('<td align="right">' + node.string + '</td>' + type_widget.render() );
-                if(node.name == "field_value"){
+                if (node.name == "field_value") {
                     table_selector.append('<td id="new_field" align="right"  width="100px"> <button>New Field</button></td>');
                 }
             }
@@ -966,12 +956,10 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 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'], 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));
+                self.add_node_dialog.$element.find('select[id=field_value]').append($("<option selected></option>").attr("value", result[0].name).text(result[0].name));
                     _.detect(self.add_widget,function(widget){
-                        (widget.name == "field_value")?widget.selection.push(result[0].name):false;
-                      });
+                        widget.name == "field_value"? widget.selection.push(result[0].name): false;
+                    });
                 });
             });
         });
@@ -1028,8 +1016,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         }
     },
     get_value: function() {
-        var value = this.$element.find("input[id=" + this.name + "]").is(':checked')
-        return  value? "1" : null;
+        return  this.$element.find("input[id=" + this.name + "]").is(':checked')? "1" : null;
     }
 });
 openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
@@ -1055,11 +1042,11 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         this._super();
         this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() {
             self.on_ui_change();
-            if(self.name == "node_type"){
-                if(self.get_value() == "field"){
+            if (self.name == "node_type") {
+                if (self.get_value() == "field") {
                     self.$element.find('#new_field').show();
                     self.$element.find("select[id=field_value]").show();
-                }else{
+                } else {
                     self.$element.find('#new_field').hide();
                     self.$element.find("select[id=field_value]").hide();
                 }
@@ -1067,8 +1054,8 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         });
     },
     set_value: function(value) {
-        value = value === null ? false : value;
         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;
         }
@@ -1081,7 +1068,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
 openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.extend({
     start: function () {
         this._super();
-        this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple",true);
+        this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple", true);
     },
     set_value: function(value) {
         var self = this;
@@ -1125,7 +1112,6 @@ var _CHILDREN = {
     'page': ['notebook', 'group', 'field', 'label', 'button', 'newline', 'separator'],
     'group': ['field', 'label', 'button', 'separator', 'newline'],
     'board': ['column'],
-    'child2': ['action'],
     'action': [],
     'field': ['form', 'tree', 'graph'],
     'label': [],

From 82f88b06d61de3f1a186f6526260d2cb906682ca Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 22 Nov 2011 11:13:38 +0100
Subject: [PATCH 091/114] [IMP] account: added constraint on account_journal
 currency + changed default value of type field for new account_account

bzr revid: qdp-launchpad@openerp.com-20111122101338-44k60vjsnmf3khud
---
 addons/account/account.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 630735c487f..c8895fa6946 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -461,7 +461,7 @@ class account_account(osv.osv):
     }
 
     _defaults = {
-        'type': 'view',
+        'type': 'other',
         'reconcile': False,
         'active': True,
         'currency_mode': 'current',
@@ -716,6 +716,19 @@ class account_journal(osv.osv):
 
     _order = 'code'
 
+    def _check_currency(self, cr, uid, ids, context=None):
+        for journal in self.browse(cr, uid, ids, context=context):
+            if journal.currency:
+                if journal.default_credit_account_id and not journal.default_credit_account_id.currency_id.id == journal.currency.id:
+                    return False
+                if journal.default_debit_account_id and not journal.default_debit_account_id.currency_id.id == journal.currency.id:
+                    return False
+        return True
+
+    _constraints = [
+        (_check_currency, 'Configuration error! The currency chosen should be shared by the default accounts too.', ['currency','default_debit_account_id','default_credit_account_id']),
+    ]
+
     def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
         journal = self.browse(cr, uid, id, context=context)
         if not default:

From b7dfc8bb45b326ac813714882f7c120058a8e3b2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Nov 2011 11:18:13 +0100
Subject: [PATCH 092/114] [FIX] semicolon warnings

bzr revid: xmo@openerp.com-20111122101813-61xmoekdio52j1oj
---
 addons/web/static/src/js/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 0d3833ee835..1f2520ee774 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -826,7 +826,7 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
                 var index = {};
                 _.each(_.range(result.length), function(i) {
                     index[result[i]["id"]] = result[i];
-                })
+                });
                 result = _.map(args[0], function(x) {return index[x];});
             }
             return result;
@@ -843,7 +843,7 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
             context: context
         }).pipe(function(result) {
             return result.records;
-        });;
+        });
     }
 });
 

From 2e5d7852f4586081c25df85d60912b269e036395 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Nov 2011 11:19:50 +0100
Subject: [PATCH 093/114] [FIX] comma-terminated object literals

bzr revid: xmo@openerp.com-20111122101950-mng5zy4os3mukj6d
---
 addons/web/static/src/js/chrome.js          |  2 +-
 addons/web/static/src/js/view_editor.js     | 10 +++++-----
 addons/web/static/src/js/view_form.js       |  2 +-
 addons/web_process/static/src/js/process.js |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2b838ee3743..f10ee9376f6 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1114,7 +1114,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
         this.action_manager.do_action(action);
     },
     do_about: function() {
-    },
+    }
 
 });
 
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 71cda6fcc47..c53a7f8df38 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -32,7 +32,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 search_view:false,
                 pager:false,
                 radio: true
-            },
+            }
         };
         this.view_edit_dialog = new openerp.web.Dialog(this, {
             modal: true,
@@ -50,7 +50,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 "Close": function(){
                     self.view_edit_dialog.close();
                 }
-            },
+            }
         });
         this.view_edit_dialog.start().open();
         var action_manager = new openerp.web.ActionManager(this);
@@ -276,8 +276,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                             views_switcher: false,
                             action_buttons:false,
                             search_view:false,
-                            pager:false,
-                        },
+                            pager:false
+                        }
                     };
                     var action_manager = new openerp.web.ActionManager(self);
                     action_manager.do_action(action);
@@ -289,7 +289,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         });
         this.edit_xml_dialog.start().open();
         this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {
-            'data': one_object['main_object'],
+            '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');
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9bd1916d714..dcc0c6bd950 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -985,7 +985,7 @@ openerp.web.form.WidgetFrame = openerp.web.form.Widget.extend({
 });
 
 openerp.web.form.WidgetGroup = openerp.web.form.WidgetFrame.extend({
-    template: 'WidgetGroup',
+    template: 'WidgetGroup'
 }),
 
 openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({
diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index f7497773645..52f6ab1a674 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -303,7 +303,7 @@ openerp.web_process = function (openerp) {
                     pager: false
                 }
             });
-        },
+        }
     });
 };
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

From 300478d1ec13fd9a9c3c624efc9da1df8f79b6b7 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 22 Nov 2011 11:23:38 +0100
Subject: [PATCH 094/114] [IMP] account_voucher: usability improvement.

bzr revid: qdp-launchpad@openerp.com-20111122102338-l3pysqm8f2j9hwsl
---
 .../account_voucher/voucher_payment_receipt_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 2c9b2edee6e..46720b2732c 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -93,7 +93,7 @@
                     <notebook colspan="4">
                         <page string="Payment Information">
                             <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
-                                <tree string="Open Supplier Journal Entries" editable="bottom">
+                                <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -107,7 +107,7 @@
                                 </tree>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
-                                <tree string="Open Customer Journal Entries" editable="bottom">
+                                <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id"/>
                                     <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
                                     <field name="date_original"/>
@@ -160,7 +160,7 @@
                     <notebook colspan="4">
                         <page string="Payment Information">
                             <field name="line_dr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140">
-                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom">
+                                <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -175,7 +175,7 @@
                                 </tree>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
-                                <tree string="Credits" editable="bottom">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id"/>
                                     <field name="account_id" groups="base.group_extended" domain="[('type','=','receivable')]"/>
                                     <field name="date_original"/>
@@ -309,7 +309,7 @@
                     <notebook colspan="4">
                         <page string="Payment Information">
                             <field name="line_cr_ids" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
-                                <tree string="Invoices and outstanding transactions" editable="bottom">
+                                <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
                                         domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
@@ -324,7 +324,7 @@
                                 </tree>
                             </field>
                             <field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, context)">
-                                <tree string="Credits" editable="bottom">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id"/>
                                     <field name="account_id"  groups="base.group_extended" domain="[('type','=','receivable')]"/>
                                     <field name="date_original"/>

From a738f4390f718c809b51f02597d1dac148e4314b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Nov 2011 11:26:09 +0100
Subject: [PATCH 095/114] [FIX] do not reload sidebar during form's on_loaded
 if it's already setup

There's no information provided to FormView#on_loaded which should
change the sidebar and reloading it apparently breaks
stuff... severely.

So just don't touch it if it's already setup (assigned to instance
variable), everything works right (as the readonly mode fundamentally
only changes the way the form is displayed, it should not alter its
internal behaviors)

lp bug: https://launchpad.net/bugs/891117 fixed

bzr revid: xmo@openerp.com-20111122102609-faldd3xkc0xhzvu2
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index dcc0c6bd950..c5a2fbb4dc6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -107,7 +107,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         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) {
+        if (!this.sidebar && this.options.sidebar && this.options.sidebar_id) {
             this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id);
             this.sidebar.start();
             this.sidebar.do_unfold();

From a3f61bd9a7a7eb5c5772927b47101e4261a90464 Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Tue, 22 Nov 2011 11:44:48 +0100
Subject: [PATCH 096/114] [ADD] common api for plugin

bzr revid: tfr@openerp.com-20111122104448-5uo0dd0g50yhk2cq
---
 addons/plugin/__init__.py       |  25 ++++++
 addons/plugin/__openerp__.py    |  45 ++++++++++
 addons/plugin/plugin_handler.py | 151 ++++++++++++++++++++++++++++++++
 3 files changed, 221 insertions(+)
 create mode 100644 addons/plugin/__init__.py
 create mode 100644 addons/plugin/__openerp__.py
 create mode 100644 addons/plugin/plugin_handler.py

diff --git a/addons/plugin/__init__.py b/addons/plugin/__init__.py
new file mode 100644
index 00000000000..1844c42011c
--- /dev/null
+++ b/addons/plugin/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import plugin_handler
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
new file mode 100644
index 00000000000..b598690cbf2
--- /dev/null
+++ b/addons/plugin/__openerp__.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Common interface for CRM plugin (Thunderbird and Outlook)',
+    'version': '1.0',
+    'category': 'Hidden',
+    'complexity': "easy",
+    'description': """
+The common interface for pugin.
+=====================================================
+
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': [
+        'base',
+    ],
+    'data': [],
+    'demo': [],
+    'test': [],
+    'installable': True,
+    'active': False,
+    'images': [],
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
new file mode 100644
index 00000000000..25ebe7fde80
--- /dev/null
+++ b/addons/plugin/plugin_handler.py
@@ -0,0 +1,151 @@
+'''
+Created on 18 oct. 2011
+
+@author: openerp
+'''
+
+from osv import osv, fields
+
+
+class plugin_handler(osv.osv_memory):
+    _name = 'plugin.handler'
+    
+    def _make_url(self, cr, uid, res_id, model, context=None):
+        """
+            @param id: on which document the message is pushed
+            @param model: name of the document linked with the mail
+            @return url
+        """
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
+        if base_url:
+            base_url += '/?id=%s&model=%s'%(res_id,model)
+        return base_url
+    
+    def is_installed(self, cr, uid):
+        return True
+    
+    def partner_get(self, cr, uid, address_email):
+        ids = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '!=', False), ('email', 'like', address_email)])
+        res_id = ids and self.pool.get('res.partner.address').browse(cr, uid, ids[0]).partner_id.id or 0
+        url = self._make_url(cr, uid, res_id, 'res.partner')
+        return ('res.partner', res_id , url)
+    
+    def document_get(self, cr, uid, email):
+        """
+            @param email: email is a standard RFC2822 email message
+            @return Dictionary which contain id and the model name of the document linked with the mail
+                if no document is found the id = 0
+                (model_name, res_id, name_get, url) 
+        """
+        mail_message_obj = self.pool.get('mail.message')
+        model = False
+        res_id = 0
+        url = False
+
+        msg = mail_message_obj.parse_message(email)
+        references = [msg.get('message-id')]
+        refs =  msg.get('references',False)
+        if refs:
+            references.extend(refs.split())
+            
+        msg_ids = mail_message_obj.search(cr, uid, [('message_id','in',references)])
+        if msg_ids:
+            msg = mail_message_obj.browse(cr, uid, msg_ids[0])
+            res_id = msg.res_id
+            model = msg.model
+            url = self._make_url(cr, uid, res_id, model)
+        return (model,  res_id, url)
+        
+    def document_type(self, cr, uid, context=None):
+        """
+            Return the list of available model to push
+            res.partner is a special case
+            otherwise all model that inherit from mail.thread
+            ['res.partner', 'project.issue']
+        """
+        mail_thread_obj = self.pool.get('mail.thread')
+        doc_dict = mail_thread_obj.message_capable_models(cr, uid, context)
+        doc_dict['res.partner'] = "Partner"
+        return doc_dict.items()
+
+    def list_document_get(self, cr, uid, model, name):
+        """
+            This function return the result of name_search on the object model
+            @param model: the name of the model 
+            @param : the name of the document
+            @return : the result of name_search a list of tuple 
+            [(id, 'name')]
+        """
+        return self.pool.get(model).name_search(cr,uid,name)
+    
+    def push_message(self, cr, uid, model, email, res_id=0):
+        """
+            @param email: email is a standard RFC2822 email message
+            @param model: On which model the message is pushed
+            @param thread_id: on which document the message is pushed, if thread_id = 0 a new document is created 
+            @return Dictionary which contain model , url and resource id.
+        """
+        mail_message = self.pool.get('mail.message')
+        model_obj = self.pool.get(model)
+        
+        msg = mail_message.parse_message(email)
+        message_id = msg.get('message-id')
+         
+        
+        mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
+        if message_id and mail_ids :
+            mail_record = mail_message.browse(cr, uid, mail_ids)[0]
+            res_id = mail_record.res_id
+            notify = "Email already pushed"
+        elif res_id == 0:
+            if model == 'res.partner':
+                notify = 'User the button Partner to create a new partner'
+            else:
+                res_id = model_obj.message_new(cr, uid, msg)
+                notify = "Mail succefully pushed, a new %s has been created " % model
+        else:
+            model_obj.message_append_dict(cr, uid, [res_id], msg)
+            notify = "Mail succefully pushed"
+        url = self._make_url(cr, uid, res_id, model)
+        return (model, res_id, url, notify)
+        
+    
+    def contact_create(self, cr, uid, data, partner_id):
+        """
+            @param data : the data use to create the res.partner.address
+                [('field_name', value)], field name is required
+            @param partner_id : On which partner the address is attached 
+             if partner_id = 0 then create a new partner with the same name that the address
+            @return : the partner_id sended or created, this allow the plugin to open the right partner page
+        """
+        print "create contact", data, partner_id
+        partner_obj = self.pool.get('res.partner')
+        dictcreate = dict(data) 
+        if partner_id == 0:
+            partner_id =  partner_obj.create(cr, uid, {'name':dictcreate.get('name')})
+        dictcreate['partner_id'] = partner_id
+        self.pool.get('res.partner.address').create(cr, uid, dictcreate)
+        url = self._make_url(cr, uid, partner_id, 'res.partner')
+        return ('res.partner', partner_id, url)
+    
+    
+    
+    ##############################
+    #                            #
+    #    Specific to outlook     #
+    #                            #
+    ##############################
+    
+    def attachment_create(self,cr, uid, data):
+        """
+            @param data : the data use to create the ir.attachment
+            [('field_name', value)], field name is required.
+        """
+        ir_attachment_obj = self.pool.get('ir.attachment')
+        attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', data.get('res_model')), ('res_id', '=', data.get('res_id')), ('datas_fname', '=', data.get('datas_fname'))])
+        if attachment_ids:
+            return attachment_ids[0]
+        else:
+            vals = {"res_model": data.get('res_model'), "res_id": data.get('res_id'), "name": data.get('name'), "datas" : data.get('datas'), "datas_fname" : data.get('datas_fname')}
+            return ir_attachment_obj.create(cr, uid, vals)
+

From 784bf2fcbead0e8480e98099897b74e0b34b2c2d Mon Sep 17 00:00:00 2001
From: "tfr@openerp.com" <>
Date: Tue, 22 Nov 2011 11:52:02 +0100
Subject: [PATCH 097/114] [CLEAN] remove print

bzr revid: tfr@openerp.com-20111122105202-13mhvor9gvo1nwpo
---
 addons/plugin/plugin_handler.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 25ebe7fde80..202b050c722 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -118,7 +118,6 @@ class plugin_handler(osv.osv_memory):
              if partner_id = 0 then create a new partner with the same name that the address
             @return : the partner_id sended or created, this allow the plugin to open the right partner page
         """
-        print "create contact", data, partner_id
         partner_obj = self.pool.get('res.partner')
         dictcreate = dict(data) 
         if partner_id == 0:

From 5c5d874f5f20c1fc0bb5e77521feefc6114596ab Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Tue, 22 Nov 2011 16:46:30 +0530
Subject: [PATCH 098/114] [FIX]fix issue of review.

bzr revid: vme@tinyerp.com-20111122111630-i5nekbbyilt16mpr
---
 addons/web/static/src/js/view_editor.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 9a8d5c7268e..617546149a1 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -593,7 +593,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
         var arch = _.detect(self.one_object['arch'], function(element) 
             {return element.view_id == self.one_object.clicked_tr_view[0]});
         var obj = self.get_object_by_id(this.one_object.clicked_tr_view[1],this.one_object['main_object'], []);
-         //for finding xpath tag from inherit view
+        //for finding xpath tag from inherit view
         var xml_arch = QWeb.load_xml(arch.arch);
         if (xml_arch.childNodes[0].tagName == "data") {
             var check_list = _.flatten(obj[0].child_id[0].att_list);
@@ -723,8 +723,8 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                 }else if(move_direct == "remove_node"){
                     parent = $(arch1).parents();
                     if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){
-                        id = id -1;
-                        level = level - 1;
+                        self.one_object.clicked_tr_id = self.one_object.clicked_tr_id -1;
+                        self.one_object.clicked_tr_level = self.one_object.clicked_tr_level - 1;
                         (parent.length == 0)?parent.push("remove_view"):false;
                     }
                     $(arch1).remove();
@@ -735,6 +735,14 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
                         tr_element.remove();
                     });
                     cur_tr.remove();
+                    var parent_img = _.detect(self.one_object['parent_child_id'],function(element){
+                        return _.include(element.value, self.one_object.clicked_tr_id);
+                    });
+                    if(parent_img.value.length == 1){
+                        self.edit_xml_dialog.$element.
+                            find("tr[id='viewedit-"+parent_img.key+"']").
+                            find("img[id^='parentimg-']").remove();
+                    }
                     self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
                 }
                 

From 2503908223188a55d9fefef2edb72dc65fd62590 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 22 Nov 2011 16:55:25 +0530
Subject: [PATCH 099/114] [IMP] outlook function prototype for plugin

bzr revid: al@openerp.com-20111122112525-wf86e3q6tgb2mgas
---
 addons/plugin/plugin_handler.py | 59 +++++++++++++++++----------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index 202b050c722..b21f7423263 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -9,7 +9,7 @@ from osv import osv, fields
 
 class plugin_handler(osv.osv_memory):
     _name = 'plugin.handler'
-    
+
     def _make_url(self, cr, uid, res_id, model, context=None):
         """
             @param id: on which document the message is pushed
@@ -20,16 +20,16 @@ class plugin_handler(osv.osv_memory):
         if base_url:
             base_url += '/?id=%s&model=%s'%(res_id,model)
         return base_url
-    
+
     def is_installed(self, cr, uid):
         return True
-    
+
     def partner_get(self, cr, uid, address_email):
         ids = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '!=', False), ('email', 'like', address_email)])
         res_id = ids and self.pool.get('res.partner.address').browse(cr, uid, ids[0]).partner_id.id or 0
         url = self._make_url(cr, uid, res_id, 'res.partner')
         return ('res.partner', res_id , url)
-    
+
     def document_get(self, cr, uid, email):
         """
             @param email: email is a standard RFC2822 email message
@@ -55,7 +55,7 @@ class plugin_handler(osv.osv_memory):
             model = msg.model
             url = self._make_url(cr, uid, res_id, model)
         return (model,  res_id, url)
-        
+
     def document_type(self, cr, uid, context=None):
         """
             Return the list of available model to push
@@ -68,6 +68,7 @@ class plugin_handler(osv.osv_memory):
         doc_dict['res.partner'] = "Partner"
         return doc_dict.items()
 
+    # Can be used where search record was used 
     def list_document_get(self, cr, uid, model, name):
         """
             This function return the result of name_search on the object model
@@ -77,7 +78,7 @@ class plugin_handler(osv.osv_memory):
             [(id, 'name')]
         """
         return self.pool.get(model).name_search(cr,uid,name)
-    
+
     def push_message(self, cr, uid, model, email, res_id=0):
         """
             @param email: email is a standard RFC2822 email message
@@ -108,8 +109,7 @@ class plugin_handler(osv.osv_memory):
             notify = "Mail succefully pushed"
         url = self._make_url(cr, uid, res_id, model)
         return (model, res_id, url, notify)
-        
-    
+
     def contact_create(self, cr, uid, data, partner_id):
         """
             @param data : the data use to create the res.partner.address
@@ -126,25 +126,26 @@ class plugin_handler(osv.osv_memory):
         self.pool.get('res.partner.address').create(cr, uid, dictcreate)
         url = self._make_url(cr, uid, partner_id, 'res.partner')
         return ('res.partner', partner_id, url)
-    
-    
-    
-    ##############################
-    #                            #
-    #    Specific to outlook     #
-    #                            #
-    ##############################
-    
-    def attachment_create(self,cr, uid, data):
-        """
-            @param data : the data use to create the ir.attachment
-            [('field_name', value)], field name is required.
-        """
-        ir_attachment_obj = self.pool.get('ir.attachment')
-        attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', data.get('res_model')), ('res_id', '=', data.get('res_id')), ('datas_fname', '=', data.get('datas_fname'))])
-        if attachment_ids:
-            return attachment_ids[0]
-        else:
-            vals = {"res_model": data.get('res_model'), "res_id": data.get('res_id'), "name": data.get('name'), "datas" : data.get('datas'), "datas_fname" : data.get('datas_fname')}
-            return ir_attachment_obj.create(cr, uid, vals)
 
+    # Specific to outlook rfc822 is not available so we split in arguments headerd,body,attachemnts
+    def push_message_outlook(self, cr, uid, model, headers, body_text, body_html, attachments):
+        pass
+        # ----------------------------------------
+        # solution 1
+        # construct a fake rfc822 from the separated arguement
+        #m = email.asdfsadf
+        # use the push_message method
+        #self.push_message(m)
+        # ----------------------------------------
+        # solution 2
+        # use self.pushmessage only with header and body
+        # add attachemnt yourself after
+
+        #ir_attachment_obj = self.pool.get('ir.attachment')
+        #attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', data.get('res_model')), ('res_id', '=', data.get('res_id')), ('datas_fname', '=', data.get('datas_fname'))])
+        #if attachment_ids:
+        #    return attachment_ids[0]
+        #else:
+        #    vals = {"res_model": data.get('res_model'), "res_id": data.get('res_id'), "name": data.get('name'), "datas" : data.get('datas'), "datas_fname" : data.get('datas_fname')}
+        #    return ir_attachment_obj.create(cr, uid, vals)
+        #return (model, res_id, url, notify)

From 85b8e20b5dc369dacccfcf3b540dc1f7083486f5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 22 Nov 2011 12:51:33 +0100
Subject: [PATCH 100/114] [FIX] account_voucher: fixed error in yamls due to
 new constraint added in revision 5763

bzr revid: qdp-launchpad@openerp.com-20111122115133-789x19p4af4qlvvz
---
 .../test/account_voucher_report.yml                |  1 -
 addons/account_voucher/test/case1_usd_usd.yml      | 14 ++++++++++++--
 .../test/case2_usd_eur_debtor_in_eur.yml           |  5 ++---
 .../test/case2_usd_eur_debtor_in_usd.yml           |  5 ++---
 addons/account_voucher/test/case3_eur_eur.yml      |  1 -
 addons/account_voucher/test/case4_cad_chf.yml      | 14 ++++++++++++--
 6 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index 39e9c2144a2..b41c33e4470 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -4,7 +4,6 @@
   !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
     account_id: account.cash
     company_id: base.main_company
-    currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher Axelor
     narration: Basic PC
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index b37a87405cc..e19e7e3ee46 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -34,6 +34,16 @@
     name: !eval "'%s-04-01' %(datetime.now().year)"
     rate: 1.052632
 
+-
+  I create a cash account with currency USD
+-
+  !record {model: account.account, id: account_cash_usd_id}:
+    currency_id: base.USD
+    name: "cash account in usd"
+    code: "Xcash usd"
+    type: 'liquidity'
+    user_type: "account.account_type_cash_moves"
+
 -
   I create a bank journal with USD as currency
 -
@@ -43,8 +53,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
     view_id: account.account_journal_bank_view
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 11e1e3cc0c2..67287591778 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -49,7 +49,6 @@
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
-    currency: base.EUR
     company_id: base.main_company
     view_id: account.account_journal_bank_view
 -
@@ -61,8 +60,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
     view_id: account.account_journal_bank_view
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index c72825cb0c7..ec4d653c8ab 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -49,7 +49,6 @@
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
-    currency: base.EUR
     company_id: base.main_company
     view_id: account.account_journal_bank_view
 -
@@ -61,8 +60,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
     view_id: account.account_journal_bank_view
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index 5649bf0d4bb..09034fadf51 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -26,7 +26,6 @@
     sequence_id: account.sequence_bank_journal
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
-    currency: base.EUR
     company_id: base.main_company
     view_id: account.account_journal_bank_view
 -
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 972b09702be..b3abbb25e01 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -29,6 +29,16 @@
     currency_id: base.CHF
     name: !eval "'%s-03-01' %(datetime.now().year)"
     rate: 1.25000
+-
+  I create a cash account with currency CHF
+-
+  !record {model: account.account, id: account_cash_chf_id}:
+    currency_id: base.CHF
+    name: "cash account in chf"
+    code: "Xcash chf"
+    type: 'liquidity'
+    user_type: "account.account_type_cash_moves"
+
 -
   I create a bank journal with CHF as currency
 -
@@ -38,8 +48,8 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account.cash
-    default_credit_account_id: account.cash
+    default_debit_account_id: account_cash_chf_id
+    default_credit_account_id: account_cash_chf_id
     currency: base.CHF
     company_id: base.main_company
     view_id: account.account_journal_bank_view

From bea1a79705a2f343d48187a3fe26e025ebaf93f9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Nov 2011 13:09:37 +0100
Subject: [PATCH 101/114] [FIX] don't double-call on_session_valid when logging
 in

bzr revid: xmo@openerp.com-20111122120937-302onn00bu2drfui
---
 addons/web/static/src/js/core.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 906ddefc6e5..d271fbc430e 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -509,16 +509,24 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         var self = this;
         this.session_id = this.get_cookie('session_id');
         return this.rpc("/web/session/get_session_info", {}).then(function(result) {
+            // If immediately follows a login (triggered by trying to restore
+            // an invalid session or no session at all), refresh session data
+            // (should not change, but just in case...) but should not call
+            // on_session_valid again as it triggers reloading the menu
+            var already_logged = self.uid;
             _.extend(self, {
                 uid: result.uid,
                 user_context: result.context,
                 db: result.db,
                 username: result.login
             });
-            if (self.uid)
-                self.on_session_valid();
-            else
-                self.on_session_invalid();
+            if (!already_logged) {
+                if (self.uid) {
+                    self.on_session_valid();
+                } else {
+                    self.on_session_invalid();
+                }
+            }
         }, function() {
             self.on_session_invalid();
         });

From 998fd0dab64b58dc4699fbe01737443f0f4a8aa6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Nov 2011 13:43:53 +0100
Subject: [PATCH 102/114] [ADD] support for literal numbers in on_change specs

bzr revid: xmo@openerp.com-20111122124353-kfibt1cdvmy2pzp4
---
 addons/web/static/src/js/view_form.js | 4 ++++
 addons/web/static/test/onchange.js    | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c5a2fbb4dc6..aa19916c260 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -273,6 +273,10 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             if (field in argument_replacement) {
                 return argument_replacement[field](i);
             }
+            // literal number
+            if (/^-?\d+(\.\d+)?$/.test(field)) {
+                return Number(field);
+            }
             // form field
             if (self.fields[field]) {
                 var value = self.fields[field].get_on_change_value();
diff --git a/addons/web/static/test/onchange.js b/addons/web/static/test/onchange.js
index 9f047f33d93..8074c755bd3 100644
--- a/addons/web/static/test/onchange.js
+++ b/addons/web/static/test/onchange.js
@@ -62,4 +62,13 @@ $(document).ready(function () {
         var result2 = f.parse_on_change("on_str('foo')", {});
         deepEqual(result2.args, ['foo']);
     });
+    test('Literal number', function () {
+        var f = make_form();
+        var result = f.parse_on_change('on_str(42)', {});
+        deepEqual(result.args, [42]);
+        var result2 = f.parse_on_change("on_str(-25)", {});
+        deepEqual(result2.args, [-25]);
+        var result3 = f.parse_on_change("on_str(25.02)", {});
+        deepEqual(result3.args, [25.02]);
+    });
 });

From d80b0221952d6d2d231a75d9f705b8276554233f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 22 Nov 2011 14:11:10 +0100
Subject: [PATCH 103/114] [FIX] ir.ui.view.custom: fix access rights and rules

Anyone should have full access to their own
ir.ui.view.custom records, as this is the way
to customize dashboards. This is done with
full access for everybody + an access rule
that only grants this access on your own
records.

bzr revid: odo@openerp.com-20111122131110-awawg4dhgsxb6xrc
---
 .../addons/base/security/base_security.xml    | 22 +++++++++++--------
 .../addons/base/security/ir.model.access.csv  |  3 +--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index 65696210687..cb749eb3c66 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -49,14 +49,12 @@
         <record model="ir.rule" id="res_widget_user_rule">
             <field name="name">res.widget.user rule</field>
             <field name="model_id" ref="model_res_widget_user"/>
-            <field name="global" eval="True"/>
             <field name="domain_force">['|', ('user_id','=',user.id),('user_id','=',False)]</field>
         </record>
 
         <record model="ir.rule" id="res_partner_rule">
             <field name="name">res.partner company</field>
             <field name="model_id" ref="model_res_partner"/>
-            <field name="global" eval="True"/>
             <!-- Show partners from ancestors and descendants companies (or company-less), this is usually a better
                  default for multicompany setups. -->
             <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
@@ -65,16 +63,22 @@
         <record model="ir.rule" id="multi_company_default_rule">
             <field name="name">Multi_company_default company</field>
             <field name="model_id" ref="model_multi_company_default"/>
-            <field name="global" eval="True"/>
             <field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
         </record>
 
-    <record model="ir.rule" id="ir_values_default_rule">
-        <field name="name">Defaults: alter personal values only</field>
-        <field name="model_id" ref="model_ir_values"/>
-        <field name="domain_force">[('key','=','default'),('user_id','=',user.id)]</field>
-        <field name="perm_read" eval="False"/>
-    </record>
+        <record model="ir.rule" id="ir_values_default_rule">
+            <field name="name">Defaults: alter personal values only</field>
+            <field name="model_id" ref="model_ir_values"/>
+            <field name="domain_force">[('key','=','default'),('user_id','=',user.id)]</field>
+            <field name="perm_read" eval="False"/>
+        </record>
+
+        <!-- Used for dashboard customizations, users should only be able to edit their own dashboards -->
+        <record model="ir.rule" id="ir_ui_view_custom_personal">
+            <field name="name">ir.ui.view_custom rule</field>
+            <field name="model_id" ref="model_ir_ui_view_custom"/>
+            <field name="domain_force">[('user_id','=',user.id)]</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 3820c48ae9a..59ebafb2f99 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -35,8 +35,7 @@
 "access_ir_ui_menu_group_system","ir_ui_menu group_system","model_ir_ui_menu","group_system",1,1,1,1
 "access_ir_ui_view_group_user","ir_ui_view group_user","model_ir_ui_view",,1,0,0,0
 "access_ir_ui_view_group_system","ir_ui_view group_system","model_ir_ui_view","group_system",1,1,1,1
-"access_ir_ui_view_custom_group_user","ir_ui_view_custom_group_user","model_ir_ui_view_custom",,1,0,0,0
-"access_ir_ui_view_custom_group_system","ir_ui_view_custom_group_system","model_ir_ui_view_custom","group_system",1,1,1,1
+"access_ir_ui_view_custom_group_user","ir_ui_view_custom_group_user","model_ir_ui_view_custom",,1,1,1,1
 "access_ir_ui_view_sc_group_user","ir_ui_view_sc group_user","model_ir_ui_view_sc",,1,1,1,1
 "access_ir_values_group_all","ir_values group_all","model_ir_values",,1,1,1,1
 "access_res_company_group_erp_manager","res_company group_erp_manager","model_res_company","group_erp_manager",1,1,1,1

From e8108be50358ca3fee3c103ad74be67963dbeacf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 22 Nov 2011 14:18:18 +0100
Subject: [PATCH 104/114] [FIX] board.board: read access for everyone, full for
 admins

Also dropped the useless duplicate access rights on
res.log.report, and changed to read-only as it is
a postgres view, obviously read-only.

lp bug: https://launchpad.net/bugs/893484 fixed

bzr revid: odo@openerp.com-20111122131818-uvkq39xagwixf1ya
---
 addons/board/security/ir.model.access.csv | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 8661750bfb8..34bc2169016 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_board_board","board.board","model_board_board","base.group_user",1,1,1,1
-"access_board_board_line","board.board.line","model_board_board_line","base.group_user",1,1,1,1
-"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
-"access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0
-"access_res_log_report_erp_manager","res.log.report erp_manager","model_res_log_report",base.group_erp_manager,1,0,0,0
+"access_board_board all","board.board","model_board_board",,1,0,0,0
+"access_board_board_line all","board.board.line","model_board_board_line",,1,0,0,0
+"access_board_board system","board.board system","model_board_board",base.group_system,1,1,1,1
+"access_board_board_line system","board.board.line system","model_board_board_line",base.group_system,1,1,1,1
+"access_res_log_report all","res.log.report","model_res_log_report",,1,0,0,0

From bb5b643f13f4a9245c647ee81f3f45fd84abca9b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 22 Nov 2011 19:43:14 +0530
Subject: [PATCH 105/114] [imp] added new property in gantt view

bzr revid: nicolas.vanhoren@openerp.com-20111122141314-e8dqyq9m28qvekau
---
 openerp/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 408d032d75c..5556d131fee 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -354,6 +354,7 @@
             <rng:optional><rng:attribute name="date_stop"/></rng:optional>
             <rng:optional><rng:attribute name="date_string"/></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
+            <rng:optional><rng:attribute name="default_group_by"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:optional><rng:ref name="level"/></rng:optional>
                 <rng:optional><rng:ref name="field"/></rng:optional>

From 26650f7b98fa76780e8c686dbe4b2613f807eaba Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 22 Nov 2011 19:49:48 +0530
Subject: [PATCH 106/114] [imp] converted gantt view in project to new
 specification

bzr revid: nicolas.vanhoren@openerp.com-20111122141948-krfc5lg7yrdk279n
---
 addons/project/project_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 200d6e7d402..7f0ec8691d3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -440,10 +440,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="user_id" date_start="date_start" date_stop="date_end" string="Tasks">
-                    <level object="project.project" link="project_id" domain="[]">
-                        <field name="name"/>
-                    </level>
+                <gantt color="user_id" date_start="date_start" date_stop="date_end" string="Tasks" default_group_by="project_id,user_id">
                 </gantt>
             </field>
         </record>

From 5251a34a6235a2819a1aa8e0aca3d049bf6cbd0b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Nov 2011 15:35:54 +0100
Subject: [PATCH 107/114] [FIX] extend size of statusbar widget by 1 if we're
 removing the label from it

lp bug: https://launchpad.net/bugs/889224 fixed

bzr revid: xmo@openerp.com-20111122143554-p1j1v8b1652djc58
---
 addons/web/static/src/js/view_form.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index aa19916c260..ced99bea7c2 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -955,8 +955,9 @@ openerp.web.form.WidgetFrame = openerp.web.form.Widget.extend({
         var type = {};
         if (node.tag == 'field') {
             type = this.view.fields_view.fields[node.attrs.name] || {};
-            if (node.attrs.widget == 'statusbar') {
+            if (node.attrs.widget == 'statusbar' && node.attrs.nolabel !== '1') {
                 // This way we can retain backward compatibility between addons and old clients
+                node.attrs.colspan = (parseInt(node.attrs.colspan, 10) || 1) + 1;
                 node.attrs.nolabel = '1';
             }
         }

From 9e34f30b75a28ae926dbee9a1e667dc6e98e7a8a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 23 Nov 2011 05:20:40 +0000
Subject: [PATCH 108/114] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20111123052040-4xefzzelid9by7v2
---
 addons/account_followup/i18n/sr@latin.po | 226 ++++++++++-------
 addons/fetchmail/i18n/sl.po              | 308 +++++++++++++++++++++++
 2 files changed, 439 insertions(+), 95 deletions(-)
 create mode 100644 addons/fetchmail/i18n/sl.po

diff --git a/addons/account_followup/i18n/sr@latin.po b/addons/account_followup/i18n/sr@latin.po
index 92024896307..a02336e9bc9 100644
--- a/addons/account_followup/i18n/sr@latin.po
+++ b/addons/account_followup/i18n/sr@latin.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-11-11 15:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-11-22 19:07+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-12 04:52+0000\n"
-"X-Generator: Launchpad (build 14277)\n"
+"X-Launchpad-Export-Date: 2011-11-23 05:20+0000\n"
+"X-Generator: Launchpad (build 14336)\n"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
 msgid "Followup Summary"
-msgstr "Sumarno Pracenje"
+msgstr "Sumarno praćenje"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr "Pretrazi Pracenja"
+msgstr "Pretraži praćenja"
 
 #. module: account_followup
 #: model:ir.module.module,description:account_followup.module_meta_information
@@ -52,11 +52,31 @@ msgid ""
 "Sent\n"
 "\n"
 msgstr ""
+"\n"
+"    Moduli za automatizovana pisma za neplaćenbe fakture, sa podsećanjem na "
+"više nivoa.\n"
+"\n"
+"    Možete definisati višestruke nivoe podsećanja kroz meni:\n"
+"        Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+"\n"
+"    Jednom kad budu definisani, možete štampati podsećanja svakodnevno\n"
+"    prostim klikom na meni:\n"
+"        Accounting/Periodical Processing/Billing/Send followups\n"
+"\n"
+"    Generisaće se PDF datoteka sa svim pismima shodno\n"
+"    različitim nivoima podsećanja. Možete definisati različite načine\n"
+"    za različita preduzeća. Možete takođe poslati el.poštu stranci.\n"
+"\n"
+"    Zapazite da ako želite da izmenite nivo praćenja za datog "
+"partnera/stavku naloga, možete to uraditi iz menija:\n"
+"        Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups "
+"Sent\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr "Grupirano po"
+msgstr "Grupiši po..."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:290
@@ -68,12 +88,17 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"El.pošta uspešno poslata sledećim partnerim. !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr "Следи"
+msgstr "Sledi"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -86,7 +111,7 @@ msgstr "Preduzeće"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr "Datum računa"
+msgstr "Datum fakture"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
@@ -108,27 +133,27 @@ msgstr "Legenda"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Ok"
-msgstr "U redu"
+msgstr "OK"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "Izaberite partnere koje biste hteli podsetiti"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Ne možete da napravite poteznu liniju na zatvorenim računima."
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr "Datum Slanja Pracenja"
+msgstr "Datum slanja praćenja"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Pogrešna vrednost kredita ili debita u ulazu računa !"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -139,12 +164,12 @@ msgstr "Neto dana"
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-Ups"
-msgstr "Pracenja"
+msgstr "Praćenja"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Balans > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -154,18 +179,18 @@ msgstr "Ukupno duguje"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr "%(heading): Zaglavlje reda prijenosa"
+msgstr "%(heading): Zaglavlje reda prenosa"
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "Poruka Pracenja"
+msgstr "Poruka praćenja"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr "Pracenje"
+msgstr "Praćenje"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -198,17 +223,17 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr "Nalog Pracenja"
+msgstr "Nalog praćenja"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr "Kraj Meseca"
+msgstr "Kraj meseca"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr "Nije Sporno"
+msgstr "Nije sporno"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -227,22 +252,26 @@ msgid ""
 "You can send them the default message for unpaid invoices or manually enter "
 "a message should you need to remind them of a specific information."
 msgstr ""
+"Ova funkcija omogućava Vam slanje podsetnika partnerima sa fakturama na "
+"čekanju. Možete im poslati podrazumevanu poruku za neplaćene fakture ili "
+"ručno uneti poruku, u slučaju da Vam treba da ih podsetite na neku "
+"specifičnu informaciju."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr "Referenca"
+msgstr "Ref"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr "Daje redosled sekvenci pri prikazivanju linija pracenja"
+msgstr "Daje redosled sekvenci pri prikazivanju linija praćenja"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr "Sadrzaj Email-a"
+msgstr "Sadržaj E-mail-a"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -279,44 +308,46 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 "\n"
-"Postovani %(partner_name)\n"
-"Razocarani smo sto vam se moramo obracati ovako, saljuci vam opomenu, ali "
-"vas nalog je u ozbiljnom prekoracenju.\n"
+"Poštovani %(partner_name)\n"
+"Razočarani smo što je Vaš nalog u ozbiljnom prekoracenju, uprkos poslatom "
+"podsetniku.\n"
 "\n"
-"Vrlo je vazno da ispunite vase obaveze ka nama, inace ce mo biti prisiljeni "
-"da obustavimo vas nalog, sto u stvari znaci da necemo vise biti\n"
-"u mogucnosti da vase preduzece nadalje snabdevamo ( robom / servisiranjem).\n"
-"Molimo vas da preduzmete mere kako bi regulisali vasa dugovanja u sledecih 8 "
-"dana.\n"
+" Vrlo je važno da ispunite svoje obaveze ka nama, inače ćemo biti prisiljeni "
+"da obustavimo Vaš nalog, što u stvari znači da nećemo više biti\n"
+" u mogućnosti da Vaše preduzeće nadalje snabdevamo ( robom / "
+"servisiranjem).\n"
+" Molimo vas da preduzmete mere kako biste regulisali svoja dugovanja u "
+"sledećih 8 dana.\n"
 "\n"
-"Ukoliko postoji problem, vezan za fakturu, sa kojim nismo upoznati, ne "
-"ustrucavajte se da kontaktirate nase racunovodstvo na broj (+32) 20 555 666 "
-"kako bi smo razmotrili problem sto je hitnije moguce.\n"
+" Ukoliko postoji problem, vezan za fakturu, sa kojim nismo upoznati, ne "
+"ustručavajte se da kontaktirate naše računovodstvo na broj (+32) 20 555 666 "
+"kako bismo razmotrili problem što je hitnije moguće.\n"
 "\n"
-"Detalji vase fakture su prikazani ispod.\n"
+" Detalji Vaše fakture su prikazani ispod.\n"
 "\n"
-"Uz svo postovanje.\n"
+" Uz svo poštovanje.\n"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr "Posalji Email na jeziku Partnera"
+msgstr "Pošalji E-mail na jeziku partnera"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Ne možete napraviti poteznu liniju na primaćem/platežnom računu bez partnera"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr "Selekcija Partnera"
+msgstr "Izbor partnera"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr "Ispisana Poruka"
+msgstr "Ištampana poruka"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -330,7 +361,7 @@ msgstr "Pošalji praćenja"
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "Partner za podsećanje"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -355,17 +386,17 @@ msgid ""
 "Best Regards,\n"
 msgstr ""
 "\n"
-"postovani %(partner_name)\n"
+"Poštovani %(partner_name)\n"
 "\n"
-"Nacinjen je izuzetak ukoliko je ovo nasa greska, ali , cini se da je sledeci "
-"iznos ostao neplacen. Molimo vas da preduzmete odgovarajuce mere kako bi se "
-"ovo resilo u sledecih 8 dana.\n"
+"Načinjen je izuzetak ukoliko je ovo naša greška, ali , čini se da je sledeći "
+"iznos ostao neplaćen. Molimo Vas da preduzmete odgovarajuće mere kako bi se "
+"ovo rešilo u sledećih 8 dana.\n"
 "\n"
-"Ukoliko ste izvrsili uplatu u medjuvremenu, pre ovog Emaila, molimo "
-"smatrajte ga nebitnim. Ne ustrucavajte se da kontaktirate nase racunovodstvo "
+" Ukoliko ste izvršili uplatu u međuvremenu, pre ove el.pošte, molimo "
+"smatrajte ga nebitnim. Ne ustručavajte se da kontaktirate naše računovodstvo "
 "na broj (+32) 555 666.\n"
 "\n"
-"Svo Postovanje.\n"
+" Svo poštovanje.\n"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -405,7 +436,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr "Slanje Emailova"
+msgstr "Pošalji el.poštu"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -415,25 +446,24 @@ msgstr "Valuta"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "Statistike praćenja po partneru"
 
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr "Menadzment naloga Praćenja"
+msgstr "Uređivanje naloga praćenja"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr "Blokiran"
+msgstr "Blokirano"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
 msgstr ""
-"Ovo polje vam omogucava da selektujete udaljeni datum za planiranje vaseg "
-"pracenja"
+"Ovo polje Vam omogućava izbor udaljenog datuma za planiranje Vaših praćenja"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -444,17 +474,17 @@ msgstr "Dospeće"
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr "Selektuj Partnere"
+msgstr "Izaberi partnere"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr "Email Postavke"
+msgstr "Postavke el.pošte"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr "Stampaj Pracenja"
+msgstr "Odštampaj praćenja"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -464,17 +494,17 @@ msgstr "Poslednje praćenje"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Sub-Total:"
-msgstr "Subtotal"
+msgstr "Pod-total"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Balance:"
-msgstr "Saldo"
+msgstr "Balans:"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr "Statistika Pracenja"
+msgstr "Statistika praćenja"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -484,22 +514,22 @@ msgstr "Plaćeno"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr "%(user_signature): Korisnicko Ime"
+msgstr "%(user_signature): Korisničko Ime"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr "Sadrzaj Dnevnika"
+msgstr "Stavke dnevnika"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Preduzeće mora biti isto za sve vezane račune i periode."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr "Pošalji Email potvrdu"
+msgstr "Pošalji E-mail potvrdu"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:287
@@ -509,26 +539,29 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Sva el-pošta uspešno poslata partnerima:.\n"
+"\n"
+" %s"
 
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Greška! Ne možete da napravite rekurzivna preduzeća."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr "%(company_name)s: Ime preduzeca Korisnika"
+msgstr "%(company_name)s: Ime preduzeća korisnika"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
 msgid "Companies"
-msgstr "Kompanije"
+msgstr "Preduzeća"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Followup Lines"
-msgstr "Linije Pracenja"
+msgstr "Linije praćenja"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -538,7 +571,7 @@ msgstr "Kredit"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr "Datum Dospeća"
+msgstr "Datum dospeća"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -548,30 +581,30 @@ msgstr "%(partner_name): Partnerovo Ime"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr "Redovi Praćenja"
+msgstr "Linije praćenja"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency)s: Valuta Preduzeca Korisnika"
+msgstr "%(company_currency)s: Valuta preduzeća korisnika"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
 #: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
-msgstr "Saldo"
+msgstr "Balans"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr "Tip Uslova"
+msgstr "Tip uslova"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Followup & Send Mail to Customers"
-msgstr "Stampaj Pracenje & Posalji Emailove Strankama"
+msgstr "Ištampaj praćenje & pošalji E-mailove strankama"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -582,12 +615,12 @@ msgstr "Poslednji potez"
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "Izvestaj Pracenja"
+msgstr "Izveštaj praćenja"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr "Razdoblje"
+msgstr "Period"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -598,7 +631,7 @@ msgstr "Otkaži"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr "Redovi Praćenja"
+msgstr "Linije praćenja"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -608,12 +641,12 @@ msgstr "Sporno"
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr ""
+msgstr "Maksimalan nivo praćenja"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr "Stavke Placanja"
+msgstr "Plative stavke"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -629,7 +662,7 @@ msgstr "%(datum)i: Trenutni Datum"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr "Nivo Pracenja"
+msgstr "Nivo praćenja"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -641,12 +674,12 @@ msgstr "Opis"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr "Fiskalna Godina"
+msgstr "Ova fiskalna godina"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr "Stavke Partnera"
+msgstr "Stavke partnera"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
@@ -654,26 +687,26 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
-"Ne menjajte ovaj text ukoliko zelite da posaljete Email na jeziku Partnera, "
-"ili ga konfigurisete po Preduzecu."
+"Ne menjajte ovaj tekst, ukoliko želite da posaljete el-poštu na jeziku "
+"partnera, ili ga konfigurišete po preduzecu."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr "Prijemne Stavke"
+msgstr "Prijemljive stavke"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: model:ir.actions.act_window,name:account_followup.action_followup_stat
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-ups Sent"
-msgstr "Pracenja Poslata"
+msgstr "Praćenja poslata"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
 #: field:account_followup.followup.line,name:0
 msgid "Name"
-msgstr "Ime"
+msgstr "Naziv"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
@@ -699,6 +732,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"El.pošta nije poslata sledećim partnerima, el.pošta nije dostupna !\n"
+"\n"
+" %s"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -713,13 +749,13 @@ msgstr "Dana kašnjenja"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr "Dokument:Korisnicka stavka naloga"
+msgstr "Dokument: Izjava korisničkog naloga"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,summary:0
 msgid "Summary"
-msgstr "Sumarno"
+msgstr "Sažetak"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -729,7 +765,7 @@ msgstr "Ukupno potražuje"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(line)s: Ledger Posting lines"
-msgstr "%(line): Ledger Posting lines"
+msgstr "%(linija)e: poslate iz glavnine"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
@@ -739,7 +775,7 @@ msgstr "Sekvenca"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr "%(company_name): Strankino Ime Preduzeca"
+msgstr "%(company_name): Naziv preduzeća korisnika"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -754,17 +790,17 @@ msgstr "%(partner_name)s: Partnerovo Ime"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr "Datum poslednjeg Pracenja"
+msgstr "Datum poslednjeg praćenja"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr "Kriterijum Pracenja"
+msgstr "Kriterijum praćenja"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Ne možete napraviti poteznu liniju na računu po viđenju"
 
 #, python-format
 #~ msgid "Follwoup Summary"
diff --git a/addons/fetchmail/i18n/sl.po b/addons/fetchmail/i18n/sl.po
new file mode 100644
index 00000000000..2cdcd56b63d
--- /dev/null
+++ b/addons/fetchmail/i18n/sl.po
@@ -0,0 +1,308 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-11-22 16:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-11-23 05:20+0000\n"
+"X-Generator: Launchpad (build 14336)\n"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid ""
+"Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Confirmed"
+msgstr "Potrjeno"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Group By..."
+msgstr "Združi po ..."
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,state:0
+msgid "State"
+msgstr "Država"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Not Confirmed"
+msgstr "Nepotrjeno"
+
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr "Uporabniško Ime"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP Strežniki"
+
+#. module: fetchmail
+#: model:ir.module.module,shortdesc:fetchmail.module_meta_information
+msgid "Fetchmail Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+#: field:email.server,note:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: fetchmail
+#: help:email.server,object_id:0
+msgid ""
+"OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,attach:0
+msgid "Add Attachments ?"
+msgstr "Dodaj Priloge ?"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "# of emails"
+msgstr "# od emalov"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: fetchmail
+#: field:email.server,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: fetchmail
+#: selection:email.server,state:0
+msgid "Waiting for Verification"
+msgstr "Čaka na Potrditev"
+
+#. module: fetchmail
+#: field:email.server,password:0
+msgid "Password"
+msgstr "Geslo"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+#: view:mailgate.message:0
+msgid "Emails"
+msgstr "E-pošte"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Search Email Servers"
+msgstr "Poišči Email Strežnik"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server & Login"
+msgstr "Strežnik in Prijava"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Auto Reply?"
+msgstr "Avtomatski Odzivnik?"
+
+#. module: fetchmail
+#: field:email.server,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
+msgid "Messages"
+msgstr "Sporočila"
+
+#. module: fetchmail
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Fetchmail Services"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,server:0
+msgid "Server"
+msgstr "Strežnik"
+
+#. module: fetchmail
+#: field:email.server,active:0
+msgid "Active"
+msgstr "Aktiven"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Process Parameter"
+msgstr "Parametri Procesa"
+
+#. module: fetchmail
+#: field:email.server,is_ssl:0
+msgid "SSL ?"
+msgstr "SSL ?"
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "IMAP Server"
+msgstr "IMAP Strežnik"
+
+#. module: fetchmail
+#: field:email.server,object_id:0
+msgid "Model"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:email.server:0
+#: model:ir.model,name:fetchmail.model_email_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Strežnik"
+
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Can't have duplicate server configuration!"
+msgstr "Opozorilo! Ne morete podvojiti konfiguracije strežnika!"
+
+#. module: fetchmail
+#: field:email.server,type:0
+#: field:mailgate.message,server_type:0
+msgid "Server Type"
+msgstr "Tip Strežnika"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Login Information"
+msgstr "Prijavni podatki"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Server Information"
+msgstr "Podatki o strežniku"
+
+#. module: fetchmail
+#: help:email.server,attach:0
+msgid "Fetches mail with attachments if true."
+msgstr ""
+
+#. module: fetchmail
+#: selection:email.server,type:0
+#: selection:mailgate.message,server_type:0
+msgid "POP Server"
+msgstr "POP Strežnik"
+
+#. module: fetchmail
+#: field:email.server,port:0
+msgid "Port"
+msgstr "Vrata"
+
+#. module: fetchmail
+#: model:ir.module.module,description:fetchmail.module_meta_information
+msgid ""
+"Fetchmail: \n"
+"    * Fetch email from Pop / IMAP server\n"
+"    * Support SSL\n"
+"    * Integrated with all Modules\n"
+"    * Automatic Email Receive\n"
+"    * Email based Records (Add, Update)\n"
+"    "
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: help:email.server,action_id:0
+msgid ""
+"An Email Server Action. It will be run whenever an e-mail is fetched from "
+"server."
+msgstr ""
+
+#. module: fetchmail
+#: help:email.server,priority:0
+msgid "Priority between 0 to 10, select define the order of Processing"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: view:mailgate.message:0
+#: field:mailgate.message,server_id:0
+msgid "Mail Server"
+msgstr "Poštni Strežnik"
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Fetch Emails"
+msgstr ""
+
+#~ msgid "Email Servers"
+#~ msgstr "Email Strežniki"

From 1ca5b10918ff2c2bc81a4cad616bd6fcea81eef9 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 23 Nov 2011 12:46:51 +0530
Subject: [PATCH 109/114] [FIX] project data, plugin document_get

bzr revid: al@openerp.com-20111123071651-0frq669h3f9cm7tu
---
 addons/plugin/plugin_handler.py               |  6 +++--
 addons/project/project_data.xml               | 26 +++----------------
 .../project_long_term_data.xml                | 11 --------
 3 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index b21f7423263..c4859771e35 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -41,20 +41,22 @@ class plugin_handler(osv.osv_memory):
         model = False
         res_id = 0
         url = False
+        name = ""
 
         msg = mail_message_obj.parse_message(email)
         references = [msg.get('message-id')]
         refs =  msg.get('references',False)
         if refs:
             references.extend(refs.split())
-            
+
         msg_ids = mail_message_obj.search(cr, uid, [('message_id','in',references)])
         if msg_ids:
             msg = mail_message_obj.browse(cr, uid, msg_ids[0])
             res_id = msg.res_id
             model = msg.model
             url = self._make_url(cr, uid, res_id, model)
-        return (model,  res_id, url)
+            name =  self.pool.get(model).name_get(cr, uid, res_id)[1]
+        return (model, res_id, url, name)
 
     def document_type(self, cr, uid, context=None):
         """
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index d78f208526a..a3bfe9be673 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,30 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-    
-        <!--
-        Requests Links
-        -->
-        <record id="req_link_project" model="res.request.link">
-            <field name="name">Project</field>
-            <field name="object">project.project</field>
-        </record>
-
-        <record id="req_link_task" model="res.request.link">
-            <field name="name">Project task</field>
-            <field name="object">project.task</field>
-        </record>
-        
-        <!--
-        Resource: project.project
-        -->
-
+    <data noupdate="1">
+        <!-- Resource: project.project -->
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
-        <function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
-
+        <function id="parent_project_default_set" model="ir.values" name="set" eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)"/>
 
         <!-- Task Stages -->
         <record id="project_tt_specification" model="project.task.type">
@@ -47,7 +29,5 @@
             <field name="name">Deployment</field>
             <field name="project_default" eval="1"/>
         </record>
-
-
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_data.xml b/addons/project_long_term/project_long_term_data.xml
index 8da591f1337..ebc084668b7 100644
--- a/addons/project_long_term/project_long_term_data.xml
+++ b/addons/project_long_term/project_long_term_data.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- Requests Links -->
-        <record id="req_link_project" model="res.request.link">
-            <field name="name">Project</field>
-            <field name="object">project.project</field>
-        </record>
-        <record id="req_link_task" model="res.request.link">
-            <field name="name">Project task</field>
-            <field name="object">project.task</field>
-        </record>
-
     </data>
 </openerp>

From d00008c994e9d9fca3e769ddadad139f52c28617 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Nov 2011 10:33:13 +0100
Subject: [PATCH 110/114] [FIX] if necessary, add padding when rendering a
 given row in an editable list.

otherwise there are columns missing, and the list looks broken

lp bug: https://launchpad.net/bugs/893055 fixed

bzr revid: xmo@openerp.com-20111123093313-8qair3pai8ms4ch7
---
 addons/web/static/src/js/view_list_editable.js | 14 ++++++++++++++
 addons/web/static/src/xml/base.xml             | 12 ++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index dba0a1abba4..f6b7f85dee1 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -5,6 +5,7 @@
 openerp.web.list_editable = function (openerp) {
     var KEY_RETURN = 13,
         KEY_ESCAPE = 27;
+    var QWeb = openerp.web.qweb;
 
     // editability status of list rows
     openerp.web.ListView.prototype.defaults.editable = null;
@@ -350,6 +351,19 @@ openerp.web.list_editable = function (openerp) {
         new_record: function () {
             this.dataset.index = null;
             this.render_row_as_form();
+        },
+        render_record: function (record) {
+            var index = this.records.indexOf(record);
+            // FIXME: context dict should probably be extracted cleanly
+            return QWeb.render('ListView.row', {
+                columns: this.columns,
+                options: this.options,
+                record: record,
+                row_parity: (index % 2 === 0) ? 'even' : 'odd',
+                view: this.view,
+                render_cell: $.proxy(this, 'render_cell'),
+                edited: !!this.edition_form
+            });
         }
     });
     if (!openerp.web.list) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fb7ccdf7d8e..aceaec1951e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1369,6 +1369,18 @@
     <button type="button" class="oe_formopenpopup-form-save">Save</button>
     <button type="button" class="oe_formopenpopup-form-close">Cancel</button>
 </t>
+<t t-extend="ListView.row">
+    <!-- adds front & back padding to row being rendered after edition, if
+         necessary (if not selectable add front padding and if not deletable
+         add back padding), otherwise the row being added is missing columns
+     -->
+    <t t-jquery="&gt; :first" t-operation="before">
+        <td t-if="edited and !options.selectable" class="oe-listview-padding"/>
+    </t>
+    <t t-jquery="&gt; :last" t-operation="after">
+        <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
+    </t>
+</t>
 <t t-name="ListView.row.frame" t-extend="WidgetFrame">
     <t t-jquery="tr">
         $(document.createElement('t'))

From f8f8fc7b075af69c842c987010d7d0c52645b17b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Nov 2011 10:52:32 +0100
Subject: [PATCH 111/114] [FIX] correctly refresh application tiles after
 installing an application from the first display

Now displays the 'link' tiles after installation finishes

bzr revid: xmo@openerp.com-20111123095232-t4vhfmchm3tlui8r
---
 addons/web_dashboard/static/src/js/dashboard.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 157abb3e7ba..deba1529aa3 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -521,10 +521,13 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({
     run_configuration_wizards: function () {
         var self = this;
         new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) {
-            $.unblockUI();
             self.widget_parent.widget_parent.do_action(action, function () {
                 openerp.webclient.do_reload();
             });
+            self.$element.empty();
+            self.do_display_root_menu().then(function () {
+                $.unblockUI();
+            });
         });
     }
 });

From 8501aecd3bda0075295e9b4db2febd404cd39ca3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 23 Nov 2011 15:35:42 +0530
Subject: [PATCH 112/114] [imp] according to al's request, added Neko

bzr revid: nicolas.vanhoren@openerp.com-20111123100542-s3hc8gk67u8cpkdd
---
 addons/web/static/src/css/base.css | 8 ++++++++
 addons/web/static/src/xml/base.xml | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index d8f31af1d35..cad536c0f1f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1310,6 +1310,14 @@ label.error {
     background: 1px 3px url(/web/static/src/img/icons/gtk-print.png) no-repeat;
 }
 
+.openerp .oe-running-kitten {
+    display: none;
+}
+
+.openerp.kitten-mode-activated .oe-running-kitten {
+    display: inherit;
+}
+
 .openerp.kitten-mode-activated .main_table {
     background: url(http://placekitten.com/g/1500/800) repeat;
 }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 12137315534..fce34e6ce9a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -360,6 +360,10 @@
             <li>
                 <a href="javascript:void(0)" title="About" class="about"><img src="/web/static/src/img/header-about.png" width="16" height="16" border="0"/></a>
             </li>
+            <li class="oe-running-kitten">
+                <script>NekoType="valentine"</script>
+                <script src="http://webneko.net/n200504.js"></script>
+            </li>
         </ul>
         <div class="block">
             <a href="#logout" class="logout">LOGOUT</a>

From 3113d84566be0bdfc5c2ace4dce4a86d3f372c2f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 23 Nov 2011 15:59:13 +0530
Subject: [PATCH 113/114] [IMP] homepage cleanup

bzr revid: al@openerp.com-20111123102913-t9xv70l8k4anv62m
---
 addons/board/board_data_home.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index accb112673b..8a0f150d5be 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -44,14 +44,10 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <form string="">
-          <board style="2-1">
+          <board style="1">
             <column>
               <action name="%(action_application_tiles)d"/>
             </column>
-            <column>
-              <action name="%(action_res_widgets_tweets)d"/>
-              <action name="%(action_res_widgets_events)d"/>
-            </column>
           </board>
         </form>
       </field>

From 7f7f00a52f2fb71185560a733b0ee0eea9e71c92 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 23 Nov 2011 13:29:57 +0100
Subject: [PATCH 114/114] [FIX] docstring

bzr revid: xmo@openerp.com-20111123122957-416z2p458wpw7nic
---
 addons/web/static/src/js/view_list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 728b090d679..53c8d634ad1 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -661,8 +661,8 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      *
      * @param {Number} count number of columns to add
      * @param {Object} options
-     * @param {"before"|"after"} [position="after"] insertion position for the new columns
-     * @param {Object} [except] content row to not pad
+     * @param {"before"|"after"} [options.position="after"] insertion position for the new columns
+     * @param {Object} [options.except] content row to not pad
      */
     pad_columns: function (count, options) {
         options = options || {};