From 145656b555cc61e5d2d9154d3c127c73522c6f3e Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 26 Jun 2012 15:56:18 +0530
Subject: [PATCH 01/66] [IMP] change form view of registration in event module

bzr revid: fka@tinyerp.com-20120626102618-py2cnj472tzofwbw
---
 addons/event/event_view.xml | 86 +++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed539e7bf39..c577c43a2e2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -362,50 +362,54 @@
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
-                <sheet string="Registration" layout="auto">
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
+               <sheet string="Registration">
+                    <group colspan="6" col="7">
+                        <group colspan="3">
+                            <h1>
+                                <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" class="oe_tital"/>
+                            </h1>
+                        </group>
+                        <group colspan="4">
+                            <h1>
+                                ( <field name="event_begin_date" class="oe_inline"/> - <field name="event_end_date" class="oe_inline"/> )
+                            </h1>
+                        </group>  
+                    </group>              
+                    <group colspan="2" col="2">
+                        <h2>
+                            <field name="nb_register"/>Participates
+                        </h2>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="name"/>
-                                <field name="email"/>
-                                <field name="phone"/>
-                            </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
-                            </group>
-                        </page>
-                        <page string="Emails">
-<!--
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree string="History">
-                                    <field name="display_text" string="History Information"/>
-                                    <field name="reply_to" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
--->
-                            <button string="Send New Email"
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <field name="name" invisible="1"/>
+                            <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
+                        </group>
+                        <group colspan="2">
+                            <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                        </group>
+                    </group>
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <label for="email" string="E-Mail"/>
+                            <group colspan="1">
+                                <field name="email" invisible="1"/>
+                                <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                           </page>
-
-                    </notebook>
+                            </group>
+                        </group>
+                        <group colspan="2">
+                            <field name="nb_register"/>
+                        </group>
+                    </group>
+                    <group colspan="2" col="2">
+                        <field name="phone"/>
+                    </group>
+                   <group colspan="2" col="2" groups="base.group_no_one">
+                        <field name="create_date"/>
+                        <field name="date_closed"/>
+                    </group>
                     </sheet>
                     <div class="oe_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>

From 3305e100f0ac0e3b50a2a1f320c0b46d07587c6e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 15:57:19 +0530
Subject: [PATCH 02/66] [IMP]Lunch: Improve lunch form view

bzr revid: dbr@tinyerp.com-20120626102719-6so8gmu8p2woj8cn
---
 addons/lunch/lunch_view.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 1777fd85da6..53152292f68 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -30,14 +30,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
                 </header>
                 <sheet string="Order">
-                    <group col="4">
-                        <field name="user_id"/>
-                        <field name="date"/>
-                        <field name="product" on_change="onchange_product(product)"/>
-                        <field name="category"/>
-                        <field name="descript"/>
-                        <field name="price"/>
-                        <field name="cashmove"/>
+                    <group>
+                        <group>
+                            <field name="product" on_change="onchange_product(product)"/>
+                            <field name="descript"/>
+                            <field name="price"/>
+                            <field name="category"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="date"/>
+                            <field name="cashmove"/>
+                        </group>
                     </group>
                 </sheet>
                 </form>

From 1a897732297859af73a85ede34abb834a6dc2562 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 16:15:01 +0530
Subject: [PATCH 03/66] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626104501-2a5gmtvi3ij62d0f
---
 addons/event/event.py       |  3 ++
 addons/event/event_view.xml | 65 ++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index a348e005d06..71c8d3d8c34 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -214,6 +214,9 @@ class event_event(osv.osv):
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'street': fields.related('address_id','street',type='char',string='Street'),
+        'zip': fields.related('address_id','zip',type='char',string='zip'),
+        'city': fields.related('address_id','city',type='char',string='city'),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed539e7bf39..0504fc9cd25 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -61,40 +61,53 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
                 <sheet>
-
-                <div class="oe_right" style="height: 200px"></div>
-                <div class="oe_title">
-                    <h1><field name="name"/></h1>
+                	<div class="oe_right oe_button_box">
+	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+	                </div>
+                <!--div class="oe_right" style="height: 200px"></div-->
+                <div class="oe_title" style="width: 650px" >
+	            	<label for="name" class="oe_edit_only"/>
+		            <group colspan="6" col="6">
+		            	<group colspan="2"><h1><field name="name"/></h1></group>
+	                    <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+		            </group>  
+		        </div> 
+                <div>
+                	<h2 class="oe_inline">From <field name="date_begin"/> to <field name="date_end"/></h2>
                     <group>
                         <group>
-                            <field name="type" on_change="onchange_event_type(type,context)"/>
-                            <field name="user_id"/>
-                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                            <label for="address_id" string="Address"/>
+                            <div>
+                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                            	<field name="street" />                            
+                            	<div>
+                                     <field name="city" class="oe_inline" placeholder="City"/>
+                            	     <field name="zip" class="oe_inline"/>
+                                </div>
+                            </div>
                         </group>
                         <group>
-                            <field name="date_begin"/>
-                            <field name="date_end"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                    </group>
+	                      	<field name="register_min"/>
+	                       	<field name="register_max"/>
+	                   	</group>
+                     </group>
                 </div>
-
                 <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     <page string="Internal Data">
-                         <group class="oe_group_label_border" colspan="2" col="2">
-                            <field name="register_current"/>
-                            <field name="register_prospect"/>
-                            <field name="register_attended"/>
-                         </group> 
-                         <group class="oe_group_label_border" colspan="2" col="2">
+                      <group>
+                          <group class="oe_group_label_border">
                             <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                             <field name="speaker_confirmed"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                          </group>
+                          <group class="oe_group_label_border">
+                            <field name="register_current"/>
+                            <field name="register_prospect"/>
+                          </group> 
+                      </group>
+                      <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -126,6 +139,12 @@
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
+                            <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
+                                <field name="register_current"/>
+                                <field name="register_prospect"/>
+                                <field name="register_attended" class="oe_subtotal_footer_separator" />
+                            </group>
+							<separator string="" class="oe_clear"/>
                             </field>
                     </page>
                     </notebook>
@@ -313,7 +332,7 @@
             name="Registration"
             res_model="event.registration"
             src_model="event.event"
-            view_mode="calendar,tree,form,graph"
+            view_mode="form,calendar,tree,graph"
             context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
             view_type="form"/>
 

From 8d07971b5398f1df157c9efd1fa93d24315ba38f Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 16:22:12 +0530
Subject: [PATCH 04/66] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626105212-etyqs0n30vd7ksio
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0504fc9cd25..7d7d47c4a60 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -139,13 +139,13 @@
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
+                            </field>
                             <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
                                 <field name="register_current"/>
                                 <field name="register_prospect"/>
                                 <field name="register_attended" class="oe_subtotal_footer_separator" />
                             </group>
 							<separator string="" class="oe_clear"/>
-                            </field>
                     </page>
                     </notebook>
                     </sheet>

From 183b879e5e4e9e03b9c7c426d5f429c1b5f590a1 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 18:23:02 +0530
Subject: [PATCH 05/66] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626125302-rvubrzttwsiff292
---
 addons/event/event.py       |  4 ++--
 addons/event/event_view.xml | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 71c8d3d8c34..5387a64001f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -192,8 +192,8 @@ class event_event(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_max': fields.integer('Maximum Registration', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_min': fields.integer('Minimum Registration', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7d7d47c4a60..5caf9ad5369 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+      <act_window
+            id="act_event_list_register_event"
+            name="Registration"
+            res_model="event.registration"
+            src_model="event.event"
+            view_mode="calendar,tree,form,graph"
+            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
+            view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
@@ -73,7 +80,7 @@
 		            </group>  
 		        </div> 
                 <div>
-                	<h2 class="oe_inline">From <field name="date_begin"/> to <field name="date_end"/></h2>
+                	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/></h2>
                     <group>
                         <group>
                             <label for="address_id" string="Address"/>
@@ -140,7 +147,7 @@
                                     </group>
                             </form>
                             </field>
-                            <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
                                 <field name="register_current"/>
                                 <field name="register_prospect"/>
                                 <field name="register_attended" class="oe_subtotal_footer_separator" />
@@ -327,15 +334,6 @@
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
 
-      <act_window
-            id="act_event_list_register_event"
-            name="Registration"
-            res_model="event.registration"
-            src_model="event.event"
-            view_mode="form,calendar,tree,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
-            view_type="form"/>
-
       <act_window
             id="act_register_event_partner"
             name="Subscribe"

From f12a3b62aff4b0f1414b77b38b132383499ce665 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Tue, 26 Jun 2012 18:31:11 +0530
Subject: [PATCH 06/66] [IMP] survey: Improve view for title

bzr revid: dbr@tinyerp.com-20120626130111-jxhbxan5l3k5tp5q
---
 addons/survey/survey_view.xml | 49 +++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index c50613f466b..59422e1f51b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,18 +26,36 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <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"
-                            string="Test Survey" type="action" icon="gtk-new"
-                            context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                            string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <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}"/>
+                
+                <div class="oe_right oe_button_box">
+                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
+                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" />
+                    <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" />
+                    <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}" invisible="1"/>
+                </div>
+                <group class="oe_inline">
+                    <h1>
+                        <field name="title" select="1"/>
+                        <field name="type"/>
+                    </h1>
+                </group>
+
+                    <group>
+                        <group>
+                            <field name="responsible_id"/>
+                            <field name="id" invisible="1"/>
+                            <field name="send_response"/>
+                        </group>
+                        <group>
+
+                        <field name="max_response_limit"
+                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                        <field name="response_user"
+                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                        </group>
                     </group>
+
                     <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
@@ -189,14 +207,7 @@
                             </field>
                         </page>
                         <page string="Other">
-                            <group colspan="6" col='4'>
-                                <field name="max_response_limit"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="response_user"
-                                    attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                                <field name="type"/>
-                                <field name="send_response"/>
-                            </group>
+
                             <separator colspan="4" string="Survey Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>

From 6878899c42bbea8ebc5683ce412e2b5ea1a75365 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 18:31:52 +0530
Subject: [PATCH 07/66] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626130152-kovzkfq2tin2bx1i
---
 addons/event/event.py       | 12 ++++++++++++
 addons/event/event_view.xml |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5387a64001f..288d2fa330f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -258,6 +258,18 @@ class event_event(osv.osv):
     _constraints = [
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
+    def onchange_address_id(self, cr, uid, ids, address, context=None):
+        data ={}
+        if not address:
+            return data
+        addr_obj = self.pool.get('res.partner')
+        addr_id =  addr_obj.browse(cr, uid, address, context=context)
+        data = {
+            'street':addr_id.street,
+            'zip':addr_id.zip,
+            'city':addr_id.city,
+            }
+        return {'value': data}
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5caf9ad5369..d6f01677ac6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -85,7 +85,7 @@
                         <group>
                             <label for="address_id" string="Address"/>
                             <div>
-                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}" on_change="onchange_address_id(address_id, context)" />
                             	<field name="street" />                            
                             	<div>
                                      <field name="city" class="oe_inline" placeholder="City"/>

From 26635ac3855e2461f19c4d5a89d7ab81a59c871e Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 27 Jun 2012 10:27:25 +0530
Subject: [PATCH 08/66] [IMP]eventtype-form

bzr revid: pna@tinyerp.com-20120627045725-1gtw8bfi3349rt91
---
 addons/event/event_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d6f01677ac6..2cdbb280939 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -7,7 +7,7 @@
             res_model="event.registration"
             src_model="event.event"
             view_mode="calendar,tree,form,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
+            context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
@@ -24,10 +24,10 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="default_reply_to"/>
-                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
-                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_min"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_max"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                     </group>
                 </form>
             </field>

From 4b4cb204dd3bf807766d1d431bdb316b1c964866 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 14:21:35 +0530
Subject: [PATCH 09/66] [IMP]survet: Improve Survey form view

bzr revid: dbr@tinyerp.com-20120627085135-q7uloa3thyu131gh
---
 addons/survey/survey_view.xml | 343 ++++++++++++++++++----------------
 1 file changed, 178 insertions(+), 165 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 59422e1f51b..4001880b92d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,185 +26,191 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
-                
-                <div class="oe_right oe_button_box">
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" />
-                    <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" />
-                    <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}" invisible="1"/>
-                </div>
-                <group class="oe_inline">
                     <h1>
-                        <field name="title" select="1"/>
-                        <field name="type"/>
+                        <field name="title" select="1" class="oe_inline"/>
+                        <field name="type" class="oe_inline"/>
+                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" class="oe_right"/>
                     </h1>
-                </group>
-
+                    
+                    <div>
+                        <label for="responsible_id"/>
+                        <field name="responsible_id" class="oe_inline"/>
+                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" class="oe_right"/>
+                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
+                    </div>
                     <group>
                         <group>
-                            <field name="responsible_id"/>
                             <field name="id" invisible="1"/>
                             <field name="send_response"/>
                         </group>
                         <group>
-
-                        <field name="max_response_limit"
-                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                        <field name="response_user"
-                            attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/>
                         </group>
-                    </group>
-
-                    <notebook>
+                     </group>
+                     <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Survey Page">
-                                    <field name="title" select="1"/>
-                                    <field name="sequence" groups="base.group_no_one"/>
-                                    <separator string="Description" colspan="4"/>
-                                    <field name="note" colspan="4" nolabel="1"/>
-                                    <field name="question_ids" height="200" width="200" colspan="4" nolabel="1">
-                                        <form string="Survey Question" >
-                                            <group col="6" colspan="6" height="600" width="200">
-                                            <field name="question" colspan="4" select="1"/>
-                                            <field name="sequence"/>
-                                            <field name="tot_resp"/>
-                                            <field name="type" on_change="on_change_type(type)"/>
-                                            <field name="in_visible_rating_weight" invisible="1"/>
-                                            <field name="in_visible_menu_choice" invisible="1"/>
-                                            <field name="in_visible_answer_type" invisible="1"/>
-                                            <notebook colspan="4">
-                                                <page string="Options">
-                                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                                      <separator string="Answer" colspan="4"/>
-                                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                                       </group>
-                                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                                               <field name="no_of_rows"/>
-                                                            </group>
-                                                       </group>
+                                    <group>
+                                        <field name="title" select="1"/>
+                                        <field name="sequence" groups="base.group_no_one"/>
+                                    </group>
+                                    <newline/>
+                                    <group>
+                                        <field name="note" placeholder="Add a description on the survey page" nolabel="1"/>
+                                    </group>
+                                    <newline/>
+                                    <group string="Survey Questions">
+                                        <field name="question_ids" nolabel="1">
+                                            <form string="Survey Question" >
+                                                <group>
+                                                    <group>
+                                                    <field name="question" select="1"/>
+                                                    <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
-                                                    <newline/>
-                                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                                        <separator string="Comment Field" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_comment_require"/>
-                                                        </group>
-                                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                                            <group col="4" colspan="4">
-                                                                <field name="comment_field_type" colspan="1"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                    <field colspan="2" name="comment_label" />
-                                                                </group>
-                                                            </group>
-                                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                                <field name="comment_valid_type" colspan="2"/>
-                                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                                    <field name="comment_minimum_no" string="Between"/>
-                                                                    <field name="comment_maximum_no" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                                    <field name="comment_minimum_float" string="Between"/>
-                                                                    <field name="comment_maximum_float" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                                    <field name="comment_minimum_date" string="Between"/>
-                                                                    <field name="comment_maximum_date" string="and"/>
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
-                                                                    <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
-                                                                </group>
-                                                            </group>
-                                                        </group>
+                                                    <group>
+                                                    <field name="sequence"/>
+                                                    <field name="tot_resp"/>
                                                     </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                                        <field name="comment_column"/>
-                                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                                            <field name="column_name" colspan="2"/>
+                                                </group>
+                                                <newline/>
+                                                <group>
+                                                <field name="in_visible_rating_weight" invisible="1"/>
+                                                <field name="in_visible_menu_choice" invisible="1"/>
+                                                <field name="in_visible_answer_type" invisible="1"/>
+                                                <notebook colspan="4">
+                                                    <page string="Options">
+                                                        <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer">
+                                                           <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
+                                                               <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                                           </group>
+                                                           <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                               <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
+                                                                   <field name="no_of_rows"/>
+                                                                </group>
+                                                           </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                                        <separator string="Validation" colspan="4"/>
-                                                        <group colspan="4">
-                                                            <field name="is_validation_require"/>
-                                                        </group>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                                            <field name="validation_type" colspan="2"/>
-                                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                                <field name="validation_minimum_no" string="Between"/>
-                                                                <field name="validation_maximum_no" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                                <field name="validation_minimum_float" string="Between"/>
-                                                                <field name="validation_maximum_float" string="and"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                                <field name="validation_minimum_date" string="Between"/>
-                                                                <field name="validation_maximum_date" string="and"/>
-                                                            </group>
-                                                        </group>
-                                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                                        </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                        <separator string="Required Answer" colspan="4"/>
                                                         <newline/>
-                                                        <field name="is_require_answer"/>
-                                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                                <field name="required_type"/>
-                                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                                    <field name="req_ans" />
-                                                                </group>
-                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                                    <field name="minimum_req_ans"/>
-                                                                    <field name="maximum_req_ans"/>
-                                                                </group>
+                                                        <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+                                                            <separator string="Comment Field" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_comment_require"/>
                                                             </group>
-                                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                                <label string="When the question is not answered, display this error message:"/>
-                                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                                <group colspan="2" >
-                                                                    <field name="numeric_required_sum"/>
+                                                            <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                                <group col="4" colspan="4">
+                                                                    <field name="comment_field_type" colspan="1"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                        <field colspan="2" name="comment_label" />
+                                                                    </group>
+                                                                </group>
+                                                                <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                                    <field name="comment_valid_type" colspan="2"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                                        <field name="comment_minimum_no" string="Between"/>
+                                                                        <field name="comment_maximum_no" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                                        <field name="comment_minimum_float" string="Between"/>
+                                                                        <field name="comment_maximum_float" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                                        <field name="comment_minimum_date" string="Between"/>
+                                                                        <field name="comment_maximum_date" string="and"/>
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                                        <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                        <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                                    </group>
                                                                 </group>
-                                                                <newline/>
-                                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
-                                                            </group>
-                                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                                <field name="rating_allow_one_column_require"/>
                                                             </group>
                                                         </group>
-                                                    </group>
-                                                    <newline/>
-                                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                                        <separator string="Descriptive Text" colspan="4"/>
-                                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                                    </group>
-                                                </page>
-                                            </notebook>
-                                            </group>
-                                        </form>
-                                        <tree string="Survey Question">
-                                            <field name="sequence" string="Seq"/>
-                                            <field name="question" colspan="4" select="1"/>
-                                            <field name="answer_choice_ids"/>
-                                        </tree>
-                                    </field>
-                                </form>
-                            </field>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                            <field name="comment_column"/>
+                                                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                                <field name="column_name" colspan="2"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                            <separator string="Validation" colspan="4"/>
+                                                            <group colspan="4">
+                                                                <field name="is_validation_require"/>
+                                                            </group>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                                <field name="validation_type" colspan="2"/>
+                                                                <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                                    <field name="validation_minimum_no" string="Between"/>
+                                                                    <field name="validation_maximum_no" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                                    <field name="validation_minimum_float" string="Between"/>
+                                                                    <field name="validation_maximum_float" string="and"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                                    <field name="validation_minimum_date" string="Between"/>
+                                                                    <field name="validation_maximum_date" string="and"/>
+                                                                </group>
+                                                            </group>
+                                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
+                                                                <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                                <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                            <separator string="Required Answer" colspan="4"/>
+                                                            <newline/>
+                                                            <field name="is_require_answer"/>
+                                                            <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                                    <field name="required_type"/>
+                                                                    <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                                        <field name="req_ans" />
+                                                                    </group>
+                                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                                        <field name="minimum_req_ans"/>
+                                                                        <field name="maximum_req_ans"/>
+                                                                    </group>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                                    <label string="When the question is not answered, display this error message:"/>
+                                                                    <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                                    <group colspan="2" >
+                                                                        <field name="numeric_required_sum"/>
+                                                                    </group>
+                                                                    <newline/>
+                                                                    <label string="When the choices do not add up correctly, display this error message"/>
+                                                                    <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                                </group>
+                                                                <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                                    <field name="rating_allow_one_column_require"/>
+                                                                </group>
+                                                            </group>
+                                                        </group>
+                                                        <newline/>
+                                                        <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                            <separator string="Descriptive Text" colspan="4"/>
+                                                            <field name="descriptive_text" colspan="4" nolabel="1"/>
+                                                        </group>
+                                                    </page>
+                                                </notebook>
+                                                </group>
+                                            </form>
+                                            <tree string="Survey Question">
+                                                <field name="sequence" string="Seq"/>
+                                                <field name="question" colspan="4" select="1"/>
+                                                <field name="answer_choice_ids"/>
+                                            </tree>
+                                        </field>
+                                    </group>
+                                    </form>
+                                </field>
+
                         </page>
                         <page string="Other">
 
@@ -215,10 +221,16 @@
                             <field name="invited_user_ids" nolabel="1" readonly="1"/>
                         </page>
                         <page string="History">
-                            <field name="date_open" select="1"/>
-                            <field name="date_close"/>
-                            <field name="tot_start_survey" select="1"/>
-                            <field name="tot_comp_survey" select="1"/>
+                            <group>
+                                <group>
+                                    <field name="date_open" select="1"/>
+                                    <field name="date_close"/>
+                                </group>
+                                <group>
+                                    <field name="tot_start_survey" select="1"/>
+                                    <field name="tot_comp_survey" select="1"/>
+                                </group>
+                            </group>
                             <field name="history" colspan="4" nolabel="1">
                                 <tree string="History">
                                     <field name="date"/>
@@ -228,8 +240,9 @@
                                     <field name="date"/>
                                     <field name="user_id"/>
                                 </form>
-                               </field>
-                           </page>
+                           </field>
+
+                        </page>
                     </notebook>
                 </sheet>
                 </form>

From 903080fbeb3d9cb1f8e58e01acdaca51e9f3bf04 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 14:54:21 +0530
Subject: [PATCH 10/66] [IMP]survet: Improve view for survey page and remove
 sepratore from browse Answer wizard

bzr revid: dbr@tinyerp.com-20120627092421-ckveonxc00yaltfr
---
 addons/survey/survey_view.xml                 | 267 +++++++++---------
 addons/survey/wizard/survey_browse_answer.xml |   3 +-
 2 files changed, 139 insertions(+), 131 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4001880b92d..5ef19555511 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -328,149 +328,158 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <field name="title" colspan="4" select="1"/>
-                        <field name="survey_id" select="1"/>
-                        <field name="sequence"/>
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="question_ids" colspan="4" nolabel="1">
-                        <form string="Survey Question">
-                            <field name="question" colspan="4" select="1"/>
+                        <group col="4">
+                            <field name="title" select="1"/>
+                            <field name="survey_id" select="1"/>
                             <field name="sequence"/>
-                            <field name="tot_resp"/>
-                            <field name="type" on_change="on_change_type(type)"/>
-                            <field name="in_visible_rating_weight" invisible="1"/>
-                            <field name="in_visible_menu_choice" invisible="1"/>
-                            <field name="in_visible_answer_type" invisible="1"/>
-                            <notebook colspan="4">
-                                <page string="Options">
-                                    <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
-                                      <separator string="Answer" colspan="4"/>
-                                       <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-                                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'in_visible_answer_type': in_visible_answer_type}"/>
-                                       </group>
-                                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
-                                           <field name="column_heading_ids" colspan="4" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','table')]}">
-                                               <field name="no_of_rows"/>
-                                            </group>
-                                       </group>
+                        </group>
+                        <group string="Description" col="4">
+                            <field name="note" nolabel="1"/>
+                        </group>
+                        <group col="4">
+                            <field name="question_ids" nolabel="1">
+                            <form string="Survey Question">
+                                <group>
+                                    <group>
+                                        <field name="question" select="1"/>
+                                        <field name="type" on_change="on_change_type(type)"/>
+                                    </group>
+                                    <group>
+                                        <field name="sequence"/>
+                                        <field name="tot_resp"/>
+                                        <field name="in_visible_rating_weight" invisible="1"/>
+                                        <field name="in_visible_menu_choice" invisible="1"/>
+                                        <field name="in_visible_answer_type" invisible="1"/>
                                     </group>
                                     <newline/>
-                                    <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
-                                        <separator string="Comment Field" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_comment_require"/>
-                                        </group>
-                                        <group attrs="{'invisible':[('is_comment_require','=',False)]}">
-                                            <group col="4" colspan="4">
-                                                <field name="comment_field_type" colspan="1"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                    <field colspan="2" name="comment_label" />
+                                    <notebook colspan="4">
+                                        <page string="Options">
+                                            <group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}" string="Answer" col="4">
+                                               <group attrs="{'invisible':[('type','=','table')]}">
+                                                   <field name="answer_choice_ids" nolabel="1" context="{'in_visible_answer_type': in_visible_answer_type}"/>
+                                               </group>
+                                               <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
+                                                   <field name="column_heading_ids" nolabel="1" context="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
+                                                    <group attrs="{'invisible':[('type','!=','table')]}">
+                                                       <field name="no_of_rows"/>
+                                                    </group>
+                                               </group>
+                                            </group>
+                                            <newline/>
+                                            <group  attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'), ('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}" string="Comment Field" col="4">
+                                                <group>
+                                                    <field name="is_comment_require"/>
+                                                </group>
+                                                <group attrs="{'invisible':[('is_comment_require','=',False)]}">
+                                                    <group>
+                                                        <field name="comment_field_type" colspan="1"/>
+                                                        <group attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                            <field name="comment_label" />
+                                                        </group>
+                                                    </group>
+                                                    <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
+                                                        <field name="comment_valid_type" colspan="2"/>
+                                                        <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
+                                                            <field name="comment_minimum_no" string="Between"/>
+                                                            <field name="comment_maximum_no" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
+                                                            <field name="comment_minimum_float" string="Between"/>
+                                                            <field name="comment_maximum_float" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
+                                                            <field name="comment_minimum_date" string="Between"/>
+                                                            <field name="comment_maximum_date" string="and"/>
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
+                                                            <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                        </group>
+                                                    </group>
                                                 </group>
                                             </group>
