[IMP] new form views

bzr revid: fp@tinyerp.com-20120609221248-6l7fg99yedc0gy11

15 files changed, 367 insertions, 370 deletions

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 1056ac16841..6e7e9712358 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -639,7 +639,7 @@
                     <notebook>
                         <page string="Information">
                         <group>
-                            <group string="Product Type"/>
+                            <group string="Product Type">
                                 <field name="sale_ok"/>
                                 <field name="purchase_ok"/>
                             </group>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4b44b4f56b9..82540d702b2 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -18,16 +18,16 @@
             <field name="model">survey</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form>
+                <form string="Survey">
                 <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
-                <sheet string="Survey" layout="auto">
-                    <field name="title" select="1"/>
+                <sheet>
                     <group col="6" colspan="6">
+                    <field name="title" select="1"/>
                         <field name="responsible_id"/>
                         <field name="id" invisible="1"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
@@ -38,7 +38,7 @@
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                             string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Survey Page">
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index b5485bf6370..004ed043ab6 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!--
-			Survey Question Wizard
-		 -->
+        <!--
+            Survey Question Wizard
+         -->
 
-		<record id="view_survey_question_message" model="ir.ui.view">
-			<field name="name">Survey Question</field>
-			<field name="model">survey.question.wiz</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Your Messages">
-					<field name="name" nolabel="1" colspan="4" />
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_question_message" model="ir.ui.view">
+            <field name="name">Survey Question</field>
+            <field name="model">survey.question.wiz</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Your Messages" version="7.0">
+                    <field name="name" nolabel="1" colspan="4" />
+                </form>
+            </field>
+        </record>
 
-		<record id="view_survey_question_message1" model="ir.ui.view">
-			<field name="name">Survey Search</field>
-			<field name="model">survey.question.wiz</field>
-			<field name="type">search</field>
-			<field name="arch" type="xml">
-				<search string="Your Messages">
-					<field name="name"/>
-				</search>
-			</field>
-		</record>
+        <record id="view_survey_question_message1" model="ir.ui.view">
+            <field name="name">Survey Search</field>
+            <field name="model">survey.question.wiz</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Your Messages">
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>
 
-		<record id="action_view_survey_question_message" model="ir.actions.act_window">
-			<field name="name">Survey Question</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.question.wiz</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_question_message" model="ir.actions.act_window">
+            <field name="name">Survey Question</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">survey.question.wiz</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
 
-	</data>
-</openerp>
\ No newline at end of file
+    </data>
+</openerp>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index b99b7f9cc92..a2069cfdb9a 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -1,41 +1,43 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-		<!--
-			Browse Response Wizard (Survey Browse answer) 
-		 -->
-		 
-		<record id="view_survey_answer" model="ir.ui.view">
-			<field name="name">Survey</field>
-			<field name="model">survey.browse.answer</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey">
-					<separator colspan="4"  string =  "Select Survey and Related Answer"/>
-					<field name="survey_id" width="250"/>
-					<field name="response_id" domain="[('survey_id','=', survey_id)]"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
-				</form>
-			</field>
-		</record>
+    <data>
+    
+        <!--
+            Browse Response Wizard (Survey Browse answer) 
+         -->
+         
+        <record id="view_survey_answer" model="ir.ui.view">
+            <field name="name">Survey</field>
+            <field name="model">survey.browse.answer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey" version="7.0">
+                    <header>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <group col="4">
+                        <separator colspan="4"  string =  "Select Survey and Related Answer"/>
+                        <field name="survey_id"/>
+                        <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_browse_survey_response"
-			model="ir.actions.act_window">
-			<field name="name">Answer Survey</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.browse.answer</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_browse_survey_response"
+            model="ir.actions.act_window">
+            <field name="name">Answer Survey</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">survey.browse.answer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem name="Browse Answers" id="menu_browse_survey_response"
-			action="action_browse_survey_response" parent="menu_reporting"
-			groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
+        <menuitem name="Browse Answers" id="menu_browse_survey_response"
+            action="action_browse_survey_response" parent="menu_reporting"
+            groups="base.group_tool_manager" icon="STOCK_PRINT_PREVIEW"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index c6188689fe6..bbafb79ab61 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -1,43 +1,45 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- Survey Print Form View -->
+        <!-- Survey Print Form View -->
 
