From 3dc031c1d4d5266caf6014f9b2fe59b0723aabed Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Thu, 29 Apr 2010 14:16:51 +0530
Subject: [PATCH] [IMP]:improved purchase,module installer and company
 configuration wizard

bzr revid: nch@tinyerp.com-20100429084651-lgkjw8fy8aej90hh
---
 addons/base_setup/base_setup_installer.xml    | 11 +++++++----
 addons/base_setup/base_setup_todo.xml         | 18 +++++++++++-------
 addons/purchase/wizard/purchase_installer.xml |  6 ++++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index e0c35667b63..e9d177c77e4 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -10,9 +10,6 @@
           <form position="attributes">
             <attribute name="string">Base Setup Modules Installation</attribute>
           </form>
-          <separator string="title" position="attributes">
-            <attribute name="string">Install Modules</attribute>
-          </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
             <attribute name="string"
@@ -20,8 +17,14 @@
 
 If you don't think you need any of these right now, you can easily install them later on.</attribute>
           </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>15</attribute>
+	          	  <attribute name='string'></attribute>
+	      </xpath>
+	      <separator string="title" position="attributes">
+            <attribute name="string">Install Generic Modules</attribute>
+          </separator>
           <group colspan="8">
-            <separator string="Install Generic Modules" colspan="4"/>
             <field name="crm"/> <field name="sale"/>
             <field name="project"/> <field name="knowledge"/>
             <field name="stock"/> <field name="mrp"/>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 021e2d10a6c..2a7699bf1ea 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -10,16 +10,20 @@
           <form position="attributes">
             <attribute name="string">Main Company Setup</attribute>
           </form>
-
+		  <xpath expr="//label[@string='description']" position="attributes">
+	            <attribute name="string">Information of your company will be used to custiomize your documents like Invoices, Sale Orders,...</attribute>
+	      </xpath>
+	      <xpath expr='//separator[@string="title"]' position='attributes'>
+	          	  <attribute name='string'>Configure Your Company</attribute>
+	      </xpath>
+	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>25</attribute>
+	          	  <attribute name='string'></attribute>
+	      </xpath>
           <group string="res_config_contents" position="replace">
-          	<group colspan="4">
-          		<group colspan="2">
-          			<image name="gtk-dialog-info"/>
-          			<label colspan="4" align="0.0" width= "100" string="Information of your company will be used to custiomize your documents like Invoices, Sale Orders,..."/>
-          		</group>
+          	<group colspan="5">
           		<group colspan="2">
 	            	<field name="company_id" invisible="1"/>
-		            <separator string="Configure Your Company" colspan="4"/>
 		            <field name="name" colspan="4" required="True"/>
 		            <newline/>
 		            <field name="street"/>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 7f91ec67767..5725907da28 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -11,7 +11,10 @@
 	          <form position="attributes">
 	            <attribute name="string">Purchase Modules Installation</attribute>
 	          </form>
-
+			  <xpath expr='//separator[@string="vsep"]' position='attributes'>
+	          	  <attribute name='rowspan'>6</attribute>
+	          	  <attribute name='string'></attribute>
+	      		</xpath>
 	          <separator string="title" position="attributes">
 	            <attribute name="string"
 	                       >Configure Your Purchase System</attribute>
@@ -22,7 +25,6 @@
 	          </xpath>
 
                 <group colspan="8">
-                  <separator string="Purchase Application" colspan="4"/>
                   <field name="purchase_requisition"/>
                 </group>
               </data>