-                                            <group col="6" colspan="4" attrs="{'invisible':[('comment_field_type','!=','char'),('comment_field_type','!=','text')]}">
-                                                <field name="comment_valid_type" colspan="2"/>
-                                                <group colspan="2" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'), ('comment_valid_type','!=','must_be_whole_number')]}">
-                                                    <field name="comment_minimum_no" string="Between"/>
-                                                    <field name="comment_maximum_no" string="and"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+                                                <field name="comment_column"/>
+                                                <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+                                                    <field name="column_name" colspan="2"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_decimal_number')]}">
-                                                    <field name="comment_minimum_float" string="Between"/>
-                                                    <field name="comment_maximum_float" string="and"/>
+                                            </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
+                                                <separator string="Validation" colspan="4"/>
+                                                <group colspan="4">
+                                                    <field name="is_validation_require"/>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_date')]}">
-                                                    <field name="comment_minimum_date" string="Between"/>
-                                                    <field name="comment_maximum_date" string="and"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
+                                                    <field name="validation_type" colspan="2"/>
+                                                    <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
+                                                        <field name="validation_minimum_no" string="Between"/>
+                                                        <field name="validation_maximum_no" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
+                                                        <field name="validation_minimum_float" string="Between"/>
+                                                        <field name="validation_maximum_float" string="and"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
+                                                        <field name="validation_minimum_date" string="Between"/>
+                                                        <field name="validation_maximum_date" string="and"/>
+                                                    </group>
                                                 </group>
-                                                <group colspan="4" attrs="{'invisible':[('comment_valid_type','!=','must_be_specific_length'),('comment_valid_type','!=','must_be_decimal_number'),('comment_valid_type','!=','must_be_whole_number'),('comment_valid_type','!=','must_be_date'),('comment_valid_type','!=','must_be_email_address')]}">
+                                                <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
                                                     <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
+                                                    <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
                                                 </group>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-                                        <field name="comment_column"/>
-                                        <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-                                            <field name="column_name" colspan="2"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
-                                        <separator string="Validation" colspan="4"/>
-                                        <group colspan="4">
-                                            <field name="is_validation_require"/>
-                                        </group>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_validation_require','=',False)]}">
-                                            <field name="validation_type" colspan="2"/>
-                                            <group colspan="2" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'), ('validation_type','!=','must_be_whole_number')]}">
-                                                <field name="validation_minimum_no" string="Between"/>
-                                                <field name="validation_maximum_no" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_decimal_number')]}">
-                                                <field name="validation_minimum_float" string="Between"/>
-                                                <field name="validation_maximum_float" string="and"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_date')]}">
-                                                <field name="validation_minimum_date" string="Between"/>
-                                                <field name="validation_maximum_date" string="and"/>
-                                            </group>
-                                        </group>
-                                        <group colspan="4" attrs="{'invisible':[('validation_type','!=','must_be_specific_length'),('validation_type','!=','must_be_decimal_number'),('validation_type','!=','must_be_whole_number'),('validation_type','!=','must_be_date'),('validation_type','!=','must_be_email_address')]}">
-                                            <label string="When the comment is an invalid format, display this error message" colspan="4"/>
-                                            <field name="validation_valid_err_msg" nolabel="1" colspan="4"/>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
-                                        <separator string="Required Answer" colspan="4"/>
-                                        <newline/>
-                                        <field name="is_require_answer"/>
-                                        <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
-                                                <field name="required_type"/>
-                                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
-                                                    <field name="req_ans" />
-                                                </group>
-                                                <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
-                                                    <field name="minimum_req_ans"/>
-                                                    <field name="maximum_req_ans"/>
-                                                </group>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
-                                                <label string="When the question is not answered, display this error message:"/>
-                                                <field name="req_error_msg" colspan="4" nolabel="1"/>
-                                            </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                <group colspan="2" >
-                                                    <field name="numeric_required_sum"/>
-                                                </group>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                <separator string="Required Answer" colspan="4"/>
                                                 <newline/>
-                                                <label string="When the choices do not add up correctly, display this error message"/>
-                                                <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                <field name="is_require_answer"/>
+                                                <group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
+                                                        <field name="required_type"/>
+                                                        <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
+                                                            <field name="req_ans" />
+                                                        </group>
+                                                        <group colspan="4" attrs="{'invisible':[('required_type','!=','a range')]}">
+                                                            <field name="minimum_req_ans"/>
+                                                            <field name="maximum_req_ans"/>
+                                                        </group>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('required_type','!=','all'),('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly'),('required_type','!=','a range'),('is_require_answer','!=',True)]}">
+                                                        <label string="When the question is not answered, display this error message:"/>
+                                                        <field name="req_error_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
+                                                        <group colspan="2" >
+                                                            <field name="numeric_required_sum"/>
+                                                        </group>
+                                                        <newline/>
+                                                        <label string="When the choices do not add up correctly, display this error message"/>
+                                                        <field name="numeric_required_sum_err_msg" colspan="4" nolabel="1"/>
+                                                    </group>
+                                                    <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
+                                                        <field name="rating_allow_one_column_require"/>
+                                                    </group>
+                                                </group>
                                             </group>
-                                            <group colspan="4" attrs="{'invisible':[('type','!=','rating_scale')]}">
-                                                <field name="rating_allow_one_column_require"/>
+                                            <newline/>
+                                            <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
+                                                <separator string="Descriptive Text" colspan="4"/>
+                                                <field name="descriptive_text" colspan="4" nolabel="1"/>
                                             </group>
-                                        </group>
-                                    </group>
-                                    <newline/>
-                                    <group attrs="{'invisible':[('type','!=','descriptive_text')]}">
-                                        <separator string="Descriptive Text" colspan="4"/>
-                                        <field name="descriptive_text" colspan="4" nolabel="1"/>
-                                    </group>
-                                </page>
-                            </notebook>
-    
-                        </form>
-                        <tree string="Survey Question">
-                            <field name="sequence" string="Seq"/>
-                            <field name="question" colspan="4" select="1"/>
-                            <field name="answer_choice_ids"/>
-                        </tree>
-                        </field>
+                                        </page>
+                                    </notebook>
+                                </group>
+                            </form>
+                            <tree string="Survey Question">
+                                <field name="sequence" string="Seq"/>
+                                <field name="question" colspan="4" select="1"/>
+                                <field name="answer_choice_ids"/>
+                            </tree>
+                            </field>
+                        </group>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index a2069cfdb9a..bdfbb200237 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -16,8 +16,7 @@
                         <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"/>
+                    <group col="4" string =  "Select Survey and Related Answer">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>

From 51b64aef016f453c96d7b350decdf10f06e252e7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 16:32:07 +0530
Subject: [PATCH 11/66] [IMP]lunch: Lunch configuration improvemnets

bzr revid: dbr@tinyerp.com-20120627110207-fmhxho2ij95d2jp8
---
 addons/lunch/lunch_view.xml | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 53152292f68..7df87c6cf89 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -109,8 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <field name="name"/>
-                    <field name="manager"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -220,8 +222,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <separator string="Category Related to Products" colspan="4"/>
+                    <group col="4">
                     <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -254,18 +257,18 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
-                     <group col="6">
-                          <field name="name"/>
-                          <field name="category_id"/>
-                          <field name="price" />
-                     </group>
-                     <notebook colspan="4">
-                         <page string="General Information">
-                              <field name="active"/>
-                              <separator string="Description" colspan="4" />
-                              <field name="description" nolabel="1" colspan="4" />
-                          </page>
-                     </notebook>
+                    <group>
+                    <group>
+                        <field name="name"/>
+                        <field name="category_id"/>
+                        <field name="price" />
+                    </group>
+                    <group>
+                        <field name="active"/>
+                    </group>
+                    <field name="description" placeholder="Add a description" nolabel="1"/>
+                    </group>
+
                 </form>
             </field>
         </record>

From c6516ad816017fa0f0b4954930b96ef0302c73f9 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 16:43:29 +0530
Subject: [PATCH 12/66] [IMP] Idea: View imp

bzr revid: dbr@tinyerp.com-20120627111329-1as4fgtmv67cayu3
---
 addons/idea/idea_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 0aabaa42276..7e393bc4f75 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -72,11 +72,14 @@
                     <button name="idea_cancel" string="Refuse" states="open" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
                 </header>
+                <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="category_ids"/>
-                    <h2><field name="category_ids"/></h2>
-                    <field name="description"/>
+                    <group>
+                        <field name="category_ids" widget="many2many_tags" string="Tags"/>
+                        <field name="description"/>
+                    </group>
+                </sheet>
                 <footer>
                     <field name="message_ids" widget="ThreadView"/>
                 </footer>

From a4c6224892968e8da7b76a4d64ae839aee31c466 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 18:22:15 +0530
Subject: [PATCH 13/66] [IMP]lunch: change field date position

bzr revid: dbr@tinyerp.com-20120627125215-0t40lg17jybyx9zz
---
 addons/lunch/lunch_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 7df87c6cf89..785cc1490f4 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -39,8 +39,8 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <field name="date"/>
                             <field name="cashmove"/>
+                            <field name="date"/>
                         </group>
                     </group>
                 </sheet>

From 32b030c763a0bf7c20da209af3f0f3226838538c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 18:31:47 +0530
Subject: [PATCH 14/66] [IMP] set email button and chenge text of user_id field

bzr revid: kjo@tinyerp.com-20120627130147-tktvn9b5cdsblzp0
---
 addons/event/event.py       | 2 +-
 addons/event/event_view.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 3fcf63156f6..ba3fedea69e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -326,7 +326,7 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Attendee (user)', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'User', states={'done': [('readonly', True)]}),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 223e3cdff5f..8f378af3775 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -71,7 +71,7 @@
                 	<div class="oe_right oe_button_box">
 	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
 	                </div>
-                <!--div class="oe_right" style="height: 200px"></div-->
+                
                 <div class="oe_title" style="width: 650px" >
 	            	<label for="name" class="oe_edit_only"/>
 		            <group colspan="6" col="6">
@@ -99,6 +99,7 @@
 	                   	</group>
                      </group>
                 </div>
+                <!-- <div class="oe_right" style="height: 200px"></div> -->
                 <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
@@ -404,11 +405,11 @@
                             <field name="name" invisible="1"/>
                             <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
                             <label for="email" string="E-Mail"/>
-                            <group colspan="1">
-                                <field name="email" invisible="1"/>
+                            <group col="2">
+                                <field name="email" nolabel="1" class="oe_inline"/>
                                 <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                             </group>
                         </group>
                         <group colspan="2">

From 2db7582e6ebe192bcfd9265ebea2cca387733f0a Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 27 Jun 2012 18:41:13 +0530
Subject: [PATCH 15/66] [IMP]survey: Little view improvements

bzr revid: dbr@tinyerp.com-20120627131113-hbgonrlha88nyiz8
---
 addons/survey/survey_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 5ef19555511..63fbe5f2834 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -52,10 +52,12 @@
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
                                 <form string="Survey Page">
-                                    <group>
-                                        <field name="title" select="1"/>
-                                        <field name="sequence" groups="base.group_no_one"/>
-                                    </group>
+                                    <h2>
+                                        <label for="title" class="oe_edit_only"/>
+                                        <field name="title" select="1" class="oe_inline"/>
+                                        <label for="sequence" class="oe_edit_only"/>
+                                        (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
+                                    </h2>
                                     <newline/>
                                     <group>
                                         <field name="note" placeholder="Add a description on the survey page" nolabel="1"/>

From 5135c8a3a502127a024f693e07edab9e19f57d4c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 16:58:41 +0530
Subject: [PATCH 16/66] [IMP]event_moodle: remove xpath

bzr revid: kjo@tinyerp.com-20120628112841-c1sp8tm4wqef9g1k
---
 addons/event_moodle/event_view.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index b009339d564..4fa0172c5f5 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,14 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Emails']" position="after">
-                    <page string="Moodle">
-                        <field name="moodle_user_password" readonly='1' colspan="2"/>
-                        <field name="moodle_uid" readonly="1"/>
-                    </page>
-                </xpath>
                 <field name="email" position="replace">
-                     <field name="email" required="1" />
+                     <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
                      <field name="moodle_username" colspan="2" on_change="onchange_moodle_name(moodle_user_password)"/>

From 6d0c9fa8865835b23b56c7c734647b9e027bffea Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 18:03:26 +0530
Subject: [PATCH 17/66] [IMP]event_sale: inherit event.registration

bzr revid: kjo@tinyerp.com-20120628123326-sqyhz0qj6kft82hf
---
 addons/event_sale/event_sale.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0d6497c45f2..96468bd471f 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -91,3 +91,9 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
+
+class event_registration(osv.osv):
+    # TOFIX: section_id field is not availble in event_registration table in database but In _columns (_inherited) findout section_id field which added in crm module in res.partner model. so need to fix in framework to restrive columns but right now Fixed to inherit again to update  event_registration table.
+    _name = 'event.registration'
+    _inherit = ['event.registration','ir.needaction_mixin','mail.thread', 'res.partner']
+    

From bafe6650225d858e4ca2b485f95b078fe99d8c02 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 12:54:31 +0530
Subject: [PATCH 18/66] [IMP]event: remove res.partner inherit

bzr revid: kjo@tinyerp.com-20120629072431-4bsg54hzww6dzjd6
---
 addons/event/event.py           | 8 +++++++-
 addons/event_sale/event_sale.py | 5 -----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index ba3fedea69e..029b9f86310 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -312,7 +312,7 @@ class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = ['ir.needaction_mixin','mail.thread','res.partner']
+    _inherit = ['ir.needaction_mixin','mail.thread']
     _columns = {
         'id': fields.integer('ID'),
         'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
@@ -333,11 +333,17 @@ class event_registration(osv.osv):
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
+        # Fields for address, due to separation from event.registration and res.partner
+        'email': fields.char('Email', size=240),
+        'phone': fields.char('Phone', size=64),
+        'name': fields.char('Name', size=128, required=True, select=True),
+        'active': fields.boolean('Active'),
     }
 
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
+        'active': True,
     }
     _order = 'name, create_date desc'
 
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0fb89f46775..426c410dd99 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -90,9 +90,4 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-
-class event_registration(osv.osv):
-    # TOFIX: section_id field is not availble in event_registration table in database but In _columns (_inherited) findout section_id field which added in crm module in res.partner model. so need to fix in framework to restrive columns but right now Fixed to inherit again to update  event_registration table.
-    _name = 'event.registration'
-    _inherit = ['event.registration','ir.needaction_mixin','mail.thread', 'res.partner']
     

From 57329cc83378057590cbb33d8350c7a138247d08 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 17:40:00 +0530
Subject: [PATCH 19/66] [IMP]event: event_view.xml change

bzr revid: kjo@tinyerp.com-20120629121000-x071xn35pb4wi4wa
---
 addons/event/event_view.xml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8f378af3775..d6da35a3e2f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -382,19 +382,17 @@
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
-               <sheet string="Registration">
-                    <group colspan="6" col="7">
-                        <group colspan="3">
-                            <h1>
-                                <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" class="oe_tital"/>
-                            </h1>
-                        </group>
-                        <group colspan="4">
-                            <h1>
-                                ( <field name="event_begin_date" class="oe_inline"/> - <field name="event_end_date" class="oe_inline"/> )
-                            </h1>
-                        </group>  
-                    </group>              
+                <sheet string="Registration">
+                   <label for="event_id" class="oe_edit_only"/>
+                   <h1>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
+                            <label string="(" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+                            <field nolabel="1" name="event_begin_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <label string="-" attrs="{'invisible': ['|',('event_begin_date', '=', ''), ('event_id', '=', '')]}" class="oe_inline"/>
+                            <field nolabel="1" name="event_end_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline" />
+                            <label string=")" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+	                </h1>   
+		                   
                     <group colspan="2" col="2">
                         <h2>
                             <field name="nb_register" class="oe_inline"/>  Participants
@@ -431,12 +429,12 @@
                         <field name="create_date"/>
                         <field name="date_closed"/>
                     </group>
-                    </sheet>
-                    <footer>
-                        <div class="oe_sheet_width">
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                        </div>
-                    </footer>
+                </sheet>
+                <footer>
+                    <div class="oe_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
+                </footer>
                 </form>
             </field>
         </record>

From bc3463a9cbfb3e19ff468b2fa82cde7c6c664347 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 11:42:08 +0530
Subject: [PATCH 20/66] [IMP]survey: Improve survey view

bzr revid: dbr@tinyerp.com-20120702061208-qyomfgnvd75pkgzt
---
 addons/survey/survey_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index a53993ae591..2c691c0388c 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -26,16 +26,20 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
+                    <div class="oe_button_box oe_right">
+                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                    </div>
                     <h1>
                         <field name="title" select="1" class="oe_inline"/>
+                        <label string="(" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                         <field name="type" class="oe_inline"/>
-                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}" class="oe_right"/>
+                        <label string=")" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                     </h1>
                     
                     <div>
                         <label for="responsible_id"/>
                         <field name="responsible_id" class="oe_inline"/>
-                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}" class="oe_right"/>
                         <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
                     </div>
                     <group>

From 2be268b2a9ea630a6bcd4537bf4cc83b4bba5a0e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 2 Jul 2012 12:06:43 +0530
Subject: [PATCH 21/66] [IMP]survey: View imp for label

bzr revid: dbr@tinyerp.com-20120702063643-ue8nu3c61iszsllq
---
 addons/survey/survey_view.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2c691c0388c..2684a4c1d59 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -29,22 +29,19 @@
                     <div class="oe_button_box oe_right">
                         <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
                         <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
                     </div>
+                    <label for="title" class="oe_edit_only"/>
                     <h1>
                         <field name="title" select="1" class="oe_inline"/>
                         <label string="(" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                         <field name="type" class="oe_inline"/>
                         <label string=")" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                     </h1>
-                    
-                    <div>
-                        <label for="responsible_id"/>
-                        <field name="responsible_id" class="oe_inline"/>
-                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
-                    </div>
                     <group>
                         <group>
                             <field name="id" invisible="1"/>
+                            <field name="responsible_id" class="oe_inline"/>
                             <field name="send_response"/>
                         </group>
                         <group>
@@ -55,11 +52,12 @@
                      <notebook>
                         <page string="Survey">
                             <field name="page_ids" colspan="4" nolabel="1" mode="tree">
-                                <form string="Survey Page">
+                                <form string="Survey Page" version="7.0">
+                                    <sheet>
+                                    <label for="title" class="oe_edit_only"/>
+                                    <label for="sequence" class="oe_edit_only" groups="base.group_no_one"/>
                                     <h2>
-                                        <label for="title" class="oe_edit_only"/>
                                         <field name="title" select="1" class="oe_inline"/>