-		<record id="view_survey_print" model="ir.ui.view">
-			<field name="name">Survey Print</field>
-			<field name="model">survey.print</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey Print">
-				    <separator string="Survey" colspan="4"/>
-				    <field name="survey_ids" nolabel="1" colspan="4" />
-				    <separator string="Print Option" colspan="4"/>
-				    <field name="orientation" colspan="4"/>
-				    <field name="paper_size" colspan="4"/>
-				    <field name="page_number" colspan="4"/>
-				    <field name="without_pagebreak" colspan="4"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_print" model="ir.ui.view">
+            <field name="name">Survey Print</field>
+            <field name="model">survey.print</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Print" version="7.0">
+                    <header>
+                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
+                        <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <group col="4">
+                        <separator string="Survey" colspan="4"/>
+                        <field name="survey_ids" nolabel="1" colspan="4" />
+                        <separator string="Print Option" colspan="4"/>
+                        <field name="orientation" colspan="4"/>
+                        <field name="paper_size" colspan="4"/>
+                        <field name="page_number" colspan="4"/>
+                        <field name="without_pagebreak" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey Print action -->
+        <!-- Survey Print action -->
 
-		<record id="action_view_survey_print" model="ir.actions.act_window">
-			<field name="name">Print Survey</field>
-			<field name="res_model">survey.print</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_print" model="ir.actions.act_window">
+            <field name="name">Print Survey</field>
+            <field name="res_model">survey.print</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
         <menuitem name="Print Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
             groups="base.group_tool_manager" icon="STOCK_PRINT"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 9a0ea6dd83f..265c56ee1c6 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -1,43 +1,45 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- Survey Print answer Form View -->
+        <!-- Survey Print answer Form View -->
 
-		<record id="view_survey_print_answer" model="ir.ui.view">
-			<field name="name">Survey Print Answer</field>
-			<field name="model">survey.print.answer</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Print Answer">
-					<separator string="Answer" colspan="4"/>
-					<field name="response_ids" nolabel="1" colspan="4" />
-				    <separator string="Print Option" colspan="4"/>
-				    <field name="orientation" colspan="4"/>
-				    <field name="paper_size" colspan="4"/>
-				    <field name="page_number" colspan="4"/>
-				    <field name="without_pagebreak" colspan="4"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_print_answer" model="ir.ui.view">
+            <field name="name">Survey Print Answer</field>
+            <field name="model">survey.print.answer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Print Answer" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+                    </header>
+                    <group col="4">
+                        <separator string="Answer" colspan="4"/>
+                        <field name="response_ids" nolabel="1" colspan="4" />
+                        <separator string="Print Option" colspan="4"/>
+                        <field name="orientation" colspan="4"/>
+                        <field name="paper_size" colspan="4"/>
+                        <field name="page_number" colspan="4"/>
+                        <field name="without_pagebreak" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey Print answer action -->
+        <!-- Survey Print answer action -->
 
-		<record id="action_view_survey_print_answer"
-			model="ir.actions.act_window">
-			<field name="name">Print Answer</field>
-			<field name="res_model">survey.print.answer</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_print_answer"
+            model="ir.actions.act_window">
+            <field name="name">Print Answer</field>
+            <field name="res_model">survey.print.answer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
+        <menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
+            parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 9bd729db010..e2c064c6a14 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<!-- Survey Print Statistics Form View -->
+        <!-- Survey Print Statistics Form View -->
 
-		<record id="view_survey_print_statistics" model="ir.ui.view">
-			<field name="name">Survey Print Statistics</field>
-			<field name="model">survey.print.statistics</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey Print Statistics">
-					<field name="survey_ids" nolabel="1" colspan="4" />
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_print_statistics" model="ir.ui.view">
+            <field name="name">Survey Print Statistics</field>
+            <field name="model">survey.print.statistics</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey Print Statistics" version="7.0">
+                    <header>
+                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    </header>
+                    <field name="survey_ids"/>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey Print Statistics action -->
+        <!-- Survey Print Statistics action -->
 
