From b09cc1ecca24a4def4cb4ae425a28af1d7019b00 Mon Sep 17 00:00:00 2001
From: "Bhumi Thakkar (Open ERP)" <bth@tinyerp.com>
Date: Fri, 29 Jul 2011 17:26:54 +0530
Subject: [PATCH] [IMP] Values corresponding of colums.

bzr revid: bth@tinyerp.com-20110729115654-2x00msrjrag20ot6
---
 addons/base/static/src/js/tree.js   |  16 +++-
 addons/base/static/src/xml/base.xml | 116 ++++++++++++++++++----------
 2 files changed, 87 insertions(+), 45 deletions(-)

diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js
index 7b039bef3dd..3320349aac4 100644
--- a/addons/base/static/src/js/tree.js
+++ b/addons/base/static/src/js/tree.js
@@ -64,17 +64,21 @@ openerp.base.TreeView = openerp.base.View.extend({
 
         self.dataset.domain = [['parent_id', '=', parseInt(id, 10)]];
         self.dataset.read_slice([], 0, false, function (response) {
+
             var is_padding, row_id, record_id;
             var curr_node = $('tr #treerow_' + id);
 
             if (curr_node.length == 1) {
-                curr_node.find('td').children(':first-child').attr('src','/base/static/src/img/collapse.gif');
-                curr_node.after(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag': '0', 'selection_fields' : self.fields.type.selection }));
+                curr_node.find('td:first').children(':first-child').attr('src','/base/static/src/img/collapse.gif');
+                curr_node.after(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag': '0', 'fields_view' : self.fields_view.arch.children, 'selection_fields' : self.fields.type.selection,'field' : self.fields}));
 
 
                 for (var i = 0; i < response.length; i++) {
                     row_id = $('tr #treerow_' + response[i].id);
-                    if (row_id && row_id.find('td').children(':first-child').attr('id') == 'parentimg_' + response[i].id) {
+
+                    if (row_id && row_id.find('td:first').children(':first-child').attr('id') == 'parentimg_' + response[i].id) {
+                        row_id.find('td:first').append('<span>'+row_id.find('td:eq(1)').text()+'</span>');
+                        row_id.find('td:eq(1)').remove();
                         is_padding = true;
                     }
                 }
@@ -109,9 +113,13 @@ openerp.base.TreeView = openerp.base.View.extend({
                 if (!flag) {
                     self.$element.find('table').remove();
                 }
+                self.$element.append(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag' : '1', 'fieldsview_fields' : self.fields_view.fields , 'fields_view' : self.fields_view.arch.children, 'selection_fields' : self.fields.type.selection, 'field' : self.fields }));
 
-                self.$element.append(QWeb.render('TreeView_Secondry', {'child_data': response, 'flag' : '1', 'fields' : self.fields_view.fields , 'fields_view' : self.fields_view.arch.children, 'selection_fields' : self.fields.type.selection}));
                 self.$element.find('tr[id ^= treerow_]').each( function() {
+                    if ($(this).find('td:first').children(':first-child').attr('id')) {
+                        $(this).find('td:first').append('<span>' + $(this).find('td:eq(1)').text() + '</span>');
+                        $(this).find('td:eq(1)').remove();
+                    }
                     $(this).find('td').children(':first-child').addClass("parent_top");
                     if (!($(this).find('td').children(':first-child').attr('id'))) {
                         $(this).find('td:first').css('paddingLeft', '20px');
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 5b21ff376bb..3671f4a606f 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -252,62 +252,96 @@
             <thead>
                 <tr>
                     <t t-foreach="fields_view" t-as="fieldsview">
-                        <t t-foreach="fields" t-as="field">
-                            <t t-if="fieldsview['attrs'].name==field">
-                                <td class="treeview-header"><t t-esc="fields[field].string" /></td>
+                        <t t-foreach="fieldsview_fields" t-as="view_fields">
+                            <t t-if="fieldsview['attrs'].name==view_fields and !fieldsview['attrs'].invisible">
+                                <td class="treeview-header"><t t-esc="fieldsview_fields[view_fields].string" /></td>
                             </t>
                         </t>
                     </t>
                 </tr>
             </thead>
-            <t t-foreach="child_data" t-as="field" >
-                <tr t-att-id="'treerow_' + field.id">
-                    <td class="treeview-tr">
-                        <t t-if="(field.child_id).length >= 1">
-                            <img t-att-id="'parentimg_' + field.id" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
-                        </t>
-                        <span>
-                            <t t-esc="field.name"/>
-                        </span>
-                    </td>
-                    <td class="treeview-td">
-                        <t t-foreach="selection_fields" t-as="selection">
-                            <t t-if="selection[0]==field.type">
-                                <t t-esc="selection[1]" />
+            <t t-foreach="child_data" t-as="fields" >
+                <tr t-att-id="'treerow_' + fields.id">
+                    <t t-if="(fields.child_id).length >= 1">
+                        <td class="treeview-tr">
+                            <img t-att-id="'parentimg_' + fields.id" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
+                        </td>
+                    </t>
+                    <t t-foreach="fields_view" t-as="fieldsview">
+                        <t t-foreach="fieldsview_fields" t-as="view_fields">
+                            <t t-foreach="field" t-as="f">
+                                <t t-if="fieldsview['attrs'].name==view_fields">
+                                    <t t-if="fieldsview['attrs'].name==f and !fieldsview['attrs'].invisible and field[f].type!='many2one' and field[f].type!='selection'">
+                                        <td class="treeview-td">
+                                            <span>
+                                                <t t-esc="fields[[fieldsview['attrs'].name]]" />
+                                            </span>
+                                        </td>
+                                    </t>
+                                    <t t-if="fieldsview['attrs'].name==f and !fieldsview['attrs'].invisible and field[f].type=='many2one'">
+                                        <td class="treeview-td">
+                                            <span>
+                                                <t t-esc="fields[[fieldsview['attrs'].name]][1]" />
+                                            </span>
+                                        </td>
+                                    </t>
+                                    <t t-if="fieldsview['attrs'].name==f and !fieldsview['attrs'].invisible and field[f].type=='selection'">
+                                        <td class="treeview-td">
+                                            <span>
+                                                <t t-foreach="selection_fields" t-as="selection">
+                                                    <t t-if="selection[0]==fields.type">
+                                                        <t t-esc="selection[1]" />
+                                                    </t>
+                                                </t>
+                                            </span>
+                                        </td>
+                                    </t>
+                                </t>
                             </t>
                         </t>
-                    </td>
-                    <td class="treeview-td">
-                        <t t-esc="field.sequence" />
-                    </td>
+                    </t>
                 </tr>
             </t>
         </table>
     </t>
     <t t-if="flag==0">
-        <t t-if="child_data">
-            <t t-foreach="child_data" t-as="field" >
-                <tr t-att-id="'treerow_' + field.id">
+        <t t-foreach="child_data" t-as="fields" >
+            <tr t-att-id="'treerow_' + fields.id">
+                <t t-if="(fields.child_id).length >= 1">
                     <td class="treeview-tr">
-                        <t t-if="(field.child_id).length >= 1">
-                            <img t-att-id="'parentimg_' + field.id" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
+                        <img t-att-id="'parentimg_' + fields.id" src="/base/static/src/img/expand.gif" width="16" height="16" border="0"/>
+                    </td>
+                </t>
+                <t t-foreach="fields_view" t-as="fieldsview">
+                    <t t-foreach="field" t-as="f">
+                        <t t-if="fieldsview['attrs'].name==f and !fieldsview['attrs'].invisible and field[f].type!='many2one' and field[f].type!='selection'">
+                            <td class="treeview-td">
+                                <span>
+                                    <t t-esc="fields[[fieldsview['attrs'].name]]" />
+                                </span>
+                            </td>
                         </t>
-                        <span>
-                            <t t-esc="field.name"/>
-                        </span>
-                    </td>
-                    <td class="treeview-td">
-                        <t t-foreach="selection_fields" t-as="selection">
-                            <t t-if="selection[0]==field.type">
-                                <t t-esc="selection[1]" />
-                            </t>
+                        <t t-if="fieldsview['attrs'].name==f and !fieldsview['attrs'].invisible and field[f].type=='many2one'">
+                            <td class="treeview-td">
+                                <span>
+                                    <t t-esc="fields[[fieldsview['attrs'].name]][1]" />
+                                </span>
+                            </td>
                         </t>
-                    </td>
-                    <td class="treeview-td">
-                        <t t-esc="field.sequence" />
-                    </td>
-                </tr>
-            </t>
+                        <t t-if="fieldsview['attrs'].name==f and !fieldsview['attrs'].invisible and field[f].type=='selection'">
+                            <td class="treeview-td">
+                                <span>
+                                    <t t-foreach="selection_fields" t-as="selection">
+                                        <t t-if="selection[0]==fields.type">
+                                            <t t-esc="selection[1]" />
+                                        </t>
+                                    </t>
+                                </span>
+                            </td>
+                        </t>
+                    </t>
+                </t>
+            </tr>
         </t>
     </t>
 </t>