-                                        <label for="sequence" class="oe_edit_only"/>
                                         (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
                                     </h2>
                                     <newline/>
@@ -214,6 +212,7 @@
                                             </tree>
                                         </field>
                                     </group>
+                                    </sheet>
                                     </form>
                                 </field>
 

From e094d069293195287525a21e6adbe95ebb376f0f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Jul 2012 12:13:42 +0530
Subject: [PATCH 22/66] [IMP]:survey:improved view

bzr revid: apa@tinyerp.com-20120702064342-nrq2vt0i3ekl4wvd
---
 addons/survey/survey_view.xml                 | 1 -
 addons/survey/wizard/survey_browse_answer.xml | 2 +-
 addons/survey/wizard/survey_print_answer.xml  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2684a4c1d59..fe3b5a0d0d8 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -55,7 +55,6 @@
                                 <form string="Survey Page" version="7.0">
                                     <sheet>
                                     <label for="title" class="oe_edit_only"/>
-                                    <label for="sequence" class="oe_edit_only" groups="base.group_no_one"/>
                                     <h2>
                                         <field name="title" select="1" class="oe_inline"/>
                                         (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index bdfbb200237..be654768f40 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -16,7 +16,7 @@
                         <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
-                    <group col="4" string =  "Select Survey and Related Answer">
+                    <group col="4" string = "Select Survey and Related Answer">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 265c56ee1c6..4c2075cd66e 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -11,8 +11,8 @@
             <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"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>

From 7d90e49560a02b2689bd5868f155aa894f35b0a2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Jul 2012 12:58:42 +0530
Subject: [PATCH 23/66] [IMP]:lunch:improved view

bzr revid: apa@tinyerp.com-20120702072842-boch3po931wc8czx
---
 addons/lunch/lunch_view.xml | 61 +++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 785cc1490f4..c246937a3a3 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -109,10 +109,12 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <group>
-                        <field name="name"/>
-                        <field name="manager"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="manager"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -151,14 +153,16 @@
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
                 <form string="CashMove" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="user_cashmove"/>
-                        <field name="amount"/>
-                        <field name="box"/>
-                        <field name="create_date"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="user_cashmove"/>
+                            <field name="amount"/>
+                            <field name="box"/>
+                            <field name="create_date"/>
+                            <field name="active"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -222,9 +226,11 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <group col="4">
-                    <field name="name"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -257,18 +263,19 @@
             <field name="model">lunch.product</field>
             <field name="arch" type="xml">
                 <form string="Products" version="7.0">
-                    <group>
-                    <group>
-                        <field name="name"/>
-                        <field name="category_id"/>
-                        <field name="price" />
-                    </group>
-                    <group>
-                        <field name="active"/>
-                    </group>
-                    <field name="description" placeholder="Add a description" nolabel="1"/>
-                    </group>
-
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="category_id"/>
+                                <field name="price" />
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                            <field name="description" placeholder="Add a description" nolabel="1" colspan="4"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 15a8836b14519c352279201df7fec3fe6215dc95 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Jul 2012 13:01:19 +0530
Subject: [PATCH 24/66] [IMP]:idea:improved view

bzr revid: apa@tinyerp.com-20120702073119-dxn0h7uwy5bh0gi7
---
 addons/idea/idea_view.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 7e393bc4f75..4361cabe638 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -20,9 +20,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Category of Ideas" version="7.0">
-                    <group>
-                        <field name="name"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>

From 38e91f1434187a0c1b1eefbfec77b2020664cb45 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 4 Jul 2012 14:52:51 +0530
Subject: [PATCH 25/66] [IMP]survey: Improve survey page also imp answer and
 browse ans. wizard view

bzr revid: dbr@tinyerp.com-20120704092251-cpsxco49c8wejssy
---
 addons/survey/survey_view.xml                 | 4 ++--
 addons/survey/wizard/survey_browse_answer.xml | 2 +-
 addons/survey/wizard/survey_selection.xml     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index e6043586c6e..b55e073cf4d 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -376,8 +376,8 @@
                             <field name="survey_id" select="1"/>
                             <field name="sequence"/>
                         </group>
-                        <group string="Description" col="4">
-                            <field name="note" nolabel="1"/>
+                        <group col="4">
+                            <field name="note" nolabel="1" placeholder="Add a description on the survey page"/>
                         </group>
                         <group col="4">
                             <field name="question_ids" nolabel="1">
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index 337c7c029fd..20c028068bb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -17,7 +17,7 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group col="4" string = "Select Survey and Related Answer">
+                    <group col="4">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 7dc736d3008..15b4af6756f 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -16,10 +16,10 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group string="Select Survey">
+                    <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
-                    <field name="note" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                    <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
                 </form>
             </field>
         </record>

From 36dca91195fc322dc80782a993ab9e644dc4fa1e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 4 Jul 2012 16:45:29 +0530
Subject: [PATCH 26/66] [IMP]event: remove date and add duration

bzr revid: kjo@tinyerp.com-20120704111529-8nm276wyabrcn1wd
---
 addons/event/event.py       | 17 ++++++++++++-----
 addons/event/event_view.xml | 14 +++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 029b9f86310..09495560051 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,6 +23,7 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
+from datetime import datetime, timedelta
 
 class event_type(osv.osv):
     """ Event Type """
@@ -336,8 +337,9 @@ class event_registration(osv.osv):
         # Fields for address, due to separation from event.registration and res.partner
         'email': fields.char('Email', size=240),
         'phone': fields.char('Phone', size=64),
-        'name': fields.char('Name', size=128, required=True, select=True),
+        'name': fields.char('Name', size=128, select=True),
         'active': fields.boolean('Active'),
+        'duration': fields.float('Duration'),
     }
 
     _defaults = {
@@ -347,7 +349,6 @@ class event_registration(osv.osv):
     }
     _order = 'name, create_date desc'
 
-
     def do_draft(self, cr, uid, ids, context=None):
         self.do_draft_send_note(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
@@ -432,17 +433,23 @@ class event_registration(osv.osv):
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
         """
+        value= {}
         if context is None:
             context = {}
         if not event_id:
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        return {'value': 
-                    {'event_begin_date': data_event.date_begin,
+        start = datetime.strptime(data_event.date_begin, "%Y-%m-%d %H:%M:%S")
+        end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
+        diff = end - start
+        duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
+        value['duration'] = round(duration, 2)
+        return {'value': {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                    }
+                     'duration': value['duration'],
+               }
                }
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d6da35a3e2f..0b424b9794b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -386,18 +386,10 @@
                    <label for="event_id" class="oe_edit_only"/>
                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
-                            <label string="(" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
-                            <field nolabel="1" name="event_begin_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <label string="-" attrs="{'invisible': ['|',('event_begin_date', '=', ''), ('event_id', '=', '')]}" class="oe_inline"/>
-                            <field nolabel="1" name="event_end_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline" />
-                            <label string=")" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+                            <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
 	                </h1>   
-		                   
-                    <group colspan="2" col="2">
-                        <h2>
-                            <field name="nb_register" class="oe_inline"/>  Participants
-                        </h2>
-                    </group>
                     <group colspan="4" col="4">
                         <group colspan="2">
                             <field name="name" invisible="1"/>

From 4d14b9378a1d96e4f4bbdf84cea85e13f54b7054 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 12:27:12 +0530
Subject: [PATCH 27/66] [IMP]event: add duration field

bzr revid: kjo@tinyerp.com-20120705065712-ivluxs98wd1kjyza
---
 addons/event/__openerp__.py |  2 +-
 addons/event/event.py       |  8 ++-
 addons/event/event_demo.xml | 98 -------------------------------------
 addons/event/event_demo.yml | 73 +++++++++++++++++++++++++++
 addons/event/event_view.xml |  2 +-
 5 files changed, 78 insertions(+), 105 deletions(-)
 delete mode 100644 addons/event/event_demo.xml
 create mode 100644 addons/event/event_demo.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index f1a9769f803..120f9651745 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -51,7 +51,7 @@ Note that:
         'res_partner_view.xml',
         'email_template.xml',
     ],
-    'demo_xml': ['event_demo.xml'],
+    'demo_xml': ['event_demo.yml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 09495560051..72c28b3315f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -424,7 +424,6 @@ class event_registration(osv.osv):
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
         data = {
             'email':contact_id.email,
-            'contact_id':contact_id.id,
             'name':contact_id.name,
             'phone':contact_id.phone,
             }
@@ -444,13 +443,12 @@ class event_registration(osv.osv):
         end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
         diff = end - start
         duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
-        value['duration'] = round(duration, 2)
-        return {'value': {'event_begin_date': data_event.date_begin,
+        value ['value']= {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                     'duration': value['duration'],
-               }
+                     'duration': round(duration, 2),
                }
+        return value
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
deleted file mode 100644
index 81dad07b5e4..00000000000
--- a/addons/event/event_demo.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <record id="base.user_demo" model="res.users">
-             <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
-     </record>
-
-
-<!-- Demo Data for Event Type -->
-    <record id="event_type_0" model="event.type">
-        <field name="name">Seminar</field>
-    </record>
-
-    <record id="event_type_1" model="event.type">
-        <field name="name">Exhibition</field>
-    </record>
-
-    <record id="event_type_2" model="event.type">
-        <field name="name">Conference</field>
-    </record>
-
-    <record id="event_type_3" model="event.type">
-        <field name="name">Show</field>
-    </record>
-
-    <record id="event_type_4" model="event.type">
-        <field name="name">Training</field>
-    </record>
-
-<!-- Demo data for Event -->
-    <record id="event_0" model="event.event">
-        <field name="name">Concert of Bon Jovi</field>
-        <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="register_max">500</field>
-        <field name="type" ref="event_type_1"/>
-    </record>
-
-    <record id="event_1" model="event.event">
-        <field name="name">Opera of Verdi</field>
-        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
-        <field name="type" ref="event_type_1"/>
-        <field name="register_min">50</field>
-        <field name="register_max">350</field>
-    </record>
-    <record id="event_2" model="event.event">
-        <field name="name">Conference on ERP Business</field>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="type" ref="event_type_2"/>
-        <field name="register_max">200</field>
-    </record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-
-<!-- Demo data for Event Registration-->
-    <record id="reg_1_1" model="event.registration">
-        <field name="name">Agrolait</field>
-        <field name="email">s.l@agrolait.be</field>
-        <field name="phone">003281588558</field>
-        <field name="event_id" ref="event_1"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    <record id="reg_1_2" model="event.registration">
-        <field name="name">ASUStek</field>
-        <field name="email">info@asustek.com</field>
-        <field name="phone">+ 1 64 61 04 01</field>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field name="event_id" ref="event_1"/>
-        <field name="nb_register">10</field>
-    </record>
-
-
-    <record id="reg_0_1" model="event.registration">
-        <field name="name">Syleam</field>
-        <field name="email">contact@syleam.fr</field>
-        <field name="phone">+33 (0) 2 33 31 22 10</field>
-        <field name="partner_id" ref="base.res_partner_sednacom"/>
-        <field name="event_id" ref="event_0"/>
-        <field name="nb_register">6</field>
-    </record>
-
-
-
-    <record id="reg_0_2" model="event.registration">
-        <field name="name">Camptocamp</field>
-        <field name="email">openerp@camptocamp.com</field>
-        <field name="phone">+41 21 619 10 04 </field>
-        <field name="event_id" ref="event_2"/>
-        <field name="partner_id" ref="base.res_partner_c2c"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
new file mode 100644
index 00000000000..f4e5cf04495
--- /dev/null
+++ b/addons/event/event_demo.yml
@@ -0,0 +1,73 @@
+-
+  from datetime import datetime, timedelta
+-
+  !record {model: event.type, id: event_type_0}:
+    name: 'Seminar'
+-
+  !record {model: event.type, id: event_type_1}:
+    name: 'Exhibition'
+-
+  !record {model: event.type, id: event_type_2}:
+    name: 'Conference'
+-
+  !record {model: event.type, id: event_type_3}:
+    name: 'Show'
+-
+  !record {model: event.type, id: event_type_4}:
+    name: 'Training'
+-
+  !record {model: event.event, id: event_0}:
+    name: 'Concert of Bon Jovi'
+    date_begin: !eval time.strftime('%Y-%m-01 19:05:15')
+    date_end: !eval time.strftime('%Y-%m-01 23:05:15')
+    register_max: 500
+    type: event_type_1
+-
+  !record {model: event.event, id: event_1}:
+    name: 'Opera of Verdi'
+    date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_1
+-
+  !record {model: event.event, id: event_2}:
+    name: 'Conference on ERP Business'
+    date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_2
+-
+  !record {model: event.registration, id: reg_1_1}:
+    name: 'Agrolait'
+    email: 's.l@agrolait.be'
+    phone: '003281588558'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 5
+-
+  !record {model: event.registration, id: reg_1_2}:
+    name: 'ASUStek'
+    email: 'info@asustek.com'
+    phone: '+ 1 64 61 04 01'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 10
+-
+  !record {model: event.registration, id: reg_0_1}:
+    name: 'Syleam'
+    email: 'contact@syleam.fr'
+    phone: '+33 (0) 2 33 31 22 10'
+    event_id: event_0
+    partner_id: base.res_partner_sednacom
+    nb_register: 6
+-
+  !record {model: event.registration, id: reg_0_2}:
+    name: 'Camptocamp'
+    email: 'openerp@camptocamp.com'
+    phone: '+41 21 619 10 04'
+    event_id: event_2
+    partner_id: base.res_partner_c2c
+    nb_register: 5
+ 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0b424b9794b..f3564048b55 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -387,7 +387,7 @@
                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
 	                </h1>   
                     <group colspan="4" col="4">

From 870aa740d343445f79956016b1fde2cef2912651 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 5 Jul 2012 12:32:51 +0530
Subject: [PATCH 28/66] [IMP]:survey:removed tabs

bzr revid: apa@tinyerp.com-20120705070251-28oba6mos9a4f6wv
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b55e073cf4d..dedb044eee9 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -331,7 +331,7 @@
                                </div><br/>
                                <div class="oe_survey_rate">
                                    Rate:
-    							<div class="oe_survey_fill" >
+                                <div class="oe_survey_fill" >
                                    <button type="object" name="fill_survey" class="">
                                        <span>Fill</span>
                                    </button>

From c5d9158a292c6439d4192cbd2601b15ae9ee51b5 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 14:38:30 +0530
Subject: [PATCH 29/66] [IMP]event: remove conflict

bzr revid: kjo@tinyerp.com-20120705090830-trou4tqk01ylqqqh
---
 addons/event/event_view.xml | 51 ++++---------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 34b3b6b71ad..1019706f8db 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -462,9 +462,8 @@
                     <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet string="Registration">
-<<<<<<< TREE
-                   <label for="event_id" class="oe_edit_only"/>
-                   <h1>
+                    <label for="event_id" class="oe_edit_only"/>
+                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
@@ -478,36 +477,8 @@
                             <group col="2">
                                 <field name="email" nolabel="1" class="oe_inline"/>
                                 <button string="Send New Email"
-=======
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="name"/>
-                                <field name="email"/>
-                                <field name="phone"/>
-                            </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
-                            </group>
-                        </page>
-                        <page string="Emails">
-                            <button string="Send New Email"
->>>>>>> MERGE-SOURCE
                                 name="%(mail.action_email_compose_message_wizard)d"
-<<<<<<< TREE
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+                                context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                             </group>
                         </group>
                         <group colspan="2">
@@ -525,26 +496,14 @@
                     <group colspan="2" col="2">
                         <field name="phone"/>
                     </group>
-                   <group colspan="2" col="2" groups="base.group_no_one">
+                    <group colspan="2" col="2" groups="base.group_no_one">
                         <field name="create_date"/>
                         <field name="date_closed"/>
                     </group>
                 </sheet>
                 <footer>
-                    <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
-=======
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                           </page>
-
-                    </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
->>>>>>> MERGE-SOURCE
                 </form>
             </field>
         </record>

From 0c4816aa7e1d88909031b36a17dc41d3710bd3ab Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:03:11 +0530
Subject: [PATCH 30/66] [IMP]event: set indentation

bzr revid: kjo@tinyerp.com-20120705093311-pxcn4do73mtcd2mg
---
 addons/event/event_view.xml | 270 ++++++++++++++++++------------------
 1 file changed, 132 insertions(+), 138 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1019706f8db..a982af9d6af 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -96,108 +96,109 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Events" version="7.0">
-                <header>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                </header>
-                <sheet>
-                	<div class="oe_right oe_button_box">
-	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
-	                </div>
-                
-                <div class="oe_title" style="width: 650px" >
-	            	<label for="name" class="oe_edit_only"/>
-		            <group colspan="6" col="6">
-		            	<group colspan="2"><h1><field name="name"/></h1></group>
-	                    <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-		            </group>  
-		        </div> 
-                <div>
-                	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/></h2>
-                    <group>
-                        <group>
-                            <label for="address_id" string="Location Address"/>
-                            <div>
-                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                            	<field name="street" placeholder="Street..."/>                            
-                            	<div>
-                            	     <field name="zip" class="oe_inline" placeholder="Zip"/>
-                                     <field name="city" class="oe_inline" placeholder="City"/>
-                                </div>
-                            </div>
-                        </group>
-                        <group>
-	                      	<field name="register_min"/>
-	                       	<field name="register_max"/>
-	                   	</group>
-                     </group>
-                </div>
-                <!-- <div class="oe_right" style="height: 200px"></div> -->
-                <notebook>
-                    <page string="Event Description">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Internal Data">
-                      <group>
-                          <group class="oe_group_label_border">
-                            <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                            <field name="speaker_confirmed"/>
-                          </group>
-                          <group class="oe_group_label_border">
-                            <field name="register_current"/>
-                            <field name="register_prospect"/>
-                          </group> 
-                      </group>
-                      <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
+                <form string="Events" version="7.0">
+                    <header>
+                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
+                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
+                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </header>
+                    <sheet>
+                    	<div class="oe_right oe_button_box">
+	                        <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+	                    </div>
+                    
+                        <div class="oe_title" style="width: 650px" >
+	                    	<label for="name" class="oe_edit_only"/>
+		                    <group colspan="6" col="6">
+		                    	<group colspan="2"><h1><field name="name"/></h1></group>
+	                            <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+		                    </group>  
+		                </div> 
+                        <div>
+                        	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                        	</h2>
+                            <group>
+                                <group>
+                                    <label for="address_id" string="Location Address"/>
+                                    <div>
+                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                    	<field name="street" placeholder="Street..."/>                            
+                                    	<div>
+                                    	     <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                             <field name="city" class="oe_inline" placeholder="City"/>
+                                        </div>
+                                    </div>
                                 </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                            <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
-                                <field name="register_current"/>
-                                <field name="register_prospect"/>
-                                <field name="register_attended" class="oe_subtotal_footer_separator" />
+                                <group>
+	                              	<field name="register_min"/>
+	                               	<field name="register_max"/>
+	                           	</group>
                             </group>
-                        <separator string="" class="oe_clear"/>
-                    </page>
-                    </notebook>
+                        </div>
+                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                        <notebook>
+                            <page string="Event Description">
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                            <page string="Internal Data">
+                              <group>
+                                  <group class="oe_group_label_border">
+                                    <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                    <field name="speaker_confirmed"/>
+                                  </group>
+                                  <group class="oe_group_label_border">
+                                    <field name="register_current"/>
+                                    <field name="register_prospect"/>
+                                  </group> 
+                              </group>
+                              <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                    <tree string="Registration" editable="top">
+                                        <field name="name" />
+                                        <field name="email" />
+                                        <field name="phone"/>
+                                        <field name="nb_register" />
+                                        <field name="state"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </tree>
+                                    <form string="Registration">
+                                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                        <field name="name"/>
+                                        <group colspan="4" col="4">
+                                        <field name="email"/>
+                                        <field name="phone"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                            <field name="nb_register"/>
+                                        </group>
+                                        <group colspan="4" col="4">
+                                        </group>
+                                            <group col="8" colspan="4">
+                                                <separator string="" colspan="4"/>
+                                                <newline/>
+                                                <field name="state" colspan="2"/>
+                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                    </form>
+                                    </field>
+                                    <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
+                                        <field name="register_current"/>
+                                        <field name="register_prospect"/>
+                                        <field name="register_attended" class="oe_subtotal_footer_separator" />
+                                    </group>
+                                <separator string="" class="oe_clear"/>
+                            </page>
+                        </notebook>
                     </sheet>
                     <footer>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </footer>
-            </form>
+                </form>
             </field>
         </record>
 
@@ -454,56 +455,49 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                <header>
-                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                    <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet string="Registration">
-                    <label for="event_id" class="oe_edit_only"/>
-                    <h1>
+                    <header>
+                        <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
+                        <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
+                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+                        <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    </header>
+                    <sheet string="Registration">
+                        <label for="event_id" class="oe_edit_only"/>
+                        <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-	                </h1>   
-                    <group colspan="4" col="4">
-                        <group colspan="2">
-                            <field name="name" invisible="1"/>
-                            <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                            <label for="email" string="E-Mail"/>
-                            <group col="2">
-                                <field name="email" nolabel="1" class="oe_inline"/>
-                                <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+	                    </h1>   
+                        <group colspan="4" col="4">
+                            <group colspan="2">
+                                <field name="name" invisible="1"/>
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
+                                <label for="email" string="E-Mail"/>
+                                <group col="2">
+                                    <field name="email" nolabel="1" class="oe_inline"/>
+                                    <button string="Send New Email"
+                                    name="%(mail.action_email_compose_message_wizard)d"
+                                    context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+                                </group>
+                            </group>
+                            <group colspan="2">
+                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                                <field name="nb_register"/>
                             </group>
                         </group>
-                        <group colspan="2">
-                            <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                            <field name="nb_register"/>
+                        <group colspan="2" col="2">
+                            <field name="phone"/>
                         </group>
-                    </group>
-                    <group colspan="4" col="4">
-                        <group colspan="2">
-                            
+                        <group colspan="2" col="2" groups="base.group_no_one">
+                            <field name="create_date"/>
+                            <field name="date_closed"/>
                         </group>
-                        <group colspan="2">
-                        </group>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="phone"/>
-                    </group>
-                    <group colspan="2" col="2" groups="base.group_no_one">
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                    </group>
-                </sheet>
-                <footer>
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </footer>
                 </form>
             </field>
         </record>

From 9102ef13d89629520df449d8803a1d1db0ef90a1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:28:26 +0530
Subject: [PATCH 31/66] [IMP]remove tab

bzr revid: kjo@tinyerp.com-20120705095826-1pzoelsdmmhbm50h
---
 addons/event/event_view.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a982af9d6af..276842c4d4a 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -105,36 +105,36 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
-                    	<div class="oe_right oe_button_box">
-	                        <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
-	                    </div>
+                        <div class="oe_right oe_button_box">
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                        </div>
                     
                         <div class="oe_title" style="width: 650px" >
-	                    	<label for="name" class="oe_edit_only"/>
-		                    <group colspan="6" col="6">
-		                    	<group colspan="2"><h1><field name="name"/></h1></group>
-	                            <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-		                    </group>  
-		                </div> 
+                            <label for="name" class="oe_edit_only"/>
+                            <group colspan="6" col="6">
+                                <group colspan="2"><h1><field name="name"/></h1></group>
+                                <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+                            </group>  
+                        </div> 
                         <div>
-                        	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
-                        	</h2>
+                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                            </h2>
                             <group>
                                 <group>
                                     <label for="address_id" string="Location Address"/>
                                     <div>
                                         <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                                    	<field name="street" placeholder="Street..."/>                            
-                                    	<div>
-                                    	     <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                        <field name="street" placeholder="Street..."/>                            
+                                        <div>
+                                             <field name="zip" class="oe_inline" placeholder="Zip"/>
                                              <field name="city" class="oe_inline" placeholder="City"/>
                                         </div>
                                     </div>
                                 </group>
                                 <group>
-	                              	<field name="register_min"/>
-	                               	<field name="register_max"/>
-	                           	</group>
+                                      <field name="register_min"/>
+                                       <field name="register_max"/>
+                                   </group>
                             </group>
                         </div>
                         <!-- <div class="oe_right" style="height: 200px"></div> -->
@@ -469,7 +469,7 @@
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-	                    </h1>   
+                        </h1>   
                         <group colspan="4" col="4">
                             <group colspan="2">
                                 <field name="name" invisible="1"/>

From a11440cd40b22d64f0c0eacd69abf8cf043ec587 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Thu, 5 Jul 2012 18:13:05 +0530
Subject: [PATCH 32/66] [IMP]survey-kanban-view

bzr revid: pna@tinyerp.com-20120705124305-am3bqq8v0yrqrc12
---
 addons/survey/static/src/css/survey.css | 27 ++-----------
 addons/survey/survey.py                 |  1 +
 addons/survey/survey_view.xml           | 53 ++++++++++++++-----------
 3 files changed, 34 insertions(+), 47 deletions(-)

diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 0102dc1ade6..6964e4c2f3e 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,20 +1,3 @@
-.oe_module_survey{
-    font-size: 12px;
-    border-style:dotted;
-    border-radius: 15px;
-    text-align: left;
-    height:145px;
-    width:220px;
-}
-
-.oe_survey_title{
-    font-size: 15px;
-    height: auto;
-    font-size: 16px;
-    font-weight:bold;
-    width: 205px;
-}
-
 .oe_survey_responsible{
     height: auto;
     width: 200px;
@@ -26,12 +9,10 @@
     width: 200px;
     font-size: 14px;
 }
-
-.oe_survey_fill{
-	align:right;
-	padding: 1px 165px;
-}
-
 .oe_survey_rate{
     font-size: 14px;
 }
+.oe_kanban_survey {
+    width: 300px;
+}
+
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 40f13b226f8..1c1c8b6df91 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -68,6 +68,7 @@ class survey(osv.osv):
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
         'send_response': fields.boolean('Email Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
+        'color': fields.integer('Color Index'),
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
     _defaults = {
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index dedb044eee9..bdba67738d0 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -313,32 +313,37 @@
                 <kanban>
                     <field name="title"/>
                     <field name="date_open"/>
+                    <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                          <div class="oe_module_survey">
-                            <a class="oe_module_icon">
-                               <div class="oe_survey_title"><t t-esc="record.title.raw_value.toString()"/></div><br/>
-                               <div class="oe_survey_responsible">
-                                   <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
-                               </div><br/>
-                               <div class="oe_survey_start_date">
-                                  Open From:
-                                   <t t-if="record.date_open.raw_value">
-                                       <t t-esc="record.date_open.raw_value.getDate()"/>
-                                       <t t-esc="record.date_open.raw_value.toString('MMM')"/>, 
-                                       <t t-esc="record.date_open.raw_value.getFullYear()"/>
-                                   </t>
-                               </div><br/>
-                               <div class="oe_survey_rate">
-                                   Rate:
-                                <div class="oe_survey_fill" >
-                                   <button type="object" name="fill_survey" class="">
-                                       <span>Fill</span>
-                                   </button>
-                               </div>                                   
-                               </div>
-                            </a>
-                          </div>  
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey oe_kanban_auto_height">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><a type="edit">Edit...</a></li>
+                                        <li><a type="delete">Delete</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h3 class="oe_kanban_ellipsis"><field name="title"/></h3>
+                                    <div class="oe_survey_responsible">
+                                       <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
+                                   </div><br/>
+                                   <div class="oe_survey_start_date">
+                                      Open From:
+                                       <t t-if="record.date_open.raw_value">
+                                           <t t-esc="record.date_open.raw_value.getDate()"/>
+                                           <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
+                                           <t t-esc="record.date_open.raw_value.getFullYear()"/>
+                                       </t>
+                                   </div><br/>
+                                   <div class="oe_survey_rate">
+                                       Rate:
+                                        <a name="fill_survey" type="object">Fill</a>
+                                   </div>
+                                </div>
+                            </div>
                         </t>
                     </templates>
                 </kanban>

From a47b42cd69dec5ef4fde79ba94cb21f86691f870 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 5 Jul 2012 18:32:58 +0530
Subject: [PATCH 33/66] [IMP] remove extra class

bzr revid: dbr@tinyerp.com-20120705130258-0fmma20qwhv2vssg
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index c1e0355073c..a8a8c59f24b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -316,7 +316,7 @@
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey oe_kanban_auto_height">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">

From 58549bc503cd715589c4da32e9c4dbde4e419b6a Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 5 Jul 2012 18:46:54 +0530
Subject: [PATCH 34/66] [IMP]String imp

bzr revid: dbr@tinyerp.com-20120705131654-fy1c092kne3bwftj
---
 addons/survey/survey_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index a8a8c59f24b..8aeec213648 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -331,8 +331,8 @@
                                        <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
                                    </div><br/>
                                    <div class="oe_survey_start_date">
-                                      Open From:
                                        <t t-if="record.date_open.raw_value">
+                                           Opened at
                                            <t t-esc="record.date_open.raw_value.getDate()"/>
                                            <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
                                            <t t-esc="record.date_open.raw_value.getFullYear()"/>

From 55aace115f8781a7ba26001e393ef9e6006eb77e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 10:53:21 +0530
Subject: [PATCH 35/66] [IMP]event: remove name_get method

bzr revid: kjo@tinyerp.com-20120706052321-fcxb95cckpfwsyvo
---
 addons/event/event.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 51e067e7d66..5e075d4bd30 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -51,27 +51,6 @@ class event_event(osv.osv):
     _order = 'date_begin'
     _inherit = ['ir.needaction_mixin','mail.thread']
 
-    def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-              return []
-        res = []
-        for record in self.browse(cr, uid, ids, context=context):
-            date = record.date_begin.split(" ")
-            date = date[0]
-            registers=''
-            if record.register_max !=0:
-                register_max = str(record.register_max)
-                register_tot = record.register_current+record.register_prospect
-                register_tot = str(register_tot)
-                registers = register_tot+'/'+register_max
-            name = record.name+' ('+date+') '+registers
-            res.append((record['id'], name))
-        return res
-
-    def _name_get_fnc(self, cr, uid, ids,prop,unknow, context=None):
-        res = self.name_get(cr, uid, ids, context=context)
-        return dict(res)
-
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -211,7 +190,6 @@ class event_event(osv.osv):
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
-        'full_name' : fields.function(_name_get_fnc, type="char", string='Name'),
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),

From f9cfe908cfebceed95c6cbf10b4d0290aa9a8b70 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:20:05 +0530
Subject: [PATCH 36/66] [IMP]event: remove oe_subtotal_footer oe_right class

bzr revid: kjo@tinyerp.com-20120706065005-agkoyvnja05apcvq
---
 addons/event/event_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 276842c4d4a..6fc0a149cf3 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -151,6 +151,7 @@
                                   <group class="oe_group_label_border">
                                     <field name="register_current"/>
                                     <field name="register_prospect"/>
+                                    <field name="register_attended"/>
                                   </group> 
                               </group>
                               <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
@@ -186,11 +187,6 @@
                                             </group>
                                     </form>
                                     </field>
-                                    <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
-                                        <field name="register_current"/>
-                                        <field name="register_prospect"/>
-                                        <field name="register_attended" class="oe_subtotal_footer_separator" />
-                                    </group>
                                 <separator string="" class="oe_clear"/>
                             </page>
                         </notebook>

From 6f70dc88c6f5ce3e7472087f61435fa475f727fc Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 17:43:44 +0530
Subject: [PATCH 37/66] [IMP]event: change registration view

bzr revid: kjo@tinyerp.com-20120706121344-330s2e44t11epg5o
---
 addons/event/event.py       | 6 ------
 addons/event/event_view.xml | 7 +++----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5e075d4bd30..376fc122120 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -310,7 +310,6 @@ class event_registration(osv.osv):
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
         'active': fields.boolean('Active'),
-        'duration': fields.float('Duration'),
     }
 
     _defaults = {
@@ -410,14 +409,9 @@ class event_registration(osv.osv):
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        start = datetime.strptime(data_event.date_begin, "%Y-%m-%d %H:%M:%S")
-        end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
-        diff = end - start
-        duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
         value ['value']= {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                     'duration': round(duration, 2),
                }
         return value
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6fc0a149cf3..6dbad5fcd88 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -463,7 +463,9 @@
                         <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="event_begin_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <label string="-" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="event_end_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                         </h1>   
                         <group colspan="4" col="4">
@@ -473,9 +475,6 @@
                                 <label for="email" string="E-Mail"/>
                                 <group col="2">
                                     <field name="email" nolabel="1" class="oe_inline"/>
-                                    <button string="Send New Email"
-                                    name="%(mail.action_email_compose_message_wizard)d"
-                                    context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                                 </group>
                             </group>
                             <group colspan="2">

From ee0ff9ce960d85e5dc9d76ef5c36413533f84f79 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 9 Jul 2012 11:09:33 +0530
Subject: [PATCH 38/66] [IMP]idea: Improve m2m field syntax

bzr revid: dbr@tinyerp.com-20120709053933-3mqv2hvwsl8fyy7g
---
 addons/idea/idea.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index cc2c11bdd8a..396040c8828 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
-        'category_ids': fields.many2many('idea.category', 'Tags', readonly=True, states={'draft':[('readonly',False)]}),
+        'category_ids': fields.many2many('idea.category', 'idea_category_ids','idea_category_name_id','name','Tags',readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'New'),
             ('open', 'Accepted'),
             ('cancel', 'Refused'),

From 19614e357739cb4344ec863abe6f2eb115e9f777 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 9 Jul 2012 12:30:40 +0530
Subject: [PATCH 39/66] [IMP]idea: set string

bzr revid: dbr@tinyerp.com-20120709070040-r23926rx311uod68
---
 addons/idea/idea.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 396040c8828..3be4dd2e28d 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -49,7 +49,7 @@ class idea_idea(osv.osv):
         'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
         'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft':[('readonly',False)]}),
         'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft':[('readonly',False)]}),
-        'category_ids': fields.many2many('idea.category', 'idea_category_ids','idea_category_name_id','name','Tags',readonly=True, states={'draft':[('readonly',False)]}),
+        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft', 'New'),
             ('open', 'Accepted'),
             ('cancel', 'Refused'),

From bfbaeece0111828a97ba41fedc7eb97eb0bd2fac Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 13:22:45 +0200
Subject: [PATCH 40/66] Fixed kanban header flickering and padding

bzr revid: mit@openerp.com-20120709112245-9p9piq9ewxlfgb2f
---
 addons/web_kanban/static/src/css/kanban.css  | 3 ++-
 addons/web_kanban/static/src/css/kanban.sass | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 5d0ac9ea8f3..39f22d8e542 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -49,6 +49,7 @@
 .openerp .oe_kanban_view .oe_kanban_group_title {
   font-size: 16px;
   font-weight: bold;
+  min-height: 30px;
   color: #333333;
   text-shadow: 0 1px 0 white;
 }
@@ -58,7 +59,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
-  padding: 6px 7px 0 6px;
+  padding: 4px;
 }
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 872d694c4db..4823a5928e4 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -63,6 +63,7 @@
     .oe_kanban_group_title
         font-size: 16px
         font-weight: bold
+        min-height: 30px
         color: #333333
         text-shadow: 0 1px 0 white
         > span
@@ -71,7 +72,7 @@
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
-        padding: 6px 7px 0 6px
+        padding: 4px 
 
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         background: #f0eeee

From fa3301735e9bf6b35a0c4a62e149e8a6781858c3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 9 Jul 2012 16:58:32 +0200
Subject: [PATCH 41/66] [IMP] event: usability, code review of form views

bzr revid: qdp-launchpad@openerp.com-20120709145832-idr4x5f8v4dtq3ol
---
 addons/event/event.py                         | 37 +++++----
 addons/event/event_demo.yml                   |  6 +-
 addons/event/event_view.xml                   | 82 +++++++++----------
 .../event/report/report_event_registration.py |  4 +-
 addons/event_moodle/event_view.xml            | 15 ++--
 addons/event_sale/event_sale.py               |  1 -
 6 files changed, 74 insertions(+), 71 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 376fc122120..6a8cf9f8a0b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,7 +23,6 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
-from datetime import datetime, timedelta
 
 class event_type(osv.osv):
     """ Event Type """
@@ -51,6 +50,19 @@ class event_event(osv.osv):
     _order = 'date_begin'
     _inherit = ['ir.needaction_mixin','mail.thread']
 
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+              return []
+        res = []
+        for record in self.browse(cr, uid, ids, context=context):
+            date = record.date_begin.split(" ")[0]
+            date_end = record.date_end.split(" ")[0]
+            if date != date_end:
+                date += ' - ' + date_end
+            display_name = record.name + ' (' + date + ')'
+            res.append((record['id'], display_name))
+        return res
+
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -172,8 +184,8 @@ class event_event(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registration', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
-        'register_min': fields.integer('Minimum Registration', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
+        'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
@@ -305,17 +317,14 @@ class event_registration(osv.osv):
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
-        # Fields for address, due to separation from event.registration and res.partner
-        'email': fields.char('Email', size=240),
+        'email': fields.char('Email', size=64),
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
-        'active': fields.boolean('Active'),
     }
 
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        'active': True,
     }
     _order = 'name, create_date desc'
 
@@ -387,33 +396,31 @@ class event_registration(osv.osv):
         return True
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner, context=None):
-        data ={}
         if not contact:
-            return data
+            return {}
         addr_obj = self.pool.get('res.partner')
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
-        data = {
+        return {'value': {
             'email':contact_id.email,
             'name':contact_id.name,
             'phone':contact_id.phone,
-            }
-        return {'value': data}
+            }}
 
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
         """
-        value= {}
         if context is None:
             context = {}
         if not event_id:
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        value ['value']= {'event_begin_date': data_event.date_begin,
+        return {'value': 
+                    {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
+                    }
                }
-        return value
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
index f4e5cf04495..5fe1fb4ef12 100644
--- a/addons/event/event_demo.yml
+++ b/addons/event/event_demo.yml
@@ -26,15 +26,15 @@
   !record {model: event.event, id: event_1}:
     name: 'Opera of Verdi'
     date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
-    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 21:00:00')
     register_min: 50
     register_max: 350
     type: event_type_1
 -
   !record {model: event.event, id: event_2}:
     name: 'Conference on ERP Business'
-    date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
-    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
+    date_begin: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 16:30:00')
     register_min: 50
     register_max: 350
     type: event_type_2
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6dbad5fcd88..1526437ddd5 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -108,13 +108,9 @@
                         <div class="oe_right oe_button_box">
                             <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
                         </div>
-                    
-                        <div class="oe_title" style="width: 650px" >
+                        <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
-                            <group colspan="6" col="6">
-                                <group colspan="2"><h1><field name="name"/></h1></group>
-                                <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-                            </group>  
+                            <h1><field name="name"/></h1>
                         </div> 
                         <div>
                             <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
@@ -124,7 +120,7 @@
                                     <label for="address_id" string="Location Address"/>
                                     <div>
                                         <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                                        <field name="street" placeholder="Street..."/>                            
+                                        <field name="street" placeholder="Street..."/>
                                         <div>
                                              <field name="zip" class="oe_inline" placeholder="Zip"/>
                                              <field name="city" class="oe_inline" placeholder="City"/>
@@ -132,8 +128,13 @@
                                     </div>
                                 </group>
                                 <group>
-                                      <field name="register_min"/>
+                                       <field name="type" on_change="onchange_event_type(type,context)"/>
+                                       <field name="register_min"/>
                                        <field name="register_max"/>
+                                       <label for="register_current" string="Current Registrations"/>
+                                       <div>
+                                           Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
+                                       </div>
                                    </group>
                             </group>
                         </div>
@@ -143,18 +144,16 @@
                                 <field name="note" colspan="4" nolabel="1"/>
                             </page>
                             <page string="Internal Data">
-                              <group>
-                                  <group class="oe_group_label_border">
-                                    <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                                    <field name="speaker_confirmed"/>
-                                  </group>
-                                  <group class="oe_group_label_border">
-                                    <field name="register_current"/>
-                                    <field name="register_prospect"/>
-                                    <field name="register_attended"/>
-                                  </group> 
-                              </group>
-                              <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                <group>
+                                    <group>
+                                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                        <field name="speaker_confirmed"/>
+                                    </group>
+                                    <group>
+                                        <field name="register_attended"/>
+                                    </group> 
+                                </group>
+                                <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">
                                         <field name="name" />
                                         <field name="email" />
@@ -186,8 +185,7 @@
                                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                             </group>
                                     </form>
-                                    </field>
-                                <separator string="" class="oe_clear"/>
+                                </field>
                             </page>
                         </notebook>
                     </sheet>
@@ -461,33 +459,29 @@
                     <sheet string="Registration">
                         <label for="event_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
-                            <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="event_begin_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
-                            <label string="-" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="event_end_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
-                            <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                        </h1>   
-                        <group colspan="4" col="4">
-                            <group colspan="2">
-                                <field name="name" invisible="1"/>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                        </h1>
+                        <group>
+                            <group>
                                 <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                                <label for="email" string="E-Mail"/>
-                                <group col="2">
-                                    <field name="email" nolabel="1" class="oe_inline"/>
-                                </group>
+                                <field name="name"/>
+                                <field name="phone"/>
+                                <label for="email"/>
+                                <div>
+                                    <field name="email" class="oe_inline"/>
+                                    <button class="oe_inline oe_right" string="Send Email"
+                                      name="%(mail.action_email_compose_message_wizard)d"
+                                      icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                </div>
                             </group>
-                            <group colspan="2">
+                            <group>
                                 <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                                 <field name="nb_register"/>
                             </group>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="phone"/>
-                        </group>
-                        <group colspan="2" col="2" groups="base.group_no_one">
-                            <field name="create_date"/>
-                            <field name="date_closed"/>
+                            <group groups="base.group_no_one">
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                            </group>
                         </group>
                     </sheet>
                     <footer>
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 8697f46d867..17472e0cc95 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -77,12 +77,10 @@ class report_event_registration(osv.osv):
                 r.state AS  registration_state
                 FROM
                 event_event e
-                
+
                 LEFT JOIN
                     event_registration r ON (e.id=r.event_id)
 
-                WHERE r.active = 'true'
-               
                GROUP BY
                 event_id,
                 user_id_registration,
diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index 4fa0172c5f5..4324990a1d8 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,7 +7,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="moodle_user_password" readonly='1'/>
+                    <field name="moodle_uid" readonly="1"/>
+                </xpath>
                 <field name="email" position="replace">
+                     <!-- set the email as required -->
                      <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
@@ -23,12 +28,12 @@
             <field name="inherit_id" ref="event.view_event_form" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='registration_ids']/tree/field[@name='name']" position="replace">
-                     <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
-                     <field name="name" required="1" />
+                   <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
+                   <field name="name" required="1" />
                 </xpath>
-                      <field name="email" position="replace">
-                          <field name="email" required="1" />
-                      </field>
+                <field name="email" position="replace">
+                    <field name="email" required="1" />
+                </field>
            </field>
         </record>
     </data>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 426c410dd99..9e65a034544 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -90,4 +90,3 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-    

From d6100f371f185189ae452d6cb785a1f1a989415b Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 17:02:57 +0200
Subject: [PATCH 42/66] Changed popup overlay and added style for label in
 kanban vignette

bzr revid: mit@openerp.com-20120709150257-t50t470tyxmomrt4
---
 addons/web/static/src/css/base.css           |  6 ++++++
 addons/web/static/src/css/base.sass          |  3 +++
 addons/web_kanban/static/src/css/kanban.css  | 14 ++++++++++++--
 addons/web_kanban/static/src/css/kanban.sass | 15 +++++++++++----
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7bc210298db..a9c9508c4e5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2348,3 +2348,9 @@
 .kitten-mode-activated > * {
   opacity: 0.7;
 }
+
+div.ui-widget-overlay {
+  background: black;
+  filter: alpha(opacity=30);
+  opacity: 0.3;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index d5d271fe07d..ba858ca8877 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1850,5 +1850,8 @@ $colour4: #8a89ba
         opacity: 0.70
 // }}}
 
+div.ui-widget-overlay
+    background: black
+    @include opacity(0.3)
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 39f22d8e542..1128d2cdaff 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -29,7 +29,7 @@
   color: gold;
 }
 .openerp .oe_kanban_view .oe_kanban_content div:first-child {
-  margin-right: 12px;
+  margin-right: 16px;
 }
 .openerp .oe_kanban_view .oe_kanban_button_new {
   color: white;
@@ -59,7 +59,7 @@
 }
 .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header {
   vertical-align: top;
-  padding: 4px;
+  padding: 6px 6px 6px 5px;
 }
 .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header {
   background: #f0eeee;
@@ -375,6 +375,16 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left > span {
+  margin-top: 4px;
+  display: inline-block;
+  background: #e6e6e6;
+  border: 1px solid #b9b9b9;
+  padding: 1px 2px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+}
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
   height: 12px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 4823a5928e4..facdc32e326 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -44,7 +44,7 @@
         .oe_star_on
             color: gold
         div:first-child
-            margin-right: 12px
+            margin-right: 16px
     .oe_kanban_button_new
         color: white
         background: #DC5F59
@@ -72,7 +72,7 @@
 
     .oe_kanban_column, .oe_kanban_group_header
         vertical-align: top
-        padding: 4px 
+        padding: 6px 6px 6px 5px
 
     .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header
         background: #f0eeee
@@ -318,8 +318,15 @@
     .oe_kanban_avatar
         @include radius(3px)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
-    //.oe_kanban_footer_left
-    //   float: left
+    .oe_kanban_footer_left
+        > span
+            margin-top: 4px
+            display: inline-block
+            background: #E6E6E6
+            border: 1px solid #B9B9B9
+            padding: 1px 2px
+            @include radius(3px)
+       
     .oe_kanban_status
         display: inline-block
         height: 12px

From 8ba18ce67755810d87b343c95f19e90e6e4c4c9e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 9 Jul 2012 18:41:17 +0200
Subject: [PATCH 43/66] [FIX] timedelta doesn't have a 'months' parameter

bzr revid: qdp-launchpad@openerp.com-20120709164117-bqjxqxeujhcdikim
---
 addons/event/event_demo.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
index 5fe1fb4ef12..6f843fd0965 100644
--- a/addons/event/event_demo.yml
+++ b/addons/event/event_demo.yml
@@ -33,8 +33,8 @@
 -
   !record {model: event.event, id: event_2}:
     name: 'Conference on ERP Business'
-    date_begin: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 14:00:00')
-    date_end: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 16:30:00')
+    date_begin: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 16:30:00')
     register_min: 50
     register_max: 350
     type: event_type_2

From 3c67b48a2ae96df1d0474da292b5272e13fb4090 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:08:07 +0200
Subject: [PATCH 44/66] Improvements to dropdown menu, form view buttons and
 kanban vignette

bzr revid: mit@openerp.com-20120709170807-f9x3v147bqamg7wd
---
 addons/web/static/src/css/base.css           | 12 ++++++++----
 addons/web/static/src/css/base.sass          | 11 +++++++----
 addons/web_kanban/static/src/css/kanban.css  | 10 +++++++++-
 addons/web_kanban/static/src/css/kanban.sass |  7 ++++++-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a9c9508c4e5..a9e2ebaf6d0 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -386,8 +386,11 @@
   visibility: hidden;
 }
 .openerp .oe_button_box {
-  width: 200px;
-  text-align: center;
+  width: 38%;
+  text-align: right;
+}
+.openerp .oe_button_box button {
+  margin: 4px;
 }
 .openerp .oe_avatar {
   margin: 0 16px 0 0;
@@ -536,7 +539,7 @@
   cursor: pointer;
 }
 .openerp .oe_dropdown_toggle {
-  color: #888888;
+  color: #404040;
   font-weight: normal;
 }
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
@@ -545,7 +548,8 @@
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 32px;
+  top: 26px;
+  left: 0;
   z-index: 1;
   border: 1px solid #afafb6;
   background: white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ba858ca8877..8d13bf8b046 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -329,8 +329,10 @@ $colour4: #8a89ba
         clear: both
         visibility: hidden
     .oe_button_box
-        width: 200px
-        text-align: center
+        width: 38%
+        text-align: right
+        button
+            margin: 4px
     .oe_avatar
         margin: 0 16px 0 0
         img
@@ -431,14 +433,15 @@ $colour4: #8a89ba
         position: relative
         cursor: pointer
     .oe_dropdown_toggle
-        color: #888
+        color: #404040
         font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 32px
+        top: 26px
+        left: 0
         z-index: 1
         border: 1px solid #afafb6
         background: white
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 1128d2cdaff..dc44c142683 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -375,8 +375,11 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left {
+  margin-top: 2px;
+}
 .openerp .oe_kanban_view .oe_kanban_footer_left > span {
-  margin-top: 4px;
+  margin-top: 2px;
   display: inline-block;
   background: #e6e6e6;
   border: 1px solid #b9b9b9;
@@ -385,6 +388,11 @@
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
+.openerp .oe_kanban_view .oe_kanban_bottom_right {
+  float: right;
+  position: relative;
+  top: 1px;
+}
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
   height: 12px;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index facdc32e326..d2aa0615f67 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -319,13 +319,18 @@
         @include radius(3px)
         @include box-shadow(0 1px 2px rgba(0,0,0,0.2))
     .oe_kanban_footer_left
+        margin-top: 2px
         > span
-            margin-top: 4px
+            margin-top: 2px
             display: inline-block
             background: #E6E6E6
             border: 1px solid #B9B9B9
             padding: 1px 2px
             @include radius(3px)
+    .oe_kanban_bottom_right
+        float: right
+        position: relative
+        top: 1px
        
     .oe_kanban_status
         display: inline-block

From a33b11a25a7deca87959b15dd40c600591794f94 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:24:53 +0200
Subject: [PATCH 45/66] Added icons to kanban label for followers and messages

bzr revid: mit@openerp.com-20120709172453-tsvtcz007rzitvy1
---
 addons/crm/crm_lead_view.xml | 2 +-
 addons/mail/mail_thread.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 85f9a4aab5d..888764309ec 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -316,7 +316,7 @@
                                     <t t-if="record.date_action.raw_value"> : </t>
                                     <field name="title_action"/>
                                 </div>
-                                <div class="oe_right">
+                                <div class="oe_kanban_bottom_right">
                                     <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
                                     <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
                                     <!--
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 5668709af17..ef26f823422 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span>Msg: %d</span> . <span>Fol: %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> . <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 

From 6aa0da5204344f468ed7beb8330fa619c7e0e516 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:25:59 +0200
Subject: [PATCH 46/66] Added icons to kanban label for followers and messages

bzr revid: mit@openerp.com-20120709172559-lu2oemfugcl2w3vx
---
 addons/web_kanban/static/src/css/kanban.css  | 7 ++++++-
 addons/web_kanban/static/src/css/kanban.sass | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index dc44c142683..cbd122efc1d 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -383,11 +383,16 @@
   display: inline-block;
   background: #e6e6e6;
   border: 1px solid #b9b9b9;
-  padding: 1px 2px;
+  padding: 0 2px;
+  line-height: 22px;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left > span .oe_e {
+  line-height: 12px;
+  font-size: 22px;
+}
 .openerp .oe_kanban_view .oe_kanban_bottom_right {
   float: right;
   position: relative;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index d2aa0615f67..a42662e99d9 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -325,8 +325,12 @@
             display: inline-block
             background: #E6E6E6
             border: 1px solid #B9B9B9
-            padding: 1px 2px
+            padding: 0 2px
+            line-height: 22px
             @include radius(3px)
+            .oe_e
+                line-height: 12px
+                font-size: 22px
     .oe_kanban_bottom_right
         float: right
         position: relative

From 3aa9784262599721dc7c57a8ca495558581887e1 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Mon, 9 Jul 2012 19:28:19 +0200
Subject: [PATCH 47/66] alignement of avatar in kanban vignette

bzr revid: mit@openerp.com-20120709172819-1cvabrscs3a23n2d
---
 addons/web_kanban/static/src/css/kanban.css  | 2 +-
 addons/web_kanban/static/src/css/kanban.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index cbd122efc1d..6d0ae1c3d3b 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -396,7 +396,7 @@
 .openerp .oe_kanban_view .oe_kanban_bottom_right {
   float: right;
   position: relative;
-  top: 1px;
+  top: 4px;
 }
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index a42662e99d9..45f290fdd1e 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -334,7 +334,7 @@
     .oe_kanban_bottom_right
         float: right
         position: relative
-        top: 1px
+        top: 4px
        
     .oe_kanban_status
         display: inline-block

From 5866c10a70e6ba27ed837af1daf4e30e3764feaf Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 10 Jul 2012 05:41:20 +0000
Subject: [PATCH 48/66] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120710053402-w16hn5zrg0stasd4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120710054120-gtxp31tv5y8ogdpr
---
 addons/account_asset/i18n/mn.po   | 793 ++++++++++++++++++++++++++++++
 addons/crm/i18n/ja.po             |  92 ++--
 addons/import_google/i18n/ja.po   |   2 +-
 addons/import_sugarcrm/i18n/ja.po |  89 ++--
 addons/project/i18n/ja.po         |  10 +-
 addons/project_issue/i18n/ja.po   |  16 +-
 addons/web_dashboard/i18n/bg.po   |  95 ++++
 addons/web_graph/i18n/bg.po       |  98 ++++
 addons/web_process/i18n/bg.po     | 118 +++++
 9 files changed, 1216 insertions(+), 97 deletions(-)
 create mode 100644 addons/account_asset/i18n/mn.po
 create mode 100644 addons/web_dashboard/i18n/bg.po
 create mode 100644 addons/web_graph/i18n/bg.po
 create mode 100644 addons/web_process/i18n/bg.po

diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
new file mode 100644
index 00000000000..8275f14ed6e
--- /dev/null
+++ b/addons/account_asset/i18n/mn.po
@@ -0,0 +1,793 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-10 03:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@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: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Дуусах хугацаа"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Үлдэгдэл дүн"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Үндсэн хөрөнгө тооцоолох"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Түүхийн нэр"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Хөрөнгийн судалгаа шинжилгээ"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Хөрөнгийн зэрэглэл"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 7d5b564951c..4281ea13d90 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-07-09 04:50+0000\n"
+"PO-Revision-Date: 2012-07-09 05:13+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-07-09 04:51+0000\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: crm
@@ -818,7 +818,7 @@ msgstr "作成日"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "参照2"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -838,7 +838,7 @@ msgstr "ミーティングのスケジュール"
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必要事項"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -1272,7 +1272,7 @@ msgstr "見込完了日"
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr ""
+msgstr "アクティブ項目がTrueに設定されると、営業チームを削除することなく非表示にできます。"
 
 #. module: crm
 #: field:crm.lead,street2:0
@@ -2431,17 +2431,17 @@ msgstr "私の開いている商談"
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "通信履歴の最大"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "人を招待"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "ミーティングタイプ"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2454,6 +2454,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"案件が作成されると、状態はドラフトにセットされます。\n"
+"案件が進行中になると、状態は開くにセットされます。\n"
+"案件が終了すると、状態は完了にセットされます。\n"
+"案件のレビューが必要な場合、状態は保留中にセットされます。"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2670,7 +2674,7 @@ msgstr "Eメールの標題"
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "会議への招待"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -3097,7 +3101,7 @@ msgstr "繰り返し"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr "前回終了年"
+msgstr "見込完了年"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3331,33 +3335,33 @@ msgstr "同じログインでは２つのユーザを持てません。"
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr ""
+msgstr "閉じる"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "電話のスケジュール"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Categorization"
-msgstr ""
+msgstr "分類化"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "通話ログ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "アクションルール"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "定期的"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -3372,39 +3376,39 @@ msgstr "木曜"
 #. module: crm
 #: view:crm.meeting:0
 msgid "To"
-msgstr ""
+msgstr "宛先"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "非公開"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "従業員の一般"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "機能"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "追加"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
 #: field:crm.meeting,description:0 view:crm.phonecall:0
 #: field:crm.phonecall,description:0 field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -3416,12 +3420,12 @@ msgstr "今月なされた通話"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "アクセサリーへの関心"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3432,17 +3436,17 @@ msgstr "新規商談"
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "会社の住所にEメールがありません。"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "Eメールの数"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "通り"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -3452,12 +3456,12 @@ msgstr "ユーザとチーム別の商談"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "ToDoにリセット"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "労働時間"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
@@ -3467,21 +3471,21 @@ msgstr "通話"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "顧客"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "最低"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3494,23 +3498,23 @@ msgstr ""
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "営業チーム"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "失注"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "編集"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead2opportunity.partner:0
@@ -3542,17 +3546,17 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "キャンペーン名"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "プロファイリング"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -3583,7 +3587,7 @@ msgstr "オプション"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr ""
+msgstr "交渉"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3593,12 +3597,12 @@ msgstr "見込完了"
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Eメール作成ウィザード"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3608,7 +3612,7 @@ msgstr "同意"
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "制御変数"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
index dad8acc1860..75e4f08b159 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-09 04:51+0000\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
 "X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_google
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
index 811bd6016fb..6f67aed9ada 100644
--- a/addons/import_sugarcrm/i18n/ja.po
+++ b/addons/import_sugarcrm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-09 09:19+0000\n"
-"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
+"PO-Revision-Date: 2012-07-09 18:11+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-05-11 05:15+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:34+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1105
@@ -28,7 +28,7 @@ msgstr "エラー"
 #: view:import.sugarcrm:0
 msgid ""
 "Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
+msgstr "SugarSoap API URL（ツールヒントを参照）とフルアクセスのSugarCRMログインを使用します。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -51,11 +51,12 @@ msgid ""
 "Choose data you want to import. Click 'Import' to get data manually or "
 "'Schedule Reccurent Imports' to get recurrently and automatically data."
 msgstr ""
+"インポートしたいデータを選択します。データを手動で取得するにはインポートを、データを繰り返し自動で取得するにはスケジュール反復インポートをクリックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,contact:0
 msgid "Contacts"
-msgstr "連絡先"
+msgstr "コンタクト"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -65,12 +66,12 @@ msgstr "人事"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,bug:0
 msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
+msgstr "OpenERPのプロジェクト問題にSugarCRMのバグをインポートするには、このボックスをクリックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,instance_name:0
 msgid "Instance's Name"
-msgstr "事例の名前"
+msgstr "インスタンスの名前"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project_task:0
@@ -80,7 +81,7 @@ msgstr "プロジェクトのタスク"
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_from:0
 msgid "Notify End Of Import To:"
-msgstr "へインポートの終了を通知する。"
+msgstr "インポート終了の通知先："
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,user:0
@@ -89,35 +90,37 @@ msgid ""
 "user with the same login exist in OpenERP, user information will be erase by "
 "sugarCRM user information"
 msgstr ""
+"OpenERPユーザにSugarCRMユーザをインポートするには、このボックスをチェックします。OpenERPの中に同じログインユーザが存在する場合は、S"
+"ugarCRMユーザ情報によりユーザ情報が消されることに注意して下さい。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/sugarsoap_services.py:23
 #, python-format
 msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr "Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz - python-zci"
+msgstr "Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz - python-zci"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Schedule Recurrent Imports"
-msgstr ""
+msgstr "スケジュール反復インポート"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid ""
 "Do not forget the email address to be notified of the success of the import."
-msgstr "インポート完了を通知するEメールを忘れないで下さい。"
+msgstr "インポート完了を通知するEメールアドレスを忘れないで下さい。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,call:0
 msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
+msgstr "OpenERP通話にSugarCRM通話をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid ""
 "If you make recurrent or ponctual import, data already  in OpenERP will be "
 "updated by SugarCRM data."
-msgstr ""
+msgstr "反復あるいは定時インポートをする場合、OpenERP内のデータはSugarCRMのデータによって更新されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,employee:0
@@ -132,12 +135,12 @@ msgstr "ドキュメント"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,document:0
 msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックしてください。"
+msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Import Data From SugarCRM"
-msgstr "SugarCRMからデータをインポートする。"
+msgstr "SugarCRMからデータのインポート"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -149,7 +152,7 @@ msgstr "CRM"
 msgid ""
 "Data are importing, the process is running in the background, an email will "
 "be sent to the given email address if it was defined."
-msgstr ""
+msgstr "データインポートのプロセスはバックグラウンドで実行されます。それが定義されている場合、所定のEメールアドレスにEメールが送信されます。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,call:0
@@ -159,19 +162,19 @@ msgstr "通話"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Multi Instance Management"
-msgstr ""
+msgstr "複数インスタンスの管理"
 
 #. module: import_sugarcrm
 #: view:import.message:0
 msgid "_Ok"
-msgstr "_OK"
+msgstr "OK"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,opportunity:0
 msgid ""
 "Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
 "and Opportunities"
-msgstr ""
+msgstr "OpenERPのリードと商談の中に、SugarCRMのリードと商談をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,email_history:0
@@ -186,6 +189,9 @@ msgid ""
 "application "
 "http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
 msgstr ""
+"データを取得するためのWebサービスのURL。例：'http://example.com/sugarcrm/soap.php'、または、あなたのSugar"
+"CRMアプリケーションのアドレスをコピーします。 "
+"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
 
 #. module: import_sugarcrm
 #: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
@@ -196,7 +202,7 @@ msgstr "SugarCRMをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Import"
-msgstr "インポート(_I)"
+msgstr "インポート"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,user:0
@@ -208,18 +214,18 @@ msgstr "ユーザ"
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1131
 #, python-format
 msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
+msgstr "%s のデータは %s モジュールがインストールされていることを要求します。%s モジュールをインストールして下さい。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,claim:0
 msgid "Cases"
-msgstr "お問合せ"
+msgstr "案件"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,meeting:0
 msgid ""
 "Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
+msgstr "OpenERPミーティングにSugarCRMのミーティングとタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,email_history:0
@@ -227,6 +233,7 @@ msgid ""
 "Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
 "Messages and Attachments"
 msgstr ""
+"OpenERPメッセージと添付ファイにSugarCRMのEメール、ノート、添付ファイルをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,project:0
@@ -240,13 +247,13 @@ msgid ""
 "Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 msgstr ""
-"Python SOAPをインストールしてください。- ZSI-2.0-rc3.tar.gz from "
+"Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz from "
 "http://pypi.python.org/pypi/ZSI/"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project:0
 msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
+msgstr "OpenERPプロジェクトにSugarCRMプロジェクトをインポートするには、このボックスをチェックして下さい。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:1098
@@ -263,12 +270,12 @@ msgstr "ミーティング"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,employee:0
 msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
+msgstr "OpenERP従業員にSugarCRM従業員をインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,url:0
 msgid "SugarSoap Api url:"
-msgstr "SugarSoap Api url:"
+msgstr "SugarSoap API URL："
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
@@ -282,6 +289,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,bug:0
@@ -296,12 +305,12 @@ msgstr "プロジェクト"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,project_task:0
 msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
+msgstr "OpenERPタスクにSugarCRMプロジェクトタスクをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,opportunity:0
 msgid "Leads & Opp"
-msgstr "見込み客 ＆ 商談"
+msgstr "リード ＆ 商談"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -310,6 +319,8 @@ msgid ""
 "Authentication error !\n"
 "Bad Username or Password or bad SugarSoap Api url !"
 msgstr ""
+"認証エラー。\n"
+"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/import_sugarcrm.py:79
@@ -330,12 +341,12 @@ msgstr "警告"
 msgid ""
 "Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
 "from different server."
-msgstr ""
+msgstr "SugarCRMモデルデータの xml_id を区別するためのSugarCRM IDのサフィックス（接頭辞）は異なるサーバから来ます。"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,contact:0
 msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
+msgstr "OpenERP住所録にSugarCRMコンタクトをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,password:0
@@ -350,12 +361,12 @@ msgstr "ログイン情報"
 #. module: import_sugarcrm
 #: help:import.sugarcrm,claim:0
 msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
+msgstr "OpenERP苦情にSugarCRMケースをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Notification When Import is Finished"
-msgstr ""
+msgstr "インポート完了時にEメール通知"
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,username:0
@@ -366,17 +377,17 @@ msgstr "ユーザ名"
 #: view:import.message:0
 #: model:ir.model,name:import_sugarcrm.model_import_message
 msgid "Import Message"
-msgstr "メッセージをインポートする。"
+msgstr "メッセージのインポート"
 
 #. module: import_sugarcrm
 #: help:import.sugarcrm,account:0
 msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
+msgstr "OpenERPパートナにSugarCRMアカウントをインポートするには、このボックスをチェックします。"
 
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Online documentation:"
-msgstr ""
+msgstr "オンラインドキュメンテーション："
 
 #. module: import_sugarcrm
 #: field:import.sugarcrm,account:0
@@ -386,7 +397,7 @@ msgstr "顧客情報"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "_Cancel"
-msgstr "キャンセル(_C)"
+msgstr "キャンセル"
 
 #. module: import_sugarcrm
 #: code:addons/import_sugarcrm/sugarsoap_services.py:23
@@ -403,4 +414,4 @@ msgstr "SugarCRMのデータをインポート"
 #. module: import_sugarcrm
 #: view:import.sugarcrm:0
 msgid "Email Address to Notify"
-msgstr ""
+msgstr "通知のEメールアドレス"
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 3fda3a1349c..68f60160a76 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 17:12+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2012-07-10 00:39+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1825,7 +1825,7 @@ msgstr "タスク %s は閉じられました。"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index fcd18045839..6ef4c5b71d2 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 23:10+0000\n"
+"PO-Revision-Date: 2012-07-09 05:11+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@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: 2012-06-13 04:56+0000\n"
-"X-Generator: Launchpad (build 15389)\n"
+"X-Launchpad-Export-Date: 2012-07-10 05:33+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -398,7 +398,7 @@ msgstr "プロジェクトの問題"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication & History"
-msgstr "コミュニケーションと履歴"
+msgstr "通信と履歴"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -836,10 +836,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"事象が作成されると、状態はドラフトにセットされます。\n"
-"事象が進行中になると、状態は開くにセットされます。\n"
-"事業が終了すると、状態は完了にセットされます。\n"
-"事象がレビューが必要な場合、状態は保留中にセットされます。"
+"案件が作成されると、状態はドラフトにセットされます。\n"
+"案件が進行中になると、状態は開くにセットされます。\n"
+"案件が終了すると、状態は完了にセットされます。\n"
+"案件のレビューが必要な場合、状態は保留中にセットされます。"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
diff --git a/addons/web_dashboard/i18n/bg.po b/addons/web_dashboard/i18n/bg.po
new file mode 100644
index 00000000000..6518b28a8b9
--- /dev/null
+++ b/addons/web_dashboard/i18n/bg.po
@@ -0,0 +1,95 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-09 13:18+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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: 2012-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:61
+msgid "Edit Layout"
+msgstr "Редакция План"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:107
+msgid "Are you sure you want to remove this item ?"
+msgstr "Сигурни ли сте, че искате да изтриете този елемент ?"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
+msgid "Reset Layout.."
+msgstr "Връщане в начално състояние Подредба.."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
+msgid "Reset"
+msgstr "Връщане в начално състояние"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
+msgid "Change Layout.."
+msgstr "Смяна Подредба.."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
+msgid "Change Layout"
+msgstr "Промяна Подредба"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
+msgid "&nbsp;"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:28
+msgid "Create"
+msgstr "Създаване"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
+msgid "Choose dashboard layout"
+msgstr "Избери подредба на табло"
+
+#, python-format
+#~ msgid "Execute task \"%s\""
+#~ msgstr "Изпълни задача \"%s\""
+
+#~ msgid "Uncategorized"
+#~ msgstr "Без категория"
+
+#~ msgid "Remember to bookmark"
+#~ msgstr "Запомни като отметка"
+
+#~ msgid "This url"
+#~ msgstr "Този url"
+
+#~ msgid ""
+#~ "Click on the functionalites listed below to launch them and configure your "
+#~ "system"
+#~ msgstr ""
+#~ "Кликнете върху фунциите изброени по-долу за да ги изпълните и конфигурирате "
+#~ "системата"
+
+#~ msgid "Welcome to OpenERP"
+#~ msgstr "Добре дошли в OpenERP"
+
+#~ msgid "Your login:"
+#~ msgstr "Вашето потребителско име:"
+
+#~ msgid "progress:"
+#~ msgstr "обработка:"
+
+#~ msgid "Mark this task as done"
+#~ msgstr "Маркирай задачата като приключена"
diff --git a/addons/web_graph/i18n/bg.po b/addons/web_graph/i18n/bg.po
new file mode 100644
index 00000000000..fd0e3c82e83
--- /dev/null
+++ b/addons/web_graph/i18n/bg.po
@@ -0,0 +1,98 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-09 12:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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: 2012-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:22
+msgid "Graph"
+msgstr "Диаграма"
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:5
+msgid "Graph Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:7
+msgid "Graph Mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:11
+msgid "Pie"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:12
+msgid "Bars"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:14
+msgid "Lines"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:15
+msgid "Areas"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:18
+msgid "Radar"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:20
+msgid "Legend"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:24
+msgid "Hidden"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:25
+msgid "Inside"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:26
+msgid "Top"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:28
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:32
+msgid "Switch Axis"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:33
+msgid "Show Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web_graph/static/src/xml/web_graph.xml:34
+msgid "Download as PNG"
+msgstr ""
diff --git a/addons/web_process/i18n/bg.po b/addons/web_process/i18n/bg.po
new file mode 100644
index 00000000000..d86858ec17e
--- /dev/null
+++ b/addons/web_process/i18n/bg.po
@@ -0,0 +1,118 @@
+# Bulgarian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2012-07-09 12:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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: 2012-07-10 05:41+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Отказ"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Запис"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr "Изглед на процеса"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Документация"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Прочети документацията онлайн"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Форум"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Обща дискусия"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Книги"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr "Вземи книгите"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr "Купи OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Процес"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Бележки"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Последно модифицирано от:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Междинен поток"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Свързани"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Избор Процес"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Избор"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr "Редакция Процес"

From fe368d23c872c3db942ec2bdb6cc8a17423df6ae Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:31:45 +0200
Subject: [PATCH 49/66] [IMP] padding between groups in forms

bzr revid: fp@tinyerp.com-20120710073145-l0rmppe2d7mpterz
---
 addons/web/static/src/css/base.css    | 5 ++++-
 addons/web/static/src/css/base.sass   | 5 ++++-
 addons/web/static/src/js/view_form.js | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 1425162d833..848886dde0c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1857,12 +1857,15 @@
   min-width: 120px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
-  padding-left: 8px;
+  padding-left: 4px;
 }
 .openerp .oe_form .oe_form_group {
   width: 100%;
   margin: 4px 0 4px 0;
 }
+.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td {
+  padding-left: 12px;
+}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 82ed305a275..e789d116e95 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1449,10 +1449,13 @@ $sheet-max-width: 860px
                 display: block
                 min-width: 120px
         td.oe_form_group_cell + .oe_form_group_cell
-            padding-left: 8px
+            padding-left: 4px
         .oe_form_group
             width: 100%
             margin: 4px 0 4px 0
+            .oe_group_right
+                > tbody > tr > td
+                    padding-left: 12px
     // }}}
     // FormView.label {{{
     .oe_form
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 63fd46dd440..ae57d1dfb24 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1182,6 +1182,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             if (!$tr || row_cols < colspan) {
                 $tr = $('<tr/>').addClass('oe_form_group_row').appendTo($table);
                 row_cols = cols;
+            } else if (tagName==='group') {
+                // When <group> <group/><group/> </group>, we need a spacing between the two groups
+                $child.addClass('oe_group_right')
+
             }
             row_cols -= colspan;
 

From 597835db3c790a8ac4c8fb68650a712172ca3631 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:49:46 +0200
Subject: [PATCH 50/66] [IMP] form layout

bzr revid: fp@tinyerp.com-20120710074946-llxeomd8o5e83y9i
---
 addons/web/static/src/css/base.css  | 7 +++++--
 addons/web/static/src/css/base.sass | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 848886dde0c..a87b6814ec6 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1733,6 +1733,9 @@
 .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
   display: none !important;
 }
+.openerp .oe_form_readonly .oe_form .oe_form_field_date {
+  width: auto;
+}
 .openerp .oe_form_nosheet {
   margin-left: 10px;
   margin-right: 10px;
@@ -1863,7 +1866,7 @@
   width: 100%;
   margin: 4px 0 4px 0;
 }
-.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td {
+.openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child {
   padding-left: 12px;
 }
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
@@ -1965,7 +1968,7 @@
   width: 180px;
 }
 .openerp .oe_form .oe_form_field_date {
-  width: 7em;
+  width: 7.5em;
 }
 .openerp .oe_form .oe_form_field_datetime {
   width: 11em;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e789d116e95..da1acbe2a5a 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1351,6 +1351,8 @@ $sheet-max-width: 860px
     .oe_form_readonly
         .oe_edit_only, .oe_form_field:empty
             display: none !important
+        .oe_form .oe_form_field_date
+            width: auto
     .oe_form_nosheet 
         margin-left: 10px
         margin-right: 10px
@@ -1454,7 +1456,7 @@ $sheet-max-width: 860px
             width: 100%
             margin: 4px 0 4px 0
             .oe_group_right
-                > tbody > tr > td
+                > tbody > tr > td:first-child
                     padding-left: 12px
     // }}}
     // FormView.label {{{
@@ -1538,7 +1540,7 @@ $sheet-max-width: 860px
         .oe_form_field_float
             width: 180px
         .oe_form_field_date
-            width: 7em
+            width: 7.5em
         .oe_form_field_datetime
             width: 11em
         input[type="text"], input[type="password"], input[type="file"], select

From 6917d464c9d185818d1eae3cb35a6706b57f7d86 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:50:54 +0200
Subject: [PATCH 51/66] [IMP] form layout

bzr revid: fp@tinyerp.com-20120710075054-ftlm3g69yrsgni1u
---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index a87b6814ec6..faab67f4703 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1867,7 +1867,7 @@
   margin: 4px 0 4px 0;
 }
 .openerp .oe_form .oe_form_group .oe_group_right > tbody > tr > td:first-child {
-  padding-left: 12px;
+  padding-left: 18px;
 }
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index da1acbe2a5a..e0d5847c7d8 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1457,7 +1457,7 @@ $sheet-max-width: 860px
             margin: 4px 0 4px 0
             .oe_group_right
                 > tbody > tr > td:first-child
-                    padding-left: 12px
+                    padding-left: 18px
     // }}}
     // FormView.label {{{
     .oe_form

From 2e02a7ab0bbf567b82b112f998ca02d0bdb87c20 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 09:57:53 +0200
Subject: [PATCH 52/66] [IMP] form css

bzr revid: fp@tinyerp.com-20120710075753-l922o72cghj9f0f3
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index faab67f4703..36d26d10741 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1860,7 +1860,7 @@
   min-width: 120px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
-  padding-left: 4px;
+  padding-left: 6px;
 }
 .openerp .oe_form .oe_form_group {
   width: 100%;
@@ -1872,7 +1872,7 @@
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
-  padding-right: 8px;
+  padding-right: 6px;
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index e0d5847c7d8..2ba3b79c411 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1451,7 +1451,7 @@ $sheet-max-width: 860px
                 display: block
                 min-width: 120px
         td.oe_form_group_cell + .oe_form_group_cell
-            padding-left: 4px
+            padding-left: 6px
         .oe_form_group
             width: 100%
             margin: 4px 0 4px 0
@@ -1464,7 +1464,7 @@ $sheet-max-width: 860px
         .oe_form_label_help[for], .oe_form_label[for]
             font-weight: bold
             white-space: nowrap
-            padding-right: 8px
+            padding-right: 6px
             span
                 font-size: 80%
                 color: darkGreen

From f078da8a52092c406ebf5297418596a466b41e9d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 10:54:41 +0200
Subject: [PATCH 53/66] [IMP] make the m2o a little more complex

bzr revid: nicolas.vanhoren@openerp.com-20120710085441-dt2kn4z5rk2482sy
---
 addons/web/static/src/js/view_form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ae57d1dfb24..4d00db6ccea 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2614,6 +2614,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
                 self.current_display = self.$input.val();
                 if (self.$input.val() === "") {
                     self.set({value: false});
+                    self.floating = false;
                 } else {
                     self.floating = true;
                 }

From 24a54675ee2ba5be6e2f2e248587d89c93582d09 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 11:18:21 +0200
Subject: [PATCH 54/66] [FIX] problem with css classes of view managers

bzr revid: nicolas.vanhoren@openerp.com-20120710091821-qpc49vwq60k1xt3f
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/views.js     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 4d00db6ccea..d629b8e9b3d 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2609,7 +2609,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         });
 
         // some behavior for input