-		<record id="action_view_survey_print_statistics"
-			model="ir.actions.act_window">
-			<field name="name">Survey Print Statistics</field>
-			<field name="res_model">survey.print.statistics</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_print_statistics"
+            model="ir.actions.act_window">
+            <field name="name">Survey Print Statistics</field>
+            <field name="res_model">survey.print.statistics</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
+        <menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
+            parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_tool_manager"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index a72566f7888..940ac7833b2 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -1,46 +1,36 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-		<!--
-			Display Survey List 
-		 -->
-		 
-		<record id="view_survey_name" model="ir.ui.view">
-			<field name="name">Survey</field>
-			<field name="model">survey.name.wiz</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Survey">
-					<separator colspan="4" string="Select Survey" />
-					<newline />
-					<field name="survey_id" colspan="4"
-						on_change="on_change_survey(survey_id)" width="250"/>
-					<group col="1" colspan="4"
-						attrs="{'readonly': [('survey_id','=',False)]}">
-						<separator colspan="4" string="Survey Details" />
-						<field name="note" colspan="4" nolabel="1" readonly="1"/>
-						<newline />
-					</group>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel"
-						special="cancel" string="Cancel"/>
-					<button colspan="1" icon="gtk-go-forward"
-						name="action_next" string="Start" type="object"/>
-				</form>
-			</field>
-		</record>
+    <data>
+        <!--
+            Display Survey List
+         -->
 
-		<record id="action_view_survey_name"
-			model="ir.actions.act_window">
-			<field name="name">Give Survey Answer</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">survey.name.wiz</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-		
-	</data>
-</openerp>
\ No newline at end of file
+        <record id="view_survey_name" model="ir.ui.view">
+            <field name="name">Survey</field>
+            <field name="model">survey.name.wiz</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Survey" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+                    </header>
+                    <group string="Select Survey">
+                        <field name="survey_id" on_change="on_change_survey(survey_id)"/>
+                    </group>
+                    <field name="note" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_survey_name"
+            model="ir.actions.act_window">
+            <field name="name">Give Survey Answer</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">survey.name.wiz</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 72ec794d66e..80c948a6e5f 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -1,77 +1,78 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-	
-		<!-- Survey send invitation Form View -->
+    <data>
+    
+        <!-- Survey send invitation Form View -->
 
-		<record id="view_survey_send_invitation" model="ir.ui.view">
-			<field name="name">Send Invitation</field>
-			<field name="model">survey.send.invitation</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Send Invitation">
-				    <separator string="Select Partner" colspan="4"/>
-				    <field name="partner_ids" nolabel="1"  colspan="4"/>
-				    <separator colspan="4" string="Send Mail for New User"/>
-			        <field name="send_mail" nolabel="1"/>
-			        <field name="mail_subject" colspan="3"/>
-			        <separator colspan="4" string="Send Reminder for Existing User"/>
-			        <field name="send_mail_existing" nolabel="1"/>
-			        <field name="mail_subject_existing" colspan="3"/>
-				    <separator colspan="4"/>
-			        <field name="mail_from" colspan="4"/>
-				    <separator string="Message" colspan="4"/>
-				    <field name="mail" nolabel="1" colspan="4"/>
-					<separator colspan="4" />
-					<label align="0.0" colspan="2" string="" />
-					<button colspan="1" icon="gtk-cancel" special="cancel" string="_Cancel"/>
-					<button colspan="1" icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_send_invitation" model="ir.ui.view">
+            <field name="name">Send Invitation</field>
+            <field name="model">survey.send.invitation</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send Invitation" version="7.0">
+                    <header>
+                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                    </header>
+                    <group col="4">
+                        <separator string="Select Partner" colspan="4"/>
+                        <field name="partner_ids" nolabel="1"  colspan="4"/>
+                        <separator colspan="4" string="Send Mail for New User"/>
+                        <field name="send_mail" nolabel="1"/>
+                        <field name="mail_subject" colspan="3"/>
+                        <separator colspan="4" string="Send Reminder for Existing User"/>
+                        <field name="send_mail_existing" nolabel="1"/>
+                        <field name="mail_subject_existing" colspan="3"/>
+                        <separator colspan="4"/>
+                        <field name="mail_from" colspan="4"/>
+                        <separator string="Message" colspan="4"/>
+                        <field name="mail" nolabel="1" colspan="4"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey send invitation action -->
+        <!-- Survey send invitation action -->
 
