From 8849e106cc20d35f363ce2a7d7d50e9d3ee02a46 Mon Sep 17 00:00:00 2001
From: ssu <ssu@ssu-desktop>
Date: Wed, 16 Nov 2011 11:01:49 +0530
Subject: [PATCH] [IMP]project_issue : xpath and views are modified by board
 style and column

bzr revid: ssu@ssu-desktop-20111116053149-gs8cg96p3x9bjiyp
---
 addons/board/board.py                         | 12 +++----
 addons/hr/hr_board.xml                        |  4 +--
 .../board_project_issue_view.xml              | 34 ++++++++-----------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/addons/board/board.py b/addons/board/board.py
index df3bc981ccb..dd3d75e1dca 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -56,14 +56,14 @@ class board_board(osv.osv):
         #End Loop
         arch = """<?xml version="1.0"?>
             <form string="My Board">
-            <hpaned>
-                <child1>
+            <board style="1-1">
+                <column>
                     %s
-                </child1>
-                <child2>
+                </column>
+                <column>
                     %s
-                </child2>
-            </hpaned>
+                </column>
+            </board>
             </form>""" % ('\n'.join(left), '\n'.join(right))
 
         return arch
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 7cc2b83f599..620f1f51c88 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -8,7 +8,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="My Board">
-                <board style="1-2">
+                <board style="2-1">
                     <column>
                     </column>
                     <column>
@@ -38,7 +38,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="HR Manager Board">
-                <board style="1-2">
+                <board style="2-1">
                     <column>
                     </column>
                     <column>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index cfe285134a7..ab8476aab09 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -57,22 +57,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="My Board">
-                    <hpaned>
-                        <child1>
-                            <action colspan="4"  name="%(action_view_current_project_issue_tree)d" string="Current Issues" width="510"/>
-                            <action colspan="4"  name="%(action_view_pending_project_issue_tree)d" string="Pending Issues" width="510"/>
-                        </child1>
-                        <child2>
-                        <vpaned>
-                            <child1>
-                                <action colspan="4"  name="%(action_project_issue_graph_state)d" string="Issues By State" />
-                            </child1>
-                            <child2>
-                                <action colspan="4"  name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
-                            </child2>
-                        </vpaned>
-                        </child2>
-                    </hpaned>
+                    <board style="1-1">
+                        <column>
+                            <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
+                            <action name="%(action_view_pending_project_issue_tree)d" string="Pending Issues"/>
+                        </column>
+                        <column>
+	                        <action name="%(action_project_issue_graph_state)d" string="Issues By State" />
+                            <action name="%(action_project_issue_graph_stage)d" string="Issues By Stage" />
+                        </column>
+                    </board>
                 </form>
             </field>
         </record>
@@ -151,11 +145,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.board_project_form"/>
             <field name="arch" type="xml">
-            	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
-						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
+            	<xpath expr="/form/board/column/action[@string='My Delegated Tasks']" position="after">
+						<action name="%(action_view_my_project_issue_tree)d" string="My Issues"/>
             	</xpath>
-            	<xpath expr="/form/hpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
-						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
+            	<xpath expr="/form/board/column/action[@string='My Remaining Hours by Project']" position="after">
+						<action name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date"/>
             	</xpath>
             </field>
         </record>