-        this.$input.keyup(function() {
+        this.$input.keydown(function() {
             if (self.current_display !== self.$input.val()) {
                 self.current_display = self.$input.val();
                 if (self.$input.val() === "") {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 98df8a0af0d..6586807264d 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -146,7 +146,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             this.dialog.dialog_title = action.name;
             this.dialog_viewmanager = new instance.web.ViewManagerAction(this.dialog, action);
             this.dialog_viewmanager.appendTo(this.dialog.$element);
-            this.dialog_viewmanager.$element.addClass("oe_view_manager_" + action.target);
+            this.dialog_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current'));
             this.dialog.open();
         } else  {
             this.dialog_stop();
@@ -159,7 +159,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             this.inner_action = action;
             this.inner_viewmanager = new instance.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
-            this.inner_viewmanager.$element.addClass("oe_view_manager_" + action.target);
+            this.inner_viewmanager.$element.addClass("oe_view_manager_" + (action.target || 'current'));
         }
     },
     ir_actions_act_window_close: function (action, on_closed) {

From e2970d33eeb89dc760c9b22576d5f6901532c4ed Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 11:42:50 +0200
Subject: [PATCH 55/66] [FIX] problem with mail widgets and o2m

bzr revid: nicolas.vanhoren@openerp.com-20120710094250-l8utds8f3wtpqlhc
---
 addons/mail/static/src/js/mail.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 0f68a548590..88f0b9ade43 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -540,7 +540,11 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
+            if (! this.view.datarecord.id ||
+                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$element.find('.oe_mail_thread').hide();
+                return;
+            }
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget

From 7880aa4beb8067e7717ef62e6a571fd000350ea6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 10 Jul 2012 11:44:31 +0200
Subject: [PATCH 56/66] [IMP] FormView: support for @style of fields

bzr revid: fme@openerp.com-20120710094431-tgsrrnkdyxlulkqt
---
 addons/web/static/src/xml/base.xml | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 29a7a61aa30..ee0f22cc07d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -863,7 +863,7 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <span t-att-class="'oe_form_field '+widget.widget_class">
+    <span t-att-class="'oe_form_field '+widget.widget_class" t-att-style="widget.node.attrs.style">
         <t  t-if="!widget.get('effective_readonly')">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
@@ -875,7 +875,7 @@
     </span>
 </t>
 <t t-name="FieldEmail">
-    <span class="oe_form_field oe_form_field_email oe_form_field_with_button">
+    <span class="oe_form_field oe_form_field_email oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
         <t t-if="!widget.get('effective_readonly')">
             <div>
@@ -900,7 +900,7 @@
     </t>
 </t>
 <t t-name="FieldText">
-    <div class="oe_form_field oe_form_field_text">
+    <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
         <textarea rows="6"
             t-att-name="widget.name"
             class="field_text"
@@ -925,13 +925,13 @@
     </span>
 </t>
 <t t-name="FieldDate">
-    <span class="oe_form_field oe_datepicker_root oe_form_field_date"/>
+    <span class="oe_form_field oe_datepicker_root oe_form_field_date" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldDatetime">
-    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime"/>
+    <span class="oe_form_field oe_datepicker_root oe_form_field_datetime" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldSelection">
-    <span class="oe_form_field oe_form_field_selection">
+    <span class="oe_form_field oe_form_field_selection" t-att-style="widget.node.attrs.style">
         <select t-if="!widget.get('effective_readonly')"
             t-att-name="widget.name"
             t-att-tabindex="widget.node.attrs.tabindex"
@@ -944,7 +944,7 @@
     </span>
 </t>
 <t t-name="FieldMany2One">
-    <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button">
+    <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
         <t t-if="!widget.get('effective_readonly')">
             <button class="oe_button oe_m2o_cm_button" title="Open Resource">
@@ -965,7 +965,7 @@
     </span>
 </t>
 <t t-name="FieldMany2ManyTags">
-    <div class="oe_form_field oe_form_field_many2manytags">
+    <div class="oe_form_field oe_form_field_many2manytags" t-att-style="widget.node.attrs.style">
         <t t-if="! widget.get('effective_readonly')">
             <textarea rows="1" style="width: 100%"
                 t-att-placeholder="widget.node.attrs.placeholder"></textarea>
@@ -982,7 +982,7 @@
     </t>
 </t>
 <t t-name="FieldReference">
-    <table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0">
+    <table class="oe_form_field oe_form_field_reference" border="0" cellpadding="0" cellspacing="0" t-att-style="widget.node.attrs.style">
     <tr>
         <td t-attf-class="oe_form_frame_cell oe_form_selection">
             <span t-attf-class="oe_form_view_reference_selection"/>
@@ -994,7 +994,7 @@
     </table>
 </t>
 <t t-name="FieldBoolean">
-    <span class="oe_form_field oe_form_field_boolean">
+    <span class="oe_form_field oe_form_field_boolean" t-att-style="widget.node.attrs.style">
         <input type="checkbox"
             t-att-id="widget.id_for_label"
             t-att-name="widget.name"
@@ -1004,12 +1004,12 @@
     </span>
 </t>
 <t t-name="FieldProgressBar">
-    <span class="oe_form_field oe_form_field_progressbar" t-opentag="true">
+    <span class="oe_form_field oe_form_field_progressbar" t-att-style="widget.node.attrs.style">
         <span></span>
     </span>
 </t>
 <t t-name="FieldStatus">
-    <ul class="oe_form_steps"/>
+    <ul class="oe_form_steps" t-att-style="widget.node.attrs.style"/>
 </t>
 <t t-name="FieldStatus.content">
     <t t-set="size" t-value="widget.to_show.length"/>
@@ -1021,7 +1021,7 @@
     </t>
 </t>
 <t t-name="FieldBinaryImage">
-    <span class="oe_form_field oe_form_field_image">
+    <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style">
         <div class="oe_form_field_image_controls oe_edit_only">
             <t t-call="HiddenInputFile">
                 <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
@@ -1049,7 +1049,7 @@
 </t>
 <t t-name="FieldBinaryFile">
     <t t-if="!widget.get('effective_readonly')">
-        <table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0">
+        <table class="oe_form_field oe_form_field_binary" cellpadding="0" cellspacing="0" border="0" t-att-style="widget.node.attrs.style">
         <tr>
             <td>
                 <input type="text" size="1" readonly="readonly"
@@ -1097,7 +1097,7 @@
         </table>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <span>
+        <span t-att-style="widget.node.attrs.style">
             <a href="javascript:void(0)" class="oe_form_uri"/>
         </span>
     </t>
@@ -1116,6 +1116,7 @@
 </t>
 <t t-name="WidgetButton">
     <button type="button" class="oe_button oe_form_button"
+        t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
         t-att-autofocus="widget.node.attrs.autofocus">
         <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>

From a4072058fb9266648dcab37ca3dfa5f3edad4603 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 12:11:06 +0200
Subject: [PATCH 57/66] [IMP] American addresses + better form lyout

bzr revid: fp@tinyerp.com-20120710101106-2zft32zeopyb17v0
---
 openerp/addons/base/res/res_partner_view.xml | 33 +++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 5159a7075cc..d8760384c2c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -113,28 +113,21 @@
                         <h1>
                             <field name="name"/>
                         </h1>
-                        <div attrs="{'invisible': [('is_company','=', True)]}">
-                            <label for="parent_id" class="oe_edit_only"/>
-                        </div>
-                        <h2 attrs="{'invisible': [('is_company','=', True)]}">
-                            <field name="parent_id"
-                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                class="oe_inline"
-                                on_change="onchange_address(use_parent_address, parent_id)"/>, 
-                            <field name="function" class="oe_inline" placeholder="Job Position"/>
-                        </h2>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
 
                     <group>
                         <group>
+                            <field name="parent_id"
+                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                                attrs="{'invisible': [('is_company','=', True)]}"
+                                on_change="onchange_address(use_parent_address, parent_id)"/>, 
                             <label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
                             <div attrs="{'invisible': [('parent_id','=', False)]}">
                                 <field class="oe_inline"
                                     name="type"/>
-                                <label for="use_parent_address"/>
-                                <field name="use_parent_address"
-                                    class="oe_inline"
+                                <label for="use_parent_address" class="oe_edit_only"/>
+                                <field name="use_parent_address" class="oe_edit_only oe_inline"
                                     on_change="onchange_address(use_parent_address, parent_id)"/>
                             </div>
 
@@ -143,16 +136,18 @@
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div>
-                                    <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                    <field name="city" class="oe_inline" placeholder="City"/>
+                                    <field name="city" placeholder="City" style="width: 45%% !important"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 20%% !important"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 34%% !important"/>
                                 </div>
-                                <field name="state_id" placeholder="State"/>
-                                <field name="country_id" placeholder="Country"/>
+                                <field name="country_id" placeholder="Country" class="oe_no_button"/>
                             </div>
-                            <field name="website" widget="url" placeholder="www.openerp.com"/>
+                            <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
                         <group>
-                            <field name="phone" placeholder="+32.81.81.37.00"/>
+                            <field name="function" placeholder="Job Position"
+                                attrs="{'invisible': [('is_company','=', True)]}"/>
+                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
                             <field name="mobile"/>
                             <field name="fax"/>
                             <field name="email" widget="email"/>

From cbc1ed31b3a1584cd3fac8dc78e66765fd2250fe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 12:12:05 +0200
Subject: [PATCH 58/66] [IMP] better form css

bzr revid: fp@tinyerp.com-20120710101205-y0im0xzehzw6jm9p
---
 addons/web/static/src/css/base.css  | 36 ++++++++++++++++-------------
 addons/web/static/src/css/base.sass | 32 ++++++++++++++-----------
 addons/web/static/src/xml/base.xml  |  7 +-----
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 36d26d10741..0c4362f4436 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1857,7 +1857,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 110px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -1929,9 +1929,10 @@
 }
 .openerp .oe_form .oe_form_field_char input,
 .openerp .oe_form .oe_form_field_url input,
+.openerp .oe_form .oe_form_field_email input,
 .openerp .oe_form .oe_form_field_text textarea,
 .openerp .oe_form .oe_form_field_selection select {
-  width: inherit;
+  width: 100%;
 }
 .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
   width: 500px;
@@ -2001,15 +2002,6 @@
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url input {
-  border-right: none;
-  -webkit-border-top-right-radius: 0px;
-  -webkit-border-bottom-right-radius: 0px;
-  -moz-border-radius-topright: 0px;
-  -moz-border-radius-bottomright: 0px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
@@ -2073,10 +2065,19 @@
   right: 5px;
   top: 3px;
 }
-.openerp .oe_form .oe_form_field_with_button input {
-  width: 100%;
+.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
+  display: none;
 }
-.openerp .oe_form .oe_form_field_with_button > .oe_button {
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
+  border-right: none;
+  -webkit-border-top-right-radius: 0px;
+  -webkit-border-bottom-right-radius: 0px;
+  -moz-border-radius-topright: 0px;
+  -moz-border-radius-bottomright: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
   float: right;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
@@ -2084,6 +2085,9 @@
   border-bottom-left-radius: 0px;
   height: 22px;
 }
+.openerp .oe_form .oe_form_field_with_button input {
+  width: 100%;
+}
 .openerp .oe_form .oe_form_field_with_button > div {
   position: relative;
   overflow: hidden;
@@ -2138,8 +2142,8 @@
 }
 .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
   position: absolute;
-  top: 3px;
-  right: 2px;
+  top: 1px;
+  right: 0px;
 }
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2ba3b79c411..fa71942c9da 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1449,7 +1449,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 110px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1512,9 +1512,10 @@ $sheet-max-width: 860px
             width: 100%
         .oe_form_field_char input,
         .oe_form_field_url input,
+        .oe_form_field_email input,
         .oe_form_field_text textarea,
         .oe_form_field_selection select
-            width: inherit
+            width: 100%
         .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
         .oe_form_field_float input
@@ -1560,14 +1561,6 @@ $sheet-max-width: 860px
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-        .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
-            border-right: none
-            -webkit-border-top-right-radius: 0px
-            -webkit-border-bottom-right-radius: 0px
-            -moz-border-radius-topright: 0px
-            -moz-border-radius-bottomright: 0px
-            border-top-right-radius: 0px
-            border-bottom-right-radius: 0px
         .oe_form_field_url button img
             vertical-align: top
         .oe_form_field_date,
@@ -1618,14 +1611,25 @@ $sheet-max-width: 860px
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
-        .oe_form_field_with_button
+        .oe_form_field_with_button.oe_no_button > .oe_button
+            display: none
+        .oe_form_field_with_button:not(.oe_no_button)
             input
-                width: 100%
+                border-right: none
+                -webkit-border-top-right-radius: 0px
+                -webkit-border-bottom-right-radius: 0px
+                -moz-border-radius-topright: 0px
+                -moz-border-radius-bottomright: 0px
+                border-top-right-radius: 0px
+                border-bottom-right-radius: 0px
             > .oe_button
                 float: right
                 @include radius(0)
                 border-bottom-left-radius: 0px
                 height: 22px
+        .oe_form_field_with_button
+            input
+                width: 100%
             > div
                 position: relative
                 overflow: hidden
@@ -1680,8 +1684,8 @@ $sheet-max-width: 860px
             position: relative
         span.oe_m2o_drop_down_button
             position: absolute
-            top: 3px
-            right: 2px
+            top: 1px
+            right: 0px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ee0f22cc07d..a8d7a061a81 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -875,7 +875,7 @@
     </span>
 </t>
 <t t-name="FieldEmail">
-    <span class="oe_form_field oe_form_field_email oe_form_field_with_button" t-att-style="widget.node.attrs.style">
+    <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
         <t t-if="!widget.get('effective_readonly')">
             <div>
@@ -893,11 +893,6 @@
     <t t-jquery="span:first">
         this.removeClass('oe_form_field_email').addClass('oe_form_field_url');
     </t>
-    <t t-jquery="button.oe_button" t-operation="replace">
-        <button class="oe_button" tabindex="-1" type="button" title="Open this resource">
-            <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
-        </button>
-    </t>
 </t>
 <t t-name="FieldText">
     <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">

From 4d7d5afce0042a909205a10ea22100b036c357dd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 12:12:37 +0200
Subject: [PATCH 59/66] [IMP] opporunity form small improvement in layout

bzr revid: fp@tinyerp.com-20120710101237-zzsi61hzwbxemi6b
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 85f9a4aab5d..7e05f8cb579 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -468,7 +468,7 @@
                         <h2>
                             <field name="planned_revenue" class="oe_inline"/>
                             <field name="company_currency" class="oe_inline"/> at 
-                            <field name="probability" class="oe_inline"/> %% success rate
+                            <field name="probability" class="oe_inline"/>%% success rate
                         </h2>
                     </div>
                     <group>

From 16191491ebb7d36c6a914443c2ce06ef1e4ec4d5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Jul 2012 13:07:40 +0200
Subject: [PATCH 60/66] [IMP] tools: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120710110740-rj2820hn4w9hmxdj
---
 addons/idea/idea_view.xml               | 16 +++--
 addons/lunch/lunch.py                   |  2 +-
 addons/lunch/lunch_view.xml             | 18 +++---
 addons/survey/static/src/css/survey.css |  4 --
 addons/survey/survey.py                 |  2 +-
 addons/survey/survey_view.xml           | 81 ++++++++++++-------------
 6 files changed, 54 insertions(+), 69 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 9dfbd859d4e..8d7a726f015 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -20,11 +20,9 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Category of Ideas" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                        </group>
-                    </sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -77,10 +75,10 @@
                 <sheet>
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <group>
-                        <field name="category_ids" widget="many2many_tags" string="Tags"/>
-                        <field name="description"/>
-                    </group>
+                    <label for="category_ids" class="oe_edit_only"/>
+                    <field name="category_ids" widget="many2many_tags"/>
+                    <label for="description"/><newline/>
+                    <field name="description"/>
                 </sheet>
                 <footer>
                     <field name="message_ids" widget="mail_thread"/>
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index c771c42cfe1..8cca4ced465 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -135,7 +135,7 @@ class lunch_order(osv.osv):
             readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
         'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
-        'descript': fields.char('Description Order', readonly=True, size=250, \
+        'descript': fields.char('Comment', readonly=True, size=250, \
             states = {'draft':[('readonly', False)]}),
         'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
             'Status', readonly=True, select=True),
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8efb6566f7c..5e870c085c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -109,12 +109,10 @@
             <field name="model">lunch.cashbox</field>
             <field name="arch" type="xml">
                 <form string="Cashboxes" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                            <field name="manager"/>
-                        </group>
-                    </sheet>
+                    <group colspan="4">
+                        <field name="name"/>
+                        <field name="manager"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -226,11 +224,9 @@
             <field name="model">lunch.category</field>
             <field name="arch" type="xml">
                 <form string="Category" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <field name="name"/>
-                        </group>
-                    </sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index 6964e4c2f3e..c18f584c9ed 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -12,7 +12,3 @@
 .oe_survey_rate{
     font-size: 14px;
 }
-.oe_kanban_survey {
-    width: 300px;
-}
-
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 1c1c8b6df91..0ebaa2aa586 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -178,7 +178,7 @@ class survey_page(osv.osv):
     _columns = {
         'title': fields.char('Page Title', size=128, required=1),
         'survey_id': fields.many2one('survey', 'Survey', ondelete='cascade'),
-        'question_ids': fields.one2many('survey.question', 'page_id', 'Question'),
+        'question_ids': fields.one2many('survey.question', 'page_id', 'Questions'),
         'sequence': fields.integer('Page Nr'),
         'note': fields.text('Description'),
     }
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 8aeec213648..cfefc8f7dea 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -27,16 +27,14 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="122" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="106" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                        <button name="106" states="open,draft,close,cancel" string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}" invisible="1"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     </div>
                     <label for="title" class="oe_edit_only"/>
                     <h1>
                         <field name="title" select="1" class="oe_inline"/>
-                        <label string="(" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
+                        <label string=", " attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                         <field name="type" class="oe_inline"/>
-                        <label string=")" attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
                     </h1>
                     <group>
                         <group>
@@ -50,31 +48,29 @@
                         </group>
                      </group>
                      <notebook>
-                        <page string="Survey">
-                            <field name="page_ids" colspan="4" nolabel="1" mode="tree">
+                        <page string="Survey Details">
+                            <field name="note" colspan="4" placeholder="Survey description..."/>
+                            <label for="page_ids"/>
+                            <field name="page_ids" colspan="4" mode="tree">
                                 <form string="Survey Page" version="7.0">
                                     <sheet>
                                     <label for="title" class="oe_edit_only"/>
-                                    <h2>
-                                        <field name="title" select="1" class="oe_inline"/>
-                                        (<field name="sequence" groups="base.group_no_one" class="oe_inline"/>)
-                                    </h2>
-                                    <newline/>
+                                    <h1>
+                                        <field name="title"/>
+                                    </h1>
                                     <group>
-                                        <field name="note" placeholder="Add a description on the survey page" nolabel="1"/>
+                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
                                     </group>
                                     <newline/>
-                                    <group string="Survey Questions">
+                                    <group>
+                                        <label for="question_ids"/>
+                                        <newline/>
                                         <field name="question_ids" nolabel="1">
-                                            <form string="Survey Question" >
+                                            <form string="Survey Question">
                                                 <group>
                                                     <group>
-                                                    <field name="question" select="1"/>
-                                                    <field name="type" on_change="on_change_type(type)"/>
-                                                    </group>
-                                                    <group>
-                                                    <field name="sequence"/>
-                                                    <field name="tot_resp"/>
+                                                        <field name="question"/>
+                                                        <field name="type" on_change="on_change_type(type)"/>
                                                     </group>
                                                 </group>
                                                 <newline/>
@@ -206,7 +202,7 @@
                                             </form>
                                             <tree string="Survey Question">
                                                 <field name="sequence" string="Seq"/>
-                                                <field name="question" colspan="4" select="1"/>
+                                                <field name="question"/>
                                                 <field name="answer_choice_ids"/>
                                             </tree>
                                         </field>
@@ -215,26 +211,21 @@
                                     </form>
                                 </field>
                         </page>
-                        <page string="Other">
-
-                            <separator colspan="4" string="Survey Details"/>
-                            <field name="note" colspan="4" nolabel="1"/>
-                        </page>
                         <page string="Invited User">
-                            <field name="invited_user_ids" nolabel="1" readonly="1"/>
+                            <field name="invited_user_ids" readonly="1"/>
                         </page>
                         <page string="History">
                             <group>
                                 <group>
-                                    <field name="date_open" select="1"/>
+                                    <field name="date_open"/>
                                     <field name="date_close"/>
                                 </group>
                                 <group>
-                                    <field name="tot_start_survey" select="1"/>
-                                    <field name="tot_comp_survey" select="1"/>
+                                    <field name="tot_start_survey"/>
+                                    <field name="tot_comp_survey"/>
                                 </group>
                             </group>
-                            <field name="history" colspan="4" nolabel="1">
+                            <field name="history" colspan="4">
                                 <tree string="History">
                                     <field name="date"/>
                                     <field name="user_id"/>
@@ -244,7 +235,6 @@
                                     <field name="user_id"/>
                                 </form>
                            </field>
-
                         </page>
                     </notebook>
                 </sheet>
@@ -316,7 +306,7 @@
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
@@ -376,15 +366,20 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <group col="4">
-                            <field name="title" select="1"/>
-                            <field name="survey_id" select="1"/>
+                        <label for="title" class="oe_edit_only"/>
+                        <h1>
+                            <field name="title"/>
+                        </h1>
+                        <group colspan="4">
+                            <field name="survey_id"/>
                             <field name="sequence"/>
                         </group>
-                        <group col="4">
-                            <field name="note" nolabel="1" placeholder="Add a description on the survey page"/>
+                        <group colspan="4">
+                            <field name="note" nolabel="1" placeholder="Description on the survey page..."/>
                         </group>
                         <group col="4">
+                            <label for="question_ids"/>
+                            <newline/>
                             <field name="question_ids" nolabel="1">
                             <form string="Survey Question">
                                 <group>
@@ -393,8 +388,8 @@
                                         <field name="type" on_change="on_change_type(type)"/>
                                     </group>
                                     <group>
-                                        <field name="sequence"/>
-                                        <field name="tot_resp"/>
+                                        <field name="sequence" invisible="1"/>
+                                        <field name="tot_resp" invisible="1"/>
                                         <field name="in_visible_rating_weight" invisible="1"/>
                                         <field name="in_visible_menu_choice" invisible="1"/>
                                         <field name="in_visible_answer_type" invisible="1"/>
@@ -500,7 +495,7 @@
                                                         <field name="req_error_msg" colspan="4" nolabel="1"/>
                                                     </group>
                                                     <group colspan="4" attrs="{'invisible':[('type','!=','numerical_textboxes')]}">
-                                                        <group colspan="2" >
+                                                        <group colspan="2">
                                                             <field name="numeric_required_sum"/>
                                                         </group>
                                                         <newline/>
@@ -523,7 +518,7 @@
                             </form>
                             <tree string="Survey Question">
                                 <field name="sequence" string="Seq"/>
-                                <field name="question" colspan="4" select="1"/>
+                                <field name="question"/>
                                 <field name="answer_choice_ids"/>
                             </tree>
                             </field>

From ece36066cee814c2eb608b09a5cdb7b648ebbcc3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 10 Jul 2012 16:50:23 +0200
Subject: [PATCH 61/66] [FIX] typo in mail.js

bzr revid: nicolas.vanhoren@openerp.com-20120710145023-uqh8h8p2dbbfj6h9
---
 addons/mail/static/src/js/mail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 88f0b9ade43..2140bbe474a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -541,7 +541,7 @@ openerp.mail = function(session) {
             var self = this;
             this.reinit();
             if (! this.view.datarecord.id ||
-                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
                 this.$element.find('.oe_mail_thread').hide();
                 return;
             }

From 2d9afec3ced8657ad505956ff46a0d0ccbb8f9de Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Jul 2012 16:57:20 +0200
Subject: [PATCH 62/66] Removed the dot between kanban vignette labels

bzr revid: mit@openerp.com-20120710145720-ffyadv9ky0l4rwz7
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ef26f823422..cdcaf4f464d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -69,7 +69,7 @@ class mail_thread(osv.Model):
             subscriber_ids = self.message_get_subscribers(cr, uid, [id], context=context)
             res[id] = {
                 'message_ids': message_ids,
-                'message_summary': "<span><span class='oe_e'>9</span> %d</span> . <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
+                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (len(message_ids), len(subscriber_ids)),
             }
         return res
 

From ca89b972c313f591a62b4511e13a388941556e22 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Jul 2012 17:03:13 +0200
Subject: [PATCH 63/66] Restyling of labels in the kanban vignette

bzr revid: mit@openerp.com-20120710150313-m4q9j9o82mzwdwim
---
 addons/web_kanban/static/src/css/kanban.css  | 11 +++++++++--
 addons/web_kanban/static/src/css/kanban.sass | 10 ++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css
index 6d0ae1c3d3b..f16bd58bc5e 100644
--- a/addons/web_kanban/static/src/css/kanban.css
+++ b/addons/web_kanban/static/src/css/kanban.css
@@ -383,8 +383,9 @@
   display: inline-block;
   background: #e6e6e6;
   border: 1px solid #b9b9b9;
+  color: #666666;
   padding: 0 2px;
-  line-height: 22px;
+  line-height: 16px;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -393,10 +394,15 @@
   line-height: 12px;
   font-size: 22px;
 }
+.openerp .oe_kanban_view .oe_kanban_footer_left .oe_kanban_mail_new {
+  line-height: 18px;
+  position: relative;
+  top: -1px;
+}
 .openerp .oe_kanban_view .oe_kanban_bottom_right {
   float: right;
   position: relative;
-  top: 4px;
+  top: 2px;
 }
 .openerp .oe_kanban_view .oe_kanban_status {
   display: inline-block;
@@ -450,6 +456,7 @@
 }
 .openerp .oe_kanban_view .oe_dropdown_kanban .oe_dropdown_menu {
   left: 0;
+  top: 28px;
   min-width: 160px;
 }
 .openerp .oe_kanban_view .oe_kanban_colorpicker {
diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass
index 45f290fdd1e..9ba57befe31 100644
--- a/addons/web_kanban/static/src/css/kanban.sass
+++ b/addons/web_kanban/static/src/css/kanban.sass
@@ -325,16 +325,21 @@
             display: inline-block
             background: #E6E6E6
             border: 1px solid #B9B9B9
+            color: #666
             padding: 0 2px
-            line-height: 22px
+            line-height: 16px
             @include radius(3px)
             .oe_e
                 line-height: 12px
                 font-size: 22px
+        .oe_kanban_mail_new
+            line-height: 18px
+            position: relative
+            top: -1px
     .oe_kanban_bottom_right
         float: right
         position: relative
-        top: 4px
+        top: 2px
        
     .oe_kanban_status
         display: inline-block
@@ -369,6 +374,7 @@
             text-decoration: none
         .oe_dropdown_menu
             left: 0
+            top: 28px
             min-width: 160px
     // }}}
     // KanbanColorPicker {{{

From cdd0cba40743a929c51e77a619f74b4856b24ebb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 17:39:07 +0200
Subject: [PATCH 64/66] improved form partner

bzr revid: fp@tinyerp.com-20120710153907-jly8bpnsc4cbaubt
---
 openerp/addons/base/res/res_partner_view.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index d8760384c2c..f54390b435a 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -136,22 +136,23 @@
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div>
-                                    <field name="city" placeholder="City" style="width: 45%% !important"/>
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 20%% !important"/>
-                                    <field name="zip" placeholder="ZIP" style="width: 34%% !important"/>
+                                    <field name="city" placeholder="City" style="width: 40%%"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
                                 <field name="country_id" placeholder="Country" class="oe_no_button"/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
                         <group>
-                            <field name="function" placeholder="Job Position"
+                            <field name="function" placeholder="e.g. Sales Director"
                                 attrs="{'invisible': [('is_company','=', True)]}"/>
                             <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
                             <field name="mobile"/>
                             <field name="fax"/>
                             <field name="email" widget="email"/>
-                            <field name="title" domain="[('domain', '=', 'contact')]" attrs="{'invisible': [('is_company','=', True)]}"/>
+                            <field name="title" domain="[('domain', '=', 'contact')]"
+                                class="oe_no_button" attrs="{'invisible': [('is_company','=', True)]}"/>
                         </group>
                     </group>
 

From 3de5a56fd509dda10bcef6a412110e0bdddf1b7c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 18:29:21 +0200
Subject: [PATCH 65/66] [IMP] new wizard style

bzr revid: fp@tinyerp.com-20120710162921-kxlxfevs926820ah
---
 .../crm/wizard/crm_opportunity_to_phonecall_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 6c921b3f071..ccabcde88fe 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
-                        or
-                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="action"/>
@@ -34,6 +28,12 @@
                         </group>
                     </group>
                     <field name="note" placeholder="Call Description" />
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"  />
+                        or
+                        <button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>

From 64a9321d56a6f6a46cf153eafa85fb065327b025 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Jul 2012 18:40:11 +0200
Subject: [PATCH 66/66] [IMP] footer on forms

bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
---
 .../account_automatic_reconcile_view.xml      | 10 ++---
 .../wizard/account_change_currency_view.xml   | 10 ++---
 addons/account/wizard/account_chart_view.xml  | 10 ++---
 .../wizard/account_fiscalyear_close_view.xml  | 10 ++---
 .../wizard/account_invoice_refund_view.xml    | 10 ++---
 .../wizard/account_invoice_state_view.xml     | 32 +++++++-------
 .../wizard/account_journal_select_view.xml    | 14 +++----
 .../account_move_bank_reconcile_view.xml      | 10 ++---
 ...ccount_move_line_reconcile_select_view.xml | 10 ++---
 .../wizard/account_move_line_select_view.xml  |  6 +--
 ...ount_move_line_unreconcile_select_view.xml | 10 ++---
 .../account_open_closed_fiscalyear_view.xml   | 10 ++---
 .../wizard/account_period_close_view.xml      | 10 ++---
 ...account_reconcile_partner_process_view.xml |  6 +--
 .../account/wizard/account_reconcile_view.xml | 14 +++----
 ...count_report_aged_partner_balance_view.xml | 10 ++---
 .../wizard/account_report_common_view.xml     | 10 ++---
 .../wizard/account_state_open_view.xml        | 10 ++---
 .../account_subscription_generate_view.xml    | 10 ++---
 .../account/wizard/account_tax_chart_view.xml | 10 ++---
 .../wizard/account_unreconcile_view.xml       |  8 ++--
 .../account/wizard/account_use_model_view.xml | 16 +++----
 .../wizard/account_validate_move_view.xml     | 42 +++++++++----------
 addons/account/wizard/account_vat_view.xml    | 10 ++---
 .../account_crossovered_analytic_view.xml     | 10 ++---
 .../analytic_plan_create_model_view.xml       |  6 +--
 .../account_asset_change_duration_view.xml    | 10 ++---
 .../wizard/wizard_asset_compute_view.xml      | 10 ++---
 .../wizard/account_budget_analytic_view.xml   | 10 ++---
 ...account_budget_crossovered_report_view.xml | 10 ++---
 ...budget_crossovered_summary_report_view.xml | 10 ++---
 .../wizard/account_budget_report_view.xml     | 10 ++---
 .../wizard/account_followup_print_view.xml    | 10 ++---
 .../account_payment_create_order_view.xml     | 20 ++++-----
 .../wizard/account_payment_pay_view.xml       |  6 +--
 ...ccount_payment_populate_statement_view.xml | 10 ++---
 .../account_statement_from_invoice_view.xml   | 18 ++++----
 .../account_voucher_unreconcile_view.xml      |  8 ++--
 .../wizard/audittrail_view_log_view.xml       | 10 ++---
 .../base_calendar_invite_attendee_view.xml    | 10 ++---
 .../wizard/generate_relation_graph_view.xml   |  6 +--
 .../wizard/base_module_record_data_view.xml   | 10 ++---
 .../wizard/base_module_record_object_view.xml | 20 ++++-----
 .../wizard/base_module_save_view.xml          | 10 ++---
 .../wizard/base_report_design_view.xml        | 10 ++---
 .../board/wizard/board_menu_create_view.xml   | 10 ++---
 addons/caldav/wizard/caldav_browse_view.xml   |  6 +--
 .../wizard/calendar_event_import_view.xml     | 10 ++---
 .../wizard/calendar_event_subscribe_view.xml  | 10 ++---
 addons/crm/wizard/crm_add_note_view.xml       | 10 ++---
 .../wizard/crm_lead_to_opportunity_view.xml   | 20 ++++-----
 .../crm/wizard/crm_lead_to_partner_view.xml   | 10 ++---
 .../wizard/crm_merge_opportunities_view.xml   | 10 ++---
 .../crm_partner_to_opportunity_view.xml       | 10 ++---
 .../wizard/crm_phonecall_to_meeting_view.xml  |  6 +--
 .../crm_phonecall_to_opportunity_view.xml     | 10 ++---
 .../wizard/crm_phonecall_to_partner_view.xml  | 20 ++++-----
 .../crm_phonecall_to_phonecall_view.xml       | 12 +++---
 .../wizard/crm_forward_to_partner_view.xml    | 10 ++---
 .../wizard/open_questionnaire_view.xml        | 18 ++++----
 .../document_ftp/wizard/ftp_browse_view.xml   | 10 ++---
 .../wizard/email_compose_message_view.xml     | 12 +++---
 addons/event/wizard/event_confirm_view.xml    |  6 +--
 .../wizard/event_project_retro_view.xml       | 10 ++---
 .../wizard/google_login_view.xml              | 10 ++---
 .../wizard/hr_attendance_bymonth_view.xml     | 10 ++---
 .../wizard/hr_attendance_byweek_view.xml      | 10 ++---
 .../wizard/hr_attendance_error_view.xml       | 10 ++---
 .../wizard/hr_attendance_sign_in_out_view.xml | 12 +++---
 .../wizard/hr_evaluation_mail_view.xml        | 10 ++---
 .../hr_holidays_summary_department_view.xml   |  8 ++--
 .../hr_holidays_summary_employees_view.xml    | 10 ++---
 ...hr_recruitment_create_partner_job_view.xml |  6 +--
 .../hr_timesheet_print_employee_view.xml      | 10 ++---
 .../wizard/hr_timesheet_print_users_view.xml  |  8 ++--
 .../wizard/hr_timesheet_sign_in_out_view.xml  | 32 +++++++-------
 .../hr_timesheet_analytic_profit_view.xml     | 22 +++++-----
 ...hr_timesheet_invoice_create_final_view.xml | 10 ++---
 .../hr_timesheet_invoice_create_view.xml      | 10 ++---
 .../wizard/hr_timesheet_current_view.xml      | 10 ++---
 .../wizard/import_google_data_view.xml        | 20 ++++-----
 .../l10n_be_account_vat_declaration_view.xml  | 10 ++---
 .../l10n_be/wizard/l10n_be_vat_intra_view.xml | 12 +++---
 addons/l10n_ch/wizard/bvr_import_view.xml     | 10 ++---
 addons/l10n_ch/wizard/create_dta_view.xml     | 10 ++---
 .../l10n_fr/wizard/fr_report_bilan_view.xml   | 10 ++---
 .../fr_report_compute_resultant_view.xml      | 10 ++---
 addons/l10n_lu/wizard/print_vat_view.xml      | 10 ++---
 .../lunch/wizard/lunch_cashbox_clean_view.xml | 10 ++---
 .../lunch/wizard/lunch_order_cancel_view.xml  | 10 ++---
 .../lunch/wizard/lunch_order_confirm_view.xml | 10 ++---
 .../mail/wizard/mail_compose_message_view.xml | 10 ++---
 .../wizard/membership_invoice_view.xml        | 10 ++---
 .../mrp/wizard/change_production_qty_view.xml | 12 +++---
 addons/mrp/wizard/mrp_price_view.xml          | 10 ++---
 .../mrp/wizard/mrp_product_produce_view.xml   | 10 ++---
 .../mrp/wizard/mrp_workcenter_load_view.xml   | 10 ++---
 .../wizard/mrp_repair_cancel_view.xml         | 10 ++---
 .../wizard/mrp_repair_make_invoice_view.xml   | 12 +++---
 .../wizard/pos_payment_report_user_view.xml   | 10 ++---
 .../point_of_sale/wizard/pos_receipt_view.xml | 10 ++---
 .../point_of_sale/wizard/pos_return_view.xml  |  4 +-
 addons/portal/wizard/portal_wizard_view.xml   | 12 +++---
 .../wizard/make_procurement_view.xml          | 10 ++---
 .../wizard/mrp_procurement_view.xml           | 10 ++---
 .../wizard/orderpoint_procurement_view.xml    | 10 ++---
 .../wizard/schedulers_all_view.xml            | 10 ++---
 addons/product/wizard/product_price_view.xml  | 10 ++---
 .../wizard/product_margin_view.xml            | 10 ++---
 .../wizard/project_task_delegate_view.xml     | 10 ++---
 .../wizard/project_task_reevaluate_view.xml   | 10 ++---
 .../wizard/project_gtd_fill_view.xml          | 10 ++---
 .../wizard/project_compute_phases_view.xml    | 10 ++---
 .../wizard/project_compute_tasks_view.xml     | 10 ++---
 .../wizard/purchase_line_invoice_view.xml     | 10 ++---
 .../wizard/purchase_order_group_view.xml      | 10 ++---
 .../purchase_requisition_partner_view.xml     | 10 ++---
 .../wizard/report_webkit_actions_view.xml     | 10 ++---
 addons/sale_crm/wizard/crm_make_sale_view.xml | 10 ++---
 addons/share/wizard/share_wizard_view.xml     | 28 ++++++-------
 .../wizard/stock_change_product_qty_view.xml  | 10 ++---
 .../stock_change_standard_price_view.xml      | 10 ++---
 .../wizard/stock_fill_inventory_view.xml      | 10 ++---
 .../stock_inventory_line_split_view.xml       | 10 ++---
 .../wizard/stock_inventory_merge_view.xml     |  8 ++--
 .../wizard/stock_invoice_onshipping_view.xml  | 10 ++---
 .../wizard/stock_location_product_view.xml    | 10 ++---
 addons/stock/wizard/stock_move_view.xml       | 26 ++++++------
 .../stock/wizard/stock_partial_move_view.xml  |  8 ++--
 .../wizard/stock_partial_picking_view.xml     | 10 ++---
 .../wizard/stock_return_picking_view.xml      | 10 ++---
 addons/stock/wizard/stock_splitinto_view.xml  | 10 ++---
 .../stock_planning_create_periods_view.xml    | 12 +++---
 .../stock_planning_createlines_view.xml       | 10 ++---
 .../wizard/stock_planning_forecast_view.xml   | 10 ++---
 addons/wiki/wizard/wiki_create_menu_view.xml  | 10 ++---
 addons/wiki/wizard/wiki_make_index_view.xml   |  8 ++--
 addons/wiki/wizard/wiki_show_diff_view.xml    |  6 +--
 .../wiki/wizard/wiki_wiki_page_open_view.xml  |  6 +--
 139 files changed, 772 insertions(+), 772 deletions(-)

diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index d0ff56924e9..be1776497b3 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -8,11 +8,6 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Reconciliation"/>
                     <label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
                     <field name="account_ids" domain="[('reconcile','=',1)]"/>
@@ -26,6 +21,11 @@
                         <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                         <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
                     </group>
+                    <footer>
+                        <button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
          </record>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 322c33aec76..7e33e61eec8 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
-                    <header>
-                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="This wizard will change the currency of the invoice">
                         <field name="currency_id"/>
                     </group>
+                    <footer>
+                        <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 83c49fe665a..d7820caa647 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4">
                         <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
                         <field name="target_move"/>
@@ -20,6 +15,11 @@
                         <field name="period_from"/>
                         <field name="period_to"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_fiscalyear_close_view.xml b/addons/account/wizard/account_fiscalyear_close_view.xml
index 8827edba591..8c4df8548f6 100644
--- a/addons/account/wizard/account_fiscalyear_close_view.xml
+++ b/addons/account/wizard/account_fiscalyear_close_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Fiscal Year Opening Entries" version="7.0">
-                    <header>
-                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Generate Fiscal Year Opening Entries"/>
                     <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
                     <newline/>
@@ -22,6 +17,11 @@
                         <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
                         <field name="report_name"/>
                     </group>
+                    <footer>
+                        <button string="Create" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 9d38b2034bd..08db574e9ac 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
-                    <header>
-                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Credit Note Options"/>
                     <group col="4">
                          <field name="description"/>
@@ -24,6 +19,11 @@
                     <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
                     <label string="Credit Note: Creates the credit note, ready for editing."/>
                     <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
+                    <footer>
+                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 5658143f4e1..0ea2eefebc5 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,14 +6,14 @@
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Confirm Draft Invoices" version="7.0">
-	                <header>
-	                    <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Confirm Draft Invoices"/>
-	            </form>
+                <form string="Confirm Draft Invoices" version="7.0">
+                    <separator string="Confirm Draft Invoices"/>
+                    <footer>
+                        <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -28,14 +28,14 @@
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Cancel Selected Invoices" version="7.0">
-	                <header>
-	                    <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Cancel Selected Invoices"/>
-	            </form>
+                <form string="Cancel Selected Invoices" version="7.0">
+                    <separator string="Cancel Selected Invoices"/>
+                    <footer>
+                        <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index e2dcc05c266..af0b50168de 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -7,14 +7,14 @@
             <field name="model">account.journal.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Journal Select" version="7.0">
-	                <header>
-	                    <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Journal Select" version="7.0">
                     <label string="Are you sure you want to open Journal Entries?"/>
-	            </form>
+                    <footer>
+                        <button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 02509137af5..58707c0d605 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="journal_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 862ffa0956e..1e36cc8bafe 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                          <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 1d405ae02aa..ade86e29c50 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account Select" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to open Account move line entries?"/>
+                    <footer>
                         <button string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string="Are you sure you want to open Account move line entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index ff4811f781c..63ba44ba8a7 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Unreconciliation" version="7.0">
-                    <header>
-                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="account_id"/>
                     </group>
+                    <footer>
+                        <button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index bedc1028b4a..7f950e4cf53 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Choose Fiscal Year " version="7.0">
-                    <header>
-                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="fyear_id" domain="[('state','=','draft')]"/>
                     </group>
+                    <footer>
+                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index c285db512cf..c6aa828e3ce 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close Period" version="7.0">
-                    <header>
-                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Are you sure?">
                         <field name="sure"/>
                     </group>
+                    <footer>
+                        <button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_partner_process_view.xml b/addons/account/wizard/account_reconcile_partner_process_view.xml
index 552907da0c8..ffa298bf22d 100644
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner Reconciliation" version="7.0">
-                    <header>
-                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
-                    </header>
                     <group col="4">
                         <field name="next_partner_id"/>
                         <field name="progress" widget="progressbar" colspan="4"/>
                         <field name="today_reconciled"/>
                         <field name="to_reconcile"/>
                     </group>
+                    <footer>
+                        <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight"  />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 4fb418e4fad..d6344f2cbc1 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -8,13 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation" version="7.0">
-                    <header>
-                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
-                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4" string="Reconciliation Transactions">
                         <field name="trans_nbr"/>
                         <newline/>
@@ -23,6 +16,13 @@
                     </group><group string="Write-Off">
                         <field name="writeoff"/>
                     </group>
+                    <footer>
+                        <button string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
+                        <button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        <button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 575af9370db..0e82603ced1 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -9,11 +9,6 @@
             <!--<field name="inherit_id" ref="account_common_report_view" />-->
             <field name="arch" type="xml">
                 <form string="Report Options" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
                     <group col="4">
@@ -26,6 +21,11 @@
                         <field name="direction_selection"/>
                     </group>
                     <field name="journal_ids" required="0" invisible="1"/>
+                    <footer>
+                        <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml
index b391764f6c7..2711154a35e 100644
--- a/addons/account/wizard/account_report_common_view.xml
+++ b/addons/account/wizard/account_report_common_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Report Options" version="7.0">
-                <header>
-                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                    or 
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string=""/>  <!-- binding for inherited views -->
                 <group col="4">
                    <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
@@ -38,6 +33,11 @@
                         <field name="journal_ids"/>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                    or 
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_state_open_view.xml b/addons/account/wizard/account_state_open_view.xml
index 56b72f120d2..5e53fb66d0f 100644
--- a/addons/account/wizard/account_state_open_view.xml
+++ b/addons/account/wizard/account_state_open_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Invoice" version="7.0">
-                    <header>
-                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <label string="Are you sure you want to open this invoice ?"/>
                     <newline/>
                     <label string="(Invoice should be unreconciled if you want to open it)"/>
+                    <footer>
+                        <button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index 2132851a3fe..64ca3beeb11 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute" version="7.0">
-                    <header>
-                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Generate Entries before:"/>
                     <label string ="Automatically generate entries based on what has been entered in the  system before a specific date."/>
                     <group>
                         <field name="date"/>
                     </group>
+                    <footer>
+                        <button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml
index 0db91912c5e..ea0c68f739f 100644
--- a/addons/account/wizard/account_tax_chart_view.xml
+++ b/addons/account/wizard/account_tax_chart_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account tax charts" version="7.0">
-                    <header>
-                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="period_id"/>
                         <label colspan="4" string="(If you do not select period it will take all open periods)"/>
                         <field name="target_move"/>
                     </group>
+                    <footer>
+                        <button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_unreconcile_view.xml b/addons/account/wizard/account_unreconcile_view.xml
index bec668c29ec..dc3cf7b748a 100644
--- a/addons/account/wizard/account_unreconcile_view.xml
+++ b/addons/account/wizard/account_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliate Transactions"/>
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                <footer>
                     <button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
                     or                    
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliate Transactions"/>
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 899befeaa0a..777ab38fddf 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <form string="Create Entries From Models" version="7.0">
-	                <header>
-	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
 	                <separator string="This wizard will create recurring accounting entries"/>
 	                <label string="Create manual recurring entries in a chosen journal."/>
 	                <group>
 	                    <field name="model"/>
 	                </group>
+	                <footer>
+	                    <button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
+	                    or
+	                    <button string="Cancel" class="oe_link" special="cancel"/>
+	                </footer>
 	            </form>
             </field>
         </record>
@@ -40,12 +40,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model" version="7.0">
-                    <header>
+                    <label string = "Are you sure you want to create entries?"/>
+                    <footer>
                         <button string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <label string = "Are you sure you want to create entries?"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index d5b1cff4533..abadb57c4e7 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -8,19 +8,19 @@
             <field name="model">validate.account.move</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
-	                <separator string="Post Journal Entries of a Journal"/>
-	                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
-	                <group>
-	                    <field name="journal_id"/>
-	                    <field name="period_id"/>
-	                </group>
-	            </form>
+                <form string="Post Journal Entries" version="7.0">
+                    <separator string="Post Journal Entries of a Journal"/>
+                    <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
+                    <group>
+                        <field name="journal_id"/>
+                        <field name="period_id"/>
+                    </group>
+                    <footer>
+                        <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -47,15 +47,15 @@
             <field name="model">validate.account.move.lines</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-	            <form string="Post Journal Entries" version="7.0">
-	                <header>
-	                    <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
-	                    or
-	                    <button string="Cancel" class="oe_link" special="cancel"/>
-	                </header>
+                <form string="Post Journal Entries" version="7.0">
                     <separator string="Post Journal Entries"/>
-	                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
-	            </form>
+                    <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."/>
+                    <footer>
+                        <button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 91ea78d7bd6..988c4786bb8 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <header>
-                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
@@ -25,6 +20,11 @@
                     <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                     <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                 </group>
+                <footer>
+                    <button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
index ae95f0f7584..c25705572d1 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Crossovered Analytic" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group col="4">
                     <field name="date1"/>
                     <field name="date2"/>
@@ -21,6 +16,11 @@
                 </group><group string="Analytic Journal">
                     <field name="journal_ids" colspan="2" nolabel="1"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
index b67e61bafc6..5b8a11f2587 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
@@ -7,12 +7,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Distribution Model Saved" version="7.0">
-                <header>
+                <label string="Save This Distribution as a Model"/>
+                <footer>
                     <button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <label string="Save This Distribution as a Model"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 1e8f0f969b7..15b11f4dcff 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Modify Asset" version="7.0">
-                    <header>
-                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Asset Durations to Modify" col="4">
                         <field name="name" colspan="4"/>
                         <group colspan="2" col="2">
@@ -23,6 +18,11 @@
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
+                    <footer>
+                        <button name="modify" string="Modify" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_asset/wizard/wizard_asset_compute_view.xml b/addons/account_asset/wizard/wizard_asset_compute_view.xml
index fee7f77d758..45d3aa22625 100644
--- a/addons/account_asset/wizard/wizard_asset_compute_view.xml
+++ b/addons/account_asset/wizard/wizard_asset_compute_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compute Asset" version="7.0">
-                    <header>
-                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Post Depreciation Lines"/>
                     <label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
                     <group>
                         <field name="period_id"/>
                     </group>
+                    <footer>
+                        <button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_analytic_view.xml b/addons/account_budget/wizard/account_budget_analytic_view.xml
index 44e0e9aa3a4..c08f15a7410 100644
--- a/addons/account_budget/wizard/account_budget_analytic_view.xml
+++ b/addons/account_budget/wizard/account_budget_analytic_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                      <group string="This wizard is used to print budget" col="4">
                          <field name="date_from"/>
                          <field name="date_to"/>
                      </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
index ee83d272edf..5f2ec7ee46c 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print budget" col="4">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
index ddfd3d00068..3e02604b746 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
@@ -8,15 +8,15 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form string="Select Dates Period" version="7.0">
-                     <header>
-                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                         or
-                         <button string="Cancel" class="oe_link" special="cancel"/>
-                     </header>
                     <group string="This wizard is used to print summary of budgets">
                         <field name="date_from"/>
                         <field name="date_to"/>
                     </group>
+                     <footer>
+                         <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                         or
+                         <button string="Cancel" class="oe_link" special="cancel"/>
+                     </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_budget/wizard/account_budget_report_view.xml b/addons/account_budget/wizard/account_budget_report_view.xml
index afdeb62e8ed..984cbeefeef 100644
--- a/addons/account_budget/wizard/account_budget_report_view.xml
+++ b/addons/account_budget/wizard/account_budget_report_view.xml
@@ -8,15 +8,15 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
           <form string="Select Dates Period" version="7.0">
-              <header>
-                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
-                  or
-                  <button string="Cancel" class="oe_link" special="cancel"/>
-              </header>
               <group string="Print Budgets" col="4">
                   <field name="date_from"/>
                   <field name="date_to"/>
               </group>
+              <footer>
+                  <button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
+                  or
+                  <button string="Cancel" class="oe_link" special="cancel"/>
+              </footer>
           </form>
         </field>
       </record>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 058feedcde3..084de5c2ae6 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Send follow-ups" version="7.0">
-                <header>
-                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <separator string="Send Follow-ups"/>
                 <label string ="This feature allows you to send reminders to partners with pending invoices. 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."/>
                 <group col="4">
                     <field name="followup_id"/>
                     <field name="date"/>
                 </group>
+                <footer>
+                    <button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_create_order_view.xml b/addons/account_payment/wizard/account_payment_create_order_view.xml
index 220c592f6b5..ab90144f0e2 100644
--- a/addons/account_payment/wizard/account_payment_create_order_view.xml
+++ b/addons/account_payment/wizard/account_payment_create_order_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Search Payment lines" version="7.0">
-                <header>
-                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
                 <group>
                     <field name="duedate" />
                 </group>
+                <footer>
+                    <button name="search_entries" string="Search" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
@@ -26,14 +26,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Search Payment lines" version="7.0">
-                    <header>
-                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Entries">
                         <field name="entries"/>
                     </group>
+                    <footer>
+                        <button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_pay_view.xml b/addons/account_payment/wizard/account_payment_pay_view.xml
index ee86ed75a41..1053d47eebd 100644
--- a/addons/account_payment/wizard/account_payment_pay_view.xml
+++ b/addons/account_payment/wizard/account_payment_pay_view.xml
@@ -8,12 +8,12 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Make Payment" version="7.0">
-                    <header>
+                    <separator string="Are you sure you want to make payment?"/>
+                    <footer>
                         <button name="launch_wizard" string="Yes" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Are you sure you want to make payment?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_payment/wizard/account_payment_populate_statement_view.xml b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
index de1885b1014..c2789f95d38 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement_view.xml
+++ b/addons/account_payment/wizard/account_payment_populate_statement_view.xml
@@ -8,14 +8,14 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
                 <form string="Populate Statement:" version="7.0">
-                    <header>
-                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="lines"/>
                     </group>
+                    <footer>
+                        <button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
              </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 5ecb4cd07bb..33014f394a7 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Invoices in Statement" version="7.0">
-                    <header>
-                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="date"/>
                         <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
                     </group>
+                    <footer>
+                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Entries" version="7.0">
-                    <header>
+                    <separator string="Payable and Receivables"/>
+                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    <footer>
                         <button string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Payable and Receivables"/>
-                    <field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
index 3bfb0fcb4ec..04131b643eb 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
              <form string="Unreconciliation" version="7.0">
-                <header>
+                <separator string="Unreconciliation Transactions" />
+                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                <footer>
                     <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <separator string="Unreconciliation Transactions" />
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
+                </footer>
              </form>
             </field>
         </record>
diff --git a/addons/audittrail/wizard/audittrail_view_log_view.xml b/addons/audittrail/wizard/audittrail_view_log_view.xml
index b66173323e2..fdfffb73c23 100644
--- a/addons/audittrail/wizard/audittrail_view_log_view.xml
+++ b/addons/audittrail/wizard/audittrail_view_log_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Audit Logs" version="7.0">
-                    <header>
-                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4">
                          <field name="from"/>
                          <field name="to"/>
                     </group>
+                    <footer>
+                        <button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index a16715e0d52..3bdb9144907 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
-                    <header>
-                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <separator string="Invite People" colspan="4"/>
                     <field name="type"/>
                     <field name="send_mail"/>
@@ -36,6 +31,11 @@
                             </group>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
index 1abd6ff3570..4072db42318 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Generate Relationship Graph" version="7.0">
-                    <header>
+                    <separator string="Relationship Graphs" colspan="6"/>
+                    <footer>
                         <button name="get_graph" string="Create Graphs" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Relationship Graphs" colspan="6"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 93c38d794f4..281576b0b6a 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index b947c94f871..a621ae69547 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
-                    <header>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group>
                         <field name="check_date"/>
                         <field name="filter_cond"/>
@@ -20,6 +15,11 @@
                     <separator string="Choose objects to record"/>
                     <field name="objects"/>
                     <group><field name="info_yaml"/></group>
+                    <footer>
+                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -86,11 +86,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Module Information">
                         <field name="name"/>
                         <field name="directory_name"/>
@@ -102,6 +97,11 @@
                     </group>
                     <separator string="Description"/>
                     <field name="description"/>
+                    <footer>
+                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
          </record>
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index 106ad662b0f..39943697d4f 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording" version="7.0">
-                    <header>
-                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group string="Recording Information">
                         <field name="info_status"/>
                         <field name="info_text"/>
                         <field name="info_yaml"/>
                    </group>
+                    <footer>
+                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index c060f4a961a..12ac67e3ba0 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Get a report" version="7.0">
-                <header>
+                <group string="Select your report">
+                    <field name="report_id"/>
+                </group>
+                <footer>
                     <button name="get_report" string="Continue" type="object" class="oe_highlight"/>
                     <button name="upload_report" string="Upload the modified report" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
-                </header>
-                <group string="Select your report">
-                    <field name="report_id"/>
-                </group>
+                </footer>
             </form>
             </field>
        </record>
diff --git a/addons/board/wizard/board_menu_create_view.xml b/addons/board/wizard/board_menu_create_view.xml
index 3720e87cf43..122dcfe9586 100644
--- a/addons/board/wizard/board_menu_create_view.xml
+++ b/addons/board/wizard/board_menu_create_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu For Dashboard" version="7.0">
-                    <header>
-                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" string="Menu Information">
                         <field name="menu_name"/>
                         <field name="menu_parent_id"/>
                     </group>
+                    <footer>
+                        <button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 29f455d764f..0c16fd0eba4 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -8,9 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Caldav" version="7.0">
-                    <header>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                    </header>
                     <sheet>
                         <group>
                             <separator string="Browse Caldav" colspan="4"/>
@@ -37,6 +34,9 @@
                             
                         </group>
                     </sheet>
+                    <footer>
+                        <button special="cancel" string="_Close" icon="gtk-close"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
index 3f498504444..014f5500384 100644
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ b/addons/caldav/wizard/calendar_event_import_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import ICS" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Select ICS File"/>
                          <field name="file_path" colspan="4" width="500" nolabel="1"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
index 590daa34561..0601349690d 100644
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ b/addons/caldav/wizard/calendar_event_subscribe_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscribe to Remote Calendar" version="7.0">
-                    <header>
-                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group colspan="4" >
                          <separator string="Provide Path for Remote Calendar"/>
                           <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_add_note_view.xml b/addons/crm/wizard/crm_add_note_view.xml
index 93551eaf943..fc4b57f85dc 100644
--- a/addons/crm/wizard/crm_add_note_view.xml
+++ b/addons/crm/wizard/crm_add_note_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Note" version="7.0">
-                    <header>
-                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Add Note"/>
                         <field name="body"/>
                     </group>
+                    <footer>
+                        <button name="action_add" type="object" string="_Add" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index a240a4de66c..5ad9ef1c9c9 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -6,11 +6,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <group attrs="{'invisible':[('action','!=','exist')]}">
                         <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
@@ -27,6 +22,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
@@ -37,11 +37,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <header>
-                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="action"/>
                     <field name="name" colspan="4"/>
                     <group string="Assigned Opportunities to">
@@ -53,6 +48,11 @@
                             <field name="name" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_lead_to_partner_view.xml b/addons/crm/wizard/crm_lead_to_partner_view.xml
index ce12d62f9bf..a430c943d5d 100644
--- a/addons/crm/wizard/crm_lead_to_partner_view.xml
+++ b/addons/crm/wizard/crm_lead_to_partner_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create a Partner" version="7.0">
-                  <header>
-                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <separator string="Create a Partner"/>
                       <field name="action"/>
                       <field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
                   </group>
+                  <footer>
+                      <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 99de31afc15..74973193f24 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Opportunities" version="7.0">
-                    <header>
-                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
@@ -24,6 +19,11 @@
                             <field name="section_id" />
                         </tree>
                     </field>
+                    <footer>
+                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 3f37a0b6fa1..8bc97ba141b 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -9,17 +9,17 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
               <form string="Create Opportunity" version="7.0">
-                  <header>
-                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <group col="4">
                       <field name="name"/>
                       <field name="partner_id"/>
                       <field name="planned_revenue"/>
                       <field name="probability"/>
                   </group>
+                  <footer>
+                      <button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
index 85d0bf4bc47..00f6700e5a5 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_meeting_view.xml
@@ -11,13 +11,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Meeting" version="7.0">
-                    <header>
+                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    <footer>
                         <button name="action_make_meeting" type="object"
                             string="_Schedule" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure to schedule a Meeting for this Phonecall?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 1dc14786cc3..5304bd8beb5 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
-                    <header>
-                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="name"/>
                         <field name="partner_id" />
                         <field name="planned_revenue"/>
                         <field name="probability"/>
                     </group>
+                    <footer>
+                        <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
index 3281acdeec3..1243d7bc456 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_partner_view.xml
@@ -9,14 +9,14 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <label string="Are you sure you want to create a partner based on this Phonecall ?"/>
                 <newline/>
                 <label string="You may have to verify that this partner does not exist already."/>
+                <footer>
+                    <button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
         </field>
        </record>
@@ -29,15 +29,15 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Create a Partner" version="7.0">
-                <header>
-                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="action"/>
                     <field name="partner_id" attrs="{'required':[('action','=','exist')],'invisible':[('action','!=','exist')]}" />
                 </group>
+                <footer>
+                    <button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 7319c1b0437..25f7dd0ba81 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -10,12 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Schedule/Log a Call" version="7.0">
-                    <header>
-                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
-                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="action"/>
                         <field name="name"/>
@@ -24,6 +18,12 @@
                         <field name="user_id" />
                         <field name="section_id"/>
                     </group>
+                    <footer>
+                        <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
+                        <button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 4fda17b5264..e70a053305f 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <header>
-                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Forward to Partner" colspan="4" />
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
@@ -46,6 +41,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 04dca6da22f..4a1291f01aa 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Questionnaires" version="7.0">
-                    <header>
-                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="questionnaire_id"/>
                     </group>
+                    <footer>
+                        <button name="build_form" string="Open Questionnaire" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -35,13 +35,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator colspan="4" string="Questionnaire"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index a0656b5597d..52f012a92ff 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Document" version="7.0">
-                    <header>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="url" widget="url"/>
                     </group>
+                    <footer>
+                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml
index efe0074b313..96ea55da9e5 100644
--- a/addons/email_template/wizard/email_compose_message_view.xml
+++ b/addons/email_template/wizard/email_compose_message_view.xml
@@ -9,12 +9,12 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//form/header/button" position="before">
-						<field name="use_template" invisible="1"/>
-						<button icon="gtk-paste" type="object" name="template_toggle"
-						        string="" help="Use a message template" />
-						<button icon="gtk-save" type="object" name="save_as_template"
-						        string="" help="Save as a new template"/>
+                    <xpath expr="//form/footer/button" position="before">
+                        <field name="use_template" invisible="1"/>
+                        <button icon="gtk-paste" type="object" name="template_toggle"
+                                string="" help="Use a message template" />
+                        <button icon="gtk-save" type="object" name="save_as_template"
+                                string="" help="Save as a new template"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
diff --git a/addons/event/wizard/event_confirm_view.xml b/addons/event/wizard/event_confirm_view.xml
index 93b9830ef82..12d8555b0ab 100644
--- a/addons/event/wizard/event_confirm_view.xml
+++ b/addons/event/wizard/event_confirm_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Event Confirmation" version="7.0">
-                  <header>
+                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  <footer>
                       <button name="confirm" string="Confirm Anyway" type="object" class="oe_highlight"/>
                       or
                       <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
-                  <label string="Warning: This Event has not reached its Minimum Registration Limit. Are you sure you want to confirm it?"/>
+                  </footer>
             </form>
             </field>
         </record>
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
index cfac9944d1b..b7ab7a55357 100644
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ b/addons/event_project/wizard/event_project_retro_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Retro-Planning" version="7.0">
-                   <header>
-                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
-                       or
-                       <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="project_id" colspan="4"/>
                        <field name="date_start"/>
                        <field name="date"/>
                    </group>
+                   <footer>
+                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
+                       or
+                       <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
               </form>
             </field>
         </record>
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
index acd9e622b01..ddbd4db7ee2 100644
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ b/addons/google_base_account/wizard/google_login_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Google login"  version="7.0">
-                    <header>
-                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user" placeholder="user@gmail.com"/>
                         <field name="password" password="True"/>
                     </group>
+                    <footer>
+                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index 3bf762b0f50..c9daaffbe4c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Monthly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="month"/>
                     <field name="year"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index e4f6ec33bcb..554355edbb1 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Weekly" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group>
                     <field name="init_date"/>
                     <field name="end_date"/>
                 </group>    
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index 0657855c549..4e284cd396c 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -8,17 +8,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Print Attendance Report Error" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Analysis Information" col="4">
                     <field name="init_date"/>
                     <field name="end_date"/>
                     <field name="max_delay"/>
                 </group>
                 <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index acc1f5e01b0..96d924f88a7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign in / Sign out" version="7.0">
-                    <header>
-                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
-                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator colspan="4" string="Sign in / Sign out"/>
                         <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
@@ -22,6 +16,12 @@
                     <field name="name" />
                     <field name="state" />
                     </group>
+                    <footer>
+                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
+                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
index 5be8871446a..fffdf76f0e9 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
@@ -8,14 +8,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Evaluation Reminders" version="7.0">
-                <header>
-                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Send Evaluation Reminder">
                     <field name="evaluation_id"/>
                 </group>
+                <footer>
+                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
              </form>
         </field>
     </record>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index c5e408a6748..c0bbf741277 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Leaves by Department" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" class="oe_highlight"/> or
-                    <button string="Cancel" special="cancel" class="oe_link"/>
-                </header>
                 <group>
                     <field name="date_from" />
                     <field name="holiday_type"/>
                     <field name="depts"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/> or
+                    <button string="Cancel" special="cancel" class="oe_link"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index 4ef2dcc96c4..976d732ee69 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leaves Summary" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" colspan="6">
                         <field name="date_from"/>
                         <newline/>
@@ -20,6 +15,11 @@
                         <newline/>
                         <field name="emp" invisible="True"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 985f6b25eec..cf8a30c9847 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -8,12 +8,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Convert To Partner" version="7.0">
-                    <header>
+                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    <footer>
                         <button name="make_order" string="Create Contact" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
                         <label string="or" groups="base.group_partner_manager"/>
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Are you sure you want to create a contact based on this job request ?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index d14646b0249..afcf64808b7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -9,16 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employee Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4">
                         <field name="month"/>
                         <field name="year"/>
                         <field name="employee_id" colspan="3"/>
                     </group>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 288a51e34cd..8ead6ea63d6 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -9,10 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Monthly Employees Timesheet" version="7.0">
-                    <header>
-                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <sheet>
                         <group>
                              <label for="month" string="Period"/>
@@ -25,6 +21,10 @@
                             <field name="employee_ids" nolabel="1"/>
                         </group>
                     </sheet>
+                    <footer>
+                        <button string="Print" name="print_report" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index c7b7f320c37..dc2a6c47b8d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator colspan="4" string="Sign In/Out by Project"/>
                         <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
                     </group>
+                    <footer>
+                        <button string="Sign in / Sign out" name="check_state" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -26,11 +26,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
                         <field name="name" readonly="True" />
@@ -40,6 +35,11 @@
                         <field name="date"/>
                         <label string="(Keep empty for current time)" colspan="2"/>
                     </group>
+                    <footer>
+                        <button string="Start Working" name="sign_in_result" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
@@ -60,12 +60,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sign In/Out by Project" version="7.0">
-                    <header>
-                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
-                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
                         <field name="name" readonly="True" />
@@ -80,6 +74,12 @@
                         <field name="analytic_amount"/>
                     </group>
 
+                    <footer>
+                        <button string="Change Work" name="sign_out_result" type="object" class="oe_highlight"/>
+                        <button string="Stop Working" name="sign_out_result_end" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 4e4eb7b36d2..f0679de8d95 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -7,27 +7,27 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Timesheet Profit" version="7.0">
-                   <header>
-                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
-                        <button special="cancel" string="Cancel" class="oe_link"/>
-                   </header>
+                <form string="Timesheet Profit" version="7.0">
                    <sheet>
                        <group> 
-                           <label for="date_from" string="Duration" />					
+                           <label for="date_from" string="Duration" />
                            <div>
- 						       <field name="date_from" nolabel="1" class="oe_inline" />
+                               <field name="date_from" nolabel="1" class="oe_inline" />
                                - <field name="date_to" nolabel="1" class="oe_inline"/>
                            </div>
                        </group>
                        <group>
                            <separator string="Journals" colspan="4"/>
-						   <field name="journal_ids" colspan="4" nolabel="1"/>
+                           <field name="journal_ids" colspan="4" nolabel="1"/>
                            <separator string="Users" colspan="4"/>
-						   <field name="employee_ids" colspan="4" nolabel="1"/>
-					   </group>
+                           <field name="employee_ids" colspan="4" nolabel="1"/>
+                       </group>
                    </sheet>
-			   </form>
+                   <footer>
+                        <button name="print_report" string="Print" colspan="1" type="object" class="oe_highlight"/> or
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                   </footer>
+               </form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 28e8662f010..85d9538cc5b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -27,11 +27,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
                     <field name="time"/>
@@ -39,6 +34,11 @@
                     <field name="price"/>
                     <separator string="Force to use a special product" colspan="4"/>
                     <field name="product"/>
+                <footer>
+                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index aec0b52d5e6..1c163a1ac0e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
-                <header>
-                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <notebook>
                     <page string="Billing Data">
                        <group>
@@ -28,6 +23,11 @@
                        </group>
                     </page>
                 </notebook>
+                <footer>
+                    <button name="do_create" string="Create Invoices" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 2c04f116b48..b2dfabb310e 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -7,14 +7,14 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="My Current Timesheet" version="7.0">
-               <header>
-                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-               </header>
                <group>
                     <separator string="It will open your current timesheet"/>
                </group>
+               <footer>
+                    <button name="open_timesheet" string="Open" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+               </footer>
            </form>
         </field>
     </record>
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 2968b009a51..b8adc71f2a5 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="430">
                        <field name="group_name" colspan="4"/>
                        <newline/>
@@ -21,6 +16,11 @@
                             <field name="supplier"  colspan="4"/>
                        </group>
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -33,14 +33,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events" version="7.0">
-                    <header>
-                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group colspan="4" col="4" width="320">
                        <field name="calendar_name" />
                     </group>
+                    <footer>
+                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 357dc78c9d7..30ff9a9ed8f 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Periodical VAT Declaration" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group string="Declare Periodical VAT">
                             <field name="period_id" widget="selection"/>
@@ -26,6 +21,11 @@
                     </group>
                     <separator string="Comments"/>
                     <field name="comments"/>
+                    <footer>
+                        <button name="create_xml" string="Create XML" type="object" default_focus="1" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index d4bcd756922..f0bdb2a2a3f 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@ -8,12 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Partner VAT intra" version="7.0">
-                    <header>
-                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
-                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Intracom VAT Declaration"/>
                     </group>   
@@ -33,6 +27,12 @@
                             <field name="country_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="create_xml" string="Create _XML" type="object" class="oe_highlight"/>
+                        <button name="preview" string="_Preview" type="object" class="oe_highlight" />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/bvr_import_view.xml b/addons/l10n_ch/wizard/bvr_import_view.xml
index ed704810e45..222aad3b6b9 100644
--- a/addons/l10n_ch/wizard/bvr_import_view.xml
+++ b/addons/l10n_ch/wizard/bvr_import_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="BVR Import" version="7.0">
-                    <header>
-                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="file"/>
                     </group>
+                    <footer>
+                        <button name="import_bvr" string="Import" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml
index 1340d869941..7e9d5894dfc 100644
--- a/addons/l10n_ch/wizard/create_dta_view.xml
+++ b/addons/l10n_ch/wizard/create_dta_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="DTA file creation - Results" version="7.0">
-                    <header>
-                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="dta_file"/>
                     </group>
+                    <footer>
+                        <button name="create_dta" string="Create DTA" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_bilan_view.xml b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
index 440c182e336..f5358d9dd42 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_bilan_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bilan Report" version="7.0">
-                   <header>
-                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group>
                         <field name="fiscalyear_id"/>
                    </group>
+                   <footer>
+                        <button name="print_bilan_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
index d9f71c2ef3e..9d9b3b91c71 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string='Compte de resultat' version="7.0">
-                    <header>
-                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="fiscalyear_id"/>
                     </group>
+                    <footer>
+                        <button name="print_cdr_report" string="Print" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/l10n_lu/wizard/print_vat_view.xml b/addons/l10n_lu/wizard/print_vat_view.xml
index e5c13e7e4c4..1f60096e815 100644
--- a/addons/l10n_lu/wizard/print_vat_view.xml
+++ b/addons/l10n_lu/wizard/print_vat_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Print Tax Statements" version="7.0">
-                   <header>
-                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                   </header>
                    <group col="4">
                        <field name="tax_code_id" widget="selection"/>
                        <field name="period_id" widget="selection"/>
                    </group>
+                   <footer>
+                        <button name="print_vat_declaration_report" string="Print Tax Statements" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                   </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
index 287d283e212..eb05c0dc304 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reset cashbox" version="7.0">
-                    <header>
-                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Are you sure you want to reset this cashbox ?"/>
                     </group>
+                    <footer>
+                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
           </record>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index cd96b9765c9..cb10eb57fd0 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Order" version="7.0">
-                    <header>
-                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" >
                         <label string="Are you sure you want to cancel this order ?"/>
                    </group>
+                    <footer>
+                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index ade5b227cc2..282b79539f8 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Confirm" version="7.0">
-                    <header>
-                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                          <separator string="Orders Confirmation" colspan="4"/>
                          <field name="confirm_cashbox"/>
                    </group>
+                    <footer>
+                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                </form>
             </field>
         </record>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 3da63fb1adc..bcc11c4111d 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
-                    <header>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
@@ -33,6 +28,11 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
+                    <footer>
+                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index 7c26f5486ce..e97ad7445df 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Membership Invoice" version="7.0">
-                    <header>
-                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" domain="[('membership','=',True)]" widget="selection" on_change="onchange_product(product_id)"/>
                         <field name="member_price"/>
                     </group>
+                    <footer>
+                        <button string="Join" name="membership_invoice" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index ee7f5eeb258..87b180f0aad 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Qty" version="7.0">
-                    <header>
-                        <button name="change_prod_qty" string="Approve"
-                            colspan="1" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
                     <group>
                         <separator string="Change Quantity" colspan="4"/>
                         <newline/>
                         <field name="product_qty"/>
                     </group>
+                    <footer>
+                        <button name="change_prod_qty" string="Approve"
+                            colspan="1" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 6ba09ecbdb0..f8aaa7e3c5d 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Product Cost Structure" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Print Cost Structure of Product.">
                         <field name="number"/>
                     </group>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 23a51642630..72d0ccfcaa2 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -11,15 +11,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Produce" version="7.0">
-                    <header>
-                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Produce">
                         <field name="mode"/>
                         <field name="product_qty" colspan="2"/>
                     </group>    
+                    <footer>
+                        <button name="do_produce" type="object" string="Confirm" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index b40be0df0ac..439e180ca3c 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select time unit" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <sheet>
                         <group>
                             <field name="time_unit"/>
                             <field name="measure_unit"/>
                         </group>
                     </sheet>
+                    <footer>
+                        <button name="print_report" type="object" string="Print" class="oe_highlight"/>
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index ee0e47e1da3..b90d822121a 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Cancel Repair Order" version="7.0">
-                    <header>
-                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?"/>
                     </group>
+                    <footer>
+                        <button name="cancel_repair" string="Yes" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>         
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index f18eac5ce89..ca4690df210 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Create invoices" version="7.0">
-                <header>
-                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group string="Do you really want to create the invoice(s)?">
                     <field name="group"/>
                 </group>
-                </form>
+                <footer>
+                    <button name="make_invoices" string="Create Invoice" type="object"  class="oe_highlight"  />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
             </field>
         </record>
 
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index a8a69b2ff69..850ae6729a6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </header>
                     <group>
                         <field name="user_id"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index cd556fbb6de..fef823fe403 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -10,14 +10,14 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Receipt :" version="7.0">
-                    <header>
-                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />  
-                    </header>
                     <group>
                         <label string="Print the Receipt of the Sale"/>
                     </group>    
+                    <footer>
+                      <button name="print_report" string="Print Receipt" type="object" class="oe_highlight"  />
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />  
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_return_view.xml b/addons/point_of_sale/wizard/pos_return_view.xml
index f197daeebff..09005712b78 100644
--- a/addons/point_of_sale/wizard/pos_return_view.xml
+++ b/addons/point_of_sale/wizard/pos_return_view.xml
@@ -7,11 +7,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
+                    <footer>
                         <button name= "create_returns" string="Return Products" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
+                    </footer>
                  </form>
             </field>
         </record>
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index 1809c33d20a..55a8404f54b 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -17,18 +17,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Portal Access" version="7.0">
-                    <header>
-                        <button string="Send Invitations"
-                            name="action_create" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
                     <group col="4">
                         <field name="portal_id" widget="selection"/>
                     </group>
                     <field name="user_ids"/>
                     <label string="The following text will be included in the welcome email sent to users."/>
                     <field name="message"/>
+                    <footer>
+                        <button string="Send Invitations"
+                            name="action_create" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index de371db211f..5e18892f464 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -10,11 +10,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
-                    <header>
-                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
                      <group>
                         <field name="product_id" on_change="onchange_product_id(product_id)"/>
@@ -23,6 +18,11 @@
                         <field name="date_planned"/>
                         <field name="warehouse_id"/>
                     </group>
+                    <footer>
+                        <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/mrp_procurement_view.xml b/addons/procurement/wizard/mrp_procurement_view.xml
index 6e6b038d9fa..ab98e598a3d 100644
--- a/addons/procurement/wizard/mrp_procurement_view.xml
+++ b/addons/procurement/wizard/mrp_procurement_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
+                    <group>
+                        <label string="This wizard will schedule procurements."/>
+                    </group>
+                    <footer>
                         <button name="procure_calculation" string="Compute Procurements"
                             type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />    
-                    </header>
-                    <group>
-                        <label string="This wizard will schedule procurements."/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/orderpoint_procurement_view.xml b/addons/procurement/wizard/orderpoint_procurement_view.xml
index 340624fc822..5a29959949e 100644
--- a/addons/procurement/wizard/orderpoint_procurement_view.xml
+++ b/addons/procurement/wizard/orderpoint_procurement_view.xml
@@ -10,17 +10,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
                     </group>
                     <group col="2">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Stock" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index dc25dc4c7ef..01712a0cedd 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
-                    <header>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing.">
                         <field name="automatic"/>
                     </group>
+                    <footer>
+                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
index d1a1b4b3a11..dbc57c4f6e7 100644
--- a/addons/product/wizard/product_price_view.xml
+++ b/addons/product/wizard/product_price_view.xml
@@ -10,11 +10,6 @@
               <field name="type">form</field>
               <field name="arch" type="xml">
                 <form string="Price List" version="7.0">
-                    <header>
-                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Calculate Product Price per Unit Based on Pricelist Version.">
                         <field name="price_list" widget="selection"/>
                         <field name="qty1"/>
@@ -23,6 +18,11 @@
                         <field name="qty4"/>
                         <field name="qty5"/>
                     </group>
+                    <footer>
+                        <button name="print_report" string="Print"  type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
               </field>
         </record>
diff --git a/addons/product_margin/wizard/product_margin_view.xml b/addons/product_margin/wizard/product_margin_view.xml
index 26e40b77189..f174c6af445 100644
--- a/addons/product_margin/wizard/product_margin_view.xml
+++ b/addons/product_margin/wizard/product_margin_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Properties categories" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4" string="General Information">
                         <field name="from_date" />
                         <field name="to_date" />
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="action_open_window" string="Open Margins" type="object"  class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 7dd1cdb9465..4bd7e4b5b1d 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
-                    <header>
-                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="project_id" on_change="onchange_project_id(project_id)"/>
@@ -30,6 +25,11 @@
                             <field name="state"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 066f15582b4..84436c045a6 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
-                    <header>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Reevaluation Task"/>
                     <group>
                         <field name="remaining_hours" widget="float_time"/>
                     </group>
+                    <footer>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index aa81b9d6c43..ca6a4d5f7a4 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,16 +8,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
-                    <header>
-                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                       <group col="4">
                           <field name="timebox_id" widget="selection"/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
+                    <footer>
+                        <button name="process" string="Add to Timebox" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8439244d717..0d5c81984ba 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                   <form string="Schedule Phases" version="7.0">
-                      <header>
-                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
-                          or
-                         <button string="Cancel" class="oe_link" special="cancel" />
-                      </header>
                       <group>
                           <field name="target_project"/>
                           <field name="project_id" attrs="{'invisible':[('target_project','=','all')], 'required':[('target_project','!=','all')]}"/>
                       </group>
+                      <footer>
+                          <button name="check_selection" string="C_ompute" type="object" class="oe_highlight"/>
+                          or
+                         <button string="Cancel" class="oe_link" special="cancel" />
+                      </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index 17779ffa268..8eb9db762dd 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                  <form string="Schedule Tasks" version="7.0">
-                     <header>
-                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                     </header>
                      <group>
                          <field name="project_id"/>
                      </group>
+                     <footer>
+                         <button name="compute_date" string="C_ompute" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                     </footer>
                   </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_line_invoice_view.xml b/addons/purchase/wizard/purchase_line_invoice_view.xml
index 9ece8f0eb04..c15c8e4fe09 100644
--- a/addons/purchase/wizard/purchase_line_invoice_view.xml
+++ b/addons/purchase/wizard/purchase_line_invoice_view.xml
@@ -10,14 +10,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select an Open Sale Order" version="7.0">
-                    <header>
-                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <label string="Do you want to generate the supplier invoices?"/>
                     </group>
+                    <footer>
+                        <button name="makeInvoices" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/wizard/purchase_order_group_view.xml b/addons/purchase/wizard/purchase_order_group_view.xml
index d82d6f7fb2f..17b1f7eea5f 100644
--- a/addons/purchase/wizard/purchase_order_group_view.xml
+++ b/addons/purchase/wizard/purchase_order_group_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="Merge orders" version="7.0">
-                    <header>
-                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <separator string="Are you sure you want to merge these orders?"/>
                         <label string="
@@ -25,6 +20,11 @@ Lines will only be merged if: &#10;
 " colspan="4"/>
                     </group>
                     
+                    <footer>
+                        <button name="merge_orders" string="Merge orders" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index ed6de182f99..aab257827c2 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -7,14 +7,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
-                    <header>
-                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="partner_id"/>
                     </group>
+                    <footer>
+                        <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/report_webkit/wizard/report_webkit_actions_view.xml b/addons/report_webkit/wizard/report_webkit_actions_view.xml
index ce410da232e..3d4b5bce6bb 100644
--- a/addons/report_webkit/wizard/report_webkit_actions_view.xml
+++ b/addons/report_webkit/wizard/report_webkit_actions_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Add Print Buttons" col="4" version="7.0">
-                    <header>
-                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="print_button"/>
                         <field name="open_action"/>
                     </group>
+                    <footer>
+                        <button name="do_action" type="object" string="_Ok" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 835e5aa80cc..ef7546107c2 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -9,16 +9,16 @@
           <field name="type">form</field>
           <field name="arch" type="xml">
             <form string="Convert to Quotation"  version="7.0">
-                <header>
-                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <group col="4">
                     <field name="partner_id" required="1"/>
                     <field name="shop_id" required="1" widget="selection"/>
                     <field name="close"/>
                 </group>
+                <footer>
+                    <button name="makeOrder" string="_Create" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
           </field>
        </record>
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 58734caa25b..ad4df1a5193 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sharing: preparation" version="7.0">
-                    <header>
-                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator
                         string="Please select the action that opens the screen containing the data you want to share."/>
                     <group>
@@ -21,6 +16,11 @@
                             string="Optionally, you may specify an additional domain restriction that will be applied to the shared data."/>
                         <field name="domain"/>
                     </group>
+                    <footer>
+                        <button name="go_step_1" string="Next" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -31,11 +31,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="user_type" invisible="1"/>
                         <field name="invite" invisible="1"/>
@@ -60,6 +55,11 @@
                             <field name="access_mode"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="go_step_2" string="Share" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -70,10 +70,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Access granted!" version="7.0">
-                    <header>
-                        <field name="user_type" invisible="1"/>
-                        <field name="access_mode" invisible="1"/>
-                    </header>
                     <group attrs="{'invisible':[('user_type','=','embedded')]}"
                         string="An email notification with instructions has been sent to the following people:">
                         <field name="result_line_ids" nolabel="1" mode="tree">
@@ -100,6 +96,10 @@
                                 attrs="{'invisible':[('access_mode','=','readonly')]}"/>
                         </group>
                     </group>
+                    <footer>
+                        <field name="user_type" invisible="1"/>
+                        <field name="access_mode" invisible="1"/>
+                    </footer>
 
                 </form>
             </field>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index dc00fdbe736..e360f5aa025 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
-                    <header>
-                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Select Quantity">
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" />
                         <field name="prodlot_id" />
                     </group>
+                    <footer>
+                        <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_change_standard_price_view.xml b/addons/stock/wizard/stock_change_standard_price_view.xml
index 968a268a5ef..6062c946d07 100644
--- a/addons/stock/wizard/stock_change_standard_price_view.xml
+++ b/addons/stock/wizard/stock_change_standard_price_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Change Standard Price" version="7.0">
-                  <header>
-                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Change Price"/>
                   <group>
                       <field name="new_price" string="Cost Price"/>
                   </group>
+                  <footer>
+                      <button name="change_price" string="_Apply" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index ea07955eff2..75a7b13233b 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
-                  <header>
-                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel" />
-                  </header>
                   <separator string="Import current product inventory from the following location"/>
                   <group>
                       <field name="location_id"/>
                       <field name="recursive"/>
                       <field name="set_stock_zero"/>
                   </group>
+                  <footer>
+                      <button name="fill_inventory" string="Fill Inventory" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel" />
+                  </footer>
               </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index d8a808ed5db..5072007f210 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -7,11 +7,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
@@ -45,6 +40,11 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record> 
diff --git a/addons/stock/wizard/stock_inventory_merge_view.xml b/addons/stock/wizard/stock_inventory_merge_view.xml
index 0dcca2de211..0386e429ee6 100644
--- a/addons/stock/wizard/stock_inventory_merge_view.xml
+++ b/addons/stock/wizard/stock_inventory_merge_view.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Merge Inventories" version="7.0">
-                    <header>
+                    <separator string="Merge Inventories" />
+                    <label string="Do you want to merge theses inventories?"/>
+                    <footer>
                         <button name="do_merge" string="Yes" type="object" icon="gtk-apply" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Merge Inventories" />
-                    <label string="Do you want to merge theses inventories?"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 088498292ae..20f05f394fd 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -7,16 +7,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
-                  <header>
-                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
-                      or
-                      <button string="Cancel" class="oe_link" special="cancel"/>
-                  </header>
                   <group string="Create Invoice">
                       <field name="journal_id"/>
                       <field name="group"/>
                       <field name="invoice_date" />
                   </group>
+                  <footer>
+                      <button name="open_invoice" string="Create" type="object" class="oe_highlight"/>
+                      or
+                      <button string="Cancel" class="oe_link" special="cancel"/>
+                  </footer>
              </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_location_product_view.xml b/addons/stock/wizard/stock_location_product_view.xml
index b1f77576392..f0a52933c8a 100644
--- a/addons/stock/wizard/stock_location_product_view.xml
+++ b/addons/stock/wizard/stock_location_product_view.xml
@@ -7,17 +7,17 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
-                    <header>
-                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Stock Location Analysis"/>
                     <group>
                         <field name="from_date"/>
                         <field name="to_date"/>
                     </group>
                     <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)"/>
+                    <footer>
+                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 9655edf49b8..5ecfc9a85a1 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Consume Move" version="7.0">
-                    <header>
-                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Consume Products">
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
@@ -23,6 +18,11 @@
                         </div>
                         <field name="location_id"/>
                     </group>
+                    <footer>
+                        <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -42,11 +42,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
-                    <header>
-                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Scrap Products"/>
                     <group>
                         <field name="product_id"  readonly="1"/>
@@ -57,6 +52,11 @@
                         </div>
                         <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
@@ -76,9 +76,6 @@
                 <field name="type">form</field>
                 <field name="arch" type="xml">
                 <form string="Split in Lots" version="7.0">
-                    <header>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
-                    </header>
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -113,6 +110,9 @@
                             </group>
                         </form>
                     </field>
+                    <footer>
+                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                    </footer>
                 </form>
                 </field>
             </record>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 497467025b5..3e0699ec3d8 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -21,13 +21,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
+                    <separator string="Products"/>
+                    <field name="move_ids"/>
+                    <footer>
                         <button name="do_partial" string="_Validate" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Products"/>
-                    <field name="move_ids"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index c8da4459efa..fdbcabb9ed7 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -16,11 +16,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                    <header>
-                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <field name="hide_tracking" invisible="1"/>
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
@@ -36,6 +31,11 @@
                             <field name="currency"  invisible="1"/>
                         </tree>
                     </field>
+                    <footer>
+                        <button name="do_partial" string="_Transfer" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml
index 06e318c295e..5cdad44f681 100644
--- a/addons/stock/wizard/stock_return_picking_view.xml
+++ b/addons/stock/wizard/stock_return_picking_view.xml
@@ -59,16 +59,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Return lines" version="7.0">
-                    <header>
-                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <label string="Provide the quantities of the returned products."/>
                     <group>
                         <field name="product_return_moves"/>
                         <field name="invoice_state" />
                     </group>
+                    <footer>
+                        <button name="create_returns" string="Return" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml
index 573014b7cac..52b182a3f27 100644
--- a/addons/stock/wizard/stock_splitinto_view.xml
+++ b/addons/stock/wizard/stock_splitinto_view.xml
@@ -7,15 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Split Move" version="7.0">
-                <header>
-                    <button name="split" string="Ok" type="object" class="oe_highlight" />
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
                 <separator string="Quantity to Leave in the Current Pack"/>
                 <group>
                     <field name="quantity"/>
                 </group>
+                <footer>
+                    <button name="split" string="Ok" type="object" class="oe_highlight" />
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
index db78799f000..e65f378a638 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
@@ -9,7 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Periods" version="7.0">
-                    <header>
+                    <group col="4">
+                        <field name="date_start"/>
+                        <field name="date_stop"/>
+                    </group>
+                    <footer>
                         <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>
                         or
                         <button name="create_stock_periods" string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight"/>
@@ -17,11 +21,7 @@
                         <button name="create_stock_periods" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group col="4">
-                        <field name="date_start"/>
-                        <field name="date_stop"/>
-                    </group>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
index e51ab4a3ba0..458994621c1 100644
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Stock Planning Lines" version="7.0">
-                    <header>
-                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id" widget="selection"/>
                         <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
@@ -20,6 +15,11 @@
                         <field name="forecasted_products"/>
                         <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
index 3c31404a070..0f3018350c0 100644
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml
@@ -9,11 +9,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Forecasts Lines" version="7.0">
-                    <header>
-                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="period_id"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -21,6 +16,11 @@
                         <field name="copy_forecast"/>
                         <field name="product_categ_id" widget="selection"/>
                     </group>
+                    <footer>
+                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index 45c4ba6a487..213ca9dd2e2 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -10,15 +10,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
-                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group string="Menu Information">
                         <field name="menu_name" />
                         <field name="menu_parent_id" />
                     </group>
+                    <footer>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index c818721c09c..90139c3afac 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -10,13 +10,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
-                    <header>
+                    <separator string="Menu Information"/>
+                    <label string="Want to create a Index on Selected Pages ? "/>
+                    <footer>
                         <button name="wiki_do_index" string="Create Index" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Menu Information"/>
-                    <label string="Want to create a Index on Selected Pages ? "/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index c5b3583b1e5..4729586c858 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -10,11 +10,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <header>
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Notes"/>
                     <field name="file_path" width="300"/>
+                    <footer>
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index 9be2d4d22aa..49f333e453f 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -10,12 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Page" version="7.0">
-                    <header>
+                    <label string="Want to open a wiki page? "/>
+                    <footer>
                         <button name="open_wiki_page" string="Open Wiki Page" type="object"  class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Want to open a wiki page? "/>
+                    </footer>
              </form>
             </field>
         </record>