-		<record id="action_view_survey_send_invitation" model="ir.actions.act_window">
-			<field name="name">Send Invitation</field>
-			<field name="res_model">survey.send.invitation</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
+        <record id="action_view_survey_send_invitation" model="ir.actions.act_window">
+            <field name="name">Send Invitation</field>
+            <field name="res_model">survey.send.invitation</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-    	<act_window id="action_act_view_survey_send_invitation"
-    		key2="client_action_multi" name="Send Invitations"
-    		res_model="survey.send.invitation" src_model="survey"
-    		view_mode="form" target="new" view_type="form" />
+        <act_window id="action_act_view_survey_send_invitation"
+            key2="client_action_multi" name="Send Invitations"
+            res_model="survey.send.invitation" src_model="survey"
+            view_mode="form" target="new" view_type="form" />
 
-		<!-- Survey send invitation Display Log Form View -->
+        <!-- Survey send invitation Display Log Form View -->
 
-		<record id="view_survey_send_invitation_log" model="ir.ui.view">
-			<field name="name">survey send invitation log</field>
-			<field name="model">survey.send.invitation.log</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="User creation">
-				    <separator string="Results :" colspan="4"/>
-    				<field name="note" colspan="4" nolabel="1" width="300"/>
-    				<separator string="" colspan="4"/>
-    				<group col="4" colspan="4">
-						<label align="0.0" colspan="3" string="" />
-						<button colspan="1" icon="gtk-ok" special="cancel" string="_Ok"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        <record id="view_survey_send_invitation_log" model="ir.ui.view">
+            <field name="name">survey send invitation log</field>
+            <field name="model">survey.send.invitation.log</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="User creation" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" special="cancel" string="_Ok"/>
+                    <header>
+                    <group string="Results :">
+                        <field name="note"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<!-- Survey send invitation action -->
+        <!-- Survey send invitation action -->
 
-		<record id="action_view_survey_send_invitation_log" model="ir.actions.act_window">
-			<field name="name">survey.send.invitation.log</field>
-			<field name="res_model">survey.send.invitation.log</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="target">new</field>
-		</record>
-	</data>
+        <record id="action_view_survey_send_invitation_log" model="ir.actions.act_window">
+            <field name="name">survey.send.invitation.log</field>
+            <field name="res_model">survey.send.invitation.log</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/users_ldap/user_ldap_installer.xml b/addons/users_ldap/user_ldap_installer.xml
index 4dd65807a4b..1f652f69699 100644
--- a/addons/users_ldap/user_ldap_installer.xml
+++ b/addons/users_ldap/user_ldap_installer.xml
@@ -7,30 +7,28 @@
             <field name="model">res.company.ldap</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="LDAP Configuration">
-                    <field name="company"/>
-                    <newline/>
-                    <group col="2" colspan="2">
-                          <separator string="Server Information" colspan="2"/>
-                          <field name="ldap_server"/>
-                          <field name="ldap_server_port"/>
-                          <field name="ldap_tls"/>
-                    </group>
-                    <group col="2" colspan="2">
-                          <separator string="Login Information" colspan="2"/>
-                          <field name="ldap_binddn"/>
-                          <field name="ldap_password"/>
-                    </group>
-                    <group col="2" colspan="2">
-                         <separator string="Process Parameter" colspan="2"/>
-                         <field name="ldap_base"/>
-                         <field name="ldap_filter"/>
-                         <field name="sequence"/>
-                    </group>
-                    <group col="2" colspan="2">
-                         <separator string="User Information" colspan="2"/>
-                         <field name="create_user"/>
-                         <field name="user"/>
+                <form string="LDAP Configuration" version="7.0">
+                    <group>
+                        <field name="company"/>
+                        <newline/>
+                        <group string="Server Information">
+                              <field name="ldap_server"/>
+                              <field name="ldap_server_port"/>
+                              <field name="ldap_tls"/>
+                        </group>
+                        <group string="Login Information">
+                              <field name="ldap_binddn"/>
+                              <field name="ldap_password"/>
+                        </group>
+                        <group string="Process Parameter">
+                             <field name="ldap_base"/>
+                             <field name="ldap_filter"/>
+                             <field name="sequence"/>
+                        </group>
+                        <group string="User Information">
+                             <field name="create_user"/>
+                             <field name="user"/>
+                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 8747609f321..40d01f43bf3 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,20 +7,22 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Configuration']" position="inside">                    
+                <xpath expr="//page[@string='Configuration']" position="inside">
                     <field name="ldaps" nolabel="1" colspan="4">
-                        <form string="LDAP Configuration">
-                            <field name="ldap_server"/>
-                            <field name="ldap_server_port"/>
-                            <field name="ldap_binddn"/>
-                            <field name="ldap_password"/>
-                            <field name="ldap_base"/>
-                            <field name="ldap_filter"/>
-                            <field name="create_user"/>
-                            <field name="user"/>
-                            <newline/>
-                            <field name="sequence"/>
-                            <field name="ldap_tls"/>
+                        <form string="LDAP Configuration" version="7.0">
+                            <group col="4">
+                                <field name="ldap_server"/>
+                                <field name="ldap_server_port"/>
+                                <field name="ldap_binddn"/>
+                                <field name="ldap_password"/>
+                                <field name="ldap_base"/>
+                                <field name="ldap_filter"/>
+                                <field name="create_user"/>
+                                <field name="user"/>
+                                <newline/>
+                                <field name="sequence"/>
+                                <field name="ldap_tls"/>
+                            </group>
                         </form>
                         <tree string="LDAP Configuration">
                             <field name="sequence"/>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index c8f46619235..fbdffb23e0a 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -4,26 +4,26 @@
 
 <!-- Create Menu From view -->
 
-		<record id="view_wiki_create_menu" model="ir.ui.view">
+        <record id="view_wiki_create_menu" model="ir.ui.view">
             <field name="name">Create Menu</field>
             <field name="model">wiki.create.menu</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create Menu">
-             		<separator string="Menu Information" colspan="4" />
-                	<field name="menu_name" />
-                	<field name="menu_parent_id" />
-	                <separator string="" colspan="4" />
-    	            <label string="" colspan="2" />
-        	        <button special="cancel" string="Cancel" />
-            	    <button name="wiki_menu_create" string="Create Menu" type="object"/>
+                     <separator string="Menu Information" colspan="4" />
+                    <field name="menu_name" />
+                    <field name="menu_parent_id" />
+                    <separator string="" colspan="4" />
+                    <label string="" colspan="2" />
+                    <button special="cancel" string="Cancel" />
+                    <button name="wiki_menu_create" string="Create Menu" type="object"/>
              </form>
             </field>
-		</record>
+        </record>
 
 <!-- Create Menu Action -->
 
-		<record id="action_wiki_create_menu" model="ir.actions.act_window">
+        <record id="action_wiki_create_menu" model="ir.actions.act_window">
             <field name="name">Create Menu</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wiki.create.menu</field>
@@ -33,4 +33,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index f9b0acbf273..28b0d8427b0 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -4,41 +4,41 @@
 
 <!-- Create Index Form view  -->
 
-    	<record id="view_wiki_make_index" model="ir.ui.view">
+        <record id="view_wiki_make_index" model="ir.ui.view">
             <field name="name">Create Index</field>
             <field name="model">wiki.make.index</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create Menu">
-    			<separator string="Menu Information" colspan="4"/>
-    			<label string="Want to create a Index on Selected Pages ? "/>
-    			<separator string="" colspan="6" />
-    	        <label string="" colspan="2"/>
-    	        <group>
-        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
-            	<button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
-            	</group>
-			</form>
+                <separator string="Menu Information" colspan="4"/>
+                <label string="Want to create a Index on Selected Pages ? "/>
+                <separator string="" colspan="6" />
+                <label string="" colspan="2"/>
+                <group>
+                <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
+                </group>
+            </form>
             </field>
-		</record>
+        </record>
 
 <!-- Create Index Action  -->
 
-		<record id="action_view_wiki_make_index" model="ir.actions.act_window">
+        <record id="action_view_wiki_make_index" model="ir.actions.act_window">
             <field name="name">Create Index</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wiki.make.index</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
 <!-- Create Index Action Window  -->
 
-		<act_window id="action_view_wiki_make_index_values"
-    		key2="client_action_multi" name="Create Index"
-    		res_model="wiki.make.index" src_model="wiki.wiki"
-    		view_mode="form" target="new" view_type="form" />
+        <act_window id="action_view_wiki_make_index_values"
+            key2="client_action_multi" name="Create Index"
+            res_model="wiki.make.index" src_model="wiki.wiki"
+            view_mode="form" target="new" view_type="form" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index b9a8264cc81..8cc394986d8 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -4,39 +4,39 @@
 
 <!-- Create Index Form view  -->
 
-    	<record id="view_wiki_show_diff" model="ir.ui.view">
+        <record id="view_wiki_show_diff" model="ir.ui.view">
             <field name="name">Show Difference</field>
             <field name="model">wizard.wiki.history.show_diff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Difference">
-    			 <separator colspan="4" string="Notes"/>
-    			  <field name="file_path" colspan="4" width="300"/>
-    	        <label string="" colspan="2" />
-    	        <group>
-        	    <button special="cancel" string="Close" icon="gtk-close" />
-            	</group>
-			</form>
+                 <separator colspan="4" string="Notes"/>
+                  <field name="file_path" colspan="4" width="300"/>
+                <label string="" colspan="2" />
+                <group>
+                <button special="cancel" string="Close" icon="gtk-close" />
+                </group>
+            </form>
             </field>
-		</record>
+        </record>
 
 <!-- Create Index Action  -->
 
-		<record id="action_view_wiki_show_diff" model="ir.actions.act_window">
+        <record id="action_view_wiki_show_diff" model="ir.actions.act_window">
             <field name="name">Difference</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wizard.wiki.history.show_diff</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
 <!-- Create Index Action Window  -->
 
-		 <act_window id="action_view_wiki_show_diff_values"
-    		key2="client_action_multi" name="Difference"
-    		res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
-    		view_mode="form" target="new" view_type="form" />
+         <act_window id="action_view_wiki_show_diff_values"
+            key2="client_action_multi" name="Difference"
+            res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
+            view_mode="form" target="new" view_type="form" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index bc876416caa..a625d15e92a 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -4,33 +4,33 @@
 
 <!-- Open Page Form view  -->
 
-    	<record id="view_wiki_wiki_page_open" model="ir.ui.view">
+        <record id="view_wiki_wiki_page_open" model="ir.ui.view">
             <field name="name">Open Page</field>
             <field name="model">wiki.wiki.page.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Open Page">
-             	<separator string="" colspan="6" />
-              	<label string="Want to open a wiki page? "/>
-              	<separator string="" colspan="6" />
-    	        <label string="" colspan="2" />
-    	        <group>
-        	    <button special="cancel" string="Cancel" icon="gtk-cancel" />
-               	<button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
-               	</group>
+                 <separator string="" colspan="6" />
+                  <label string="Want to open a wiki page? "/>
+                  <separator string="" colspan="6" />
+                <label string="" colspan="2" />
+                <group>
+                <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                   <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
+                   </group>
              </form>
             </field>
-		</record>
+        </record>
 
 <!-- Open Page Action  -->
 
-		<record id="action_view_wiki_wiki_page_open" model="ir.actions.act_window">
+        <record id="action_view_wiki_wiki_page_open" model="ir.actions.act_window">
             <field name="name">Open Page</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">wiki.wiki.page.open</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-    	</record>
+        </record>
     </data>
 </openerp>