From 08040221b218d725096695dd8663139a6e0ff9de Mon Sep 17 00:00:00 2001
From: "Chandni Machchhar (OpenERP Trainee)" <chandni.machchhar3@gmail.com>
Date: Mon, 3 Jun 2013 15:28:43 +0530
Subject: [PATCH 1/6] [FIX] Set the print or cancel buttons in the footer in
 all the wizards of Survey in reporting.

bzr revid: chandni.machchhar3@gmail.com-20130603095843-q5eq7mqpiwepcly1
---
 addons/survey/wizard/survey_browse_answer.xml    | 10 +++++-----
 addons/survey/wizard/survey_print.xml            | 10 +++++-----
 addons/survey/wizard/survey_print_answer.xml     | 10 +++++-----
 addons/survey/wizard/survey_print_statistics.xml |  6 +++---
 addons/survey/wizard/survey_selection.xml        | 10 +++++-----
 addons/survey/wizard/survey_send_invitation.xml  | 10 +++++-----
 6 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index cb50eb955bb..4f2adb85743 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -11,15 +11,15 @@
             <field name="model">survey.browse.answer</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
-                    <header>
-                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 40056234fe8..b539b844654 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.print</field>
             <field name="arch" type="xml">
                 <form string="Survey Print" version="7.0">
-                    <header>
-                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Survey" colspan="4"/>
                         <field name="survey_ids" nolabel="1" colspan="4" />
@@ -23,6 +18,11 @@
                         <field name="page_number" colspan="4"/>
                         <field name="without_pagebreak" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index c2363695292..f3c8d01a62c 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.print.answer</field>
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
-                    <header>
-                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>
                         <field name="response_ids" nolabel="1" colspan="4" />
@@ -23,6 +18,11 @@
                         <field name="page_number" colspan="4"/>
                         <field name="without_pagebreak" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 97d976b98f6..6d63cf8b9bf 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -9,12 +9,12 @@
             <field name="model">survey.print.statistics</field>
             <field name="arch" type="xml">
                 <form string="Survey Print Statistics" version="7.0">
-                    <header>
+                    <field name="survey_ids"/>
+                    <footer>
                         <button name="action_next" string="Print" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <field name="survey_ids"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index de1231b53fb..61eba88abaf 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -10,15 +10,15 @@
             <field name="model">survey.name.wiz</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
-                    <header>
-                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
                     <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
+					<footer>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index a611973d772..fb3d7edf856 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.send.invitation</field>
             <field name="arch" type="xml">
                 <form string="Send Invitation" version="7.0">
-                    <header>
-                        <button name="action_send" string="_Send" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Select Partner" colspan="4"/>
                         <field name="partner_ids" nolabel="1" colspan="4" widget="many2many_tags"/>
@@ -28,6 +23,11 @@
                         <separator string="Message" colspan="4"/>
                         <field name="mail" nolabel="1" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_send" string="_Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>

From b01c8dfafd77f92a6f39689ffeae60d6697dc9a5 Mon Sep 17 00:00:00 2001
From: "Chandni Machchhar (OpenERP Trainee)" <chandni.machchhar3@gmail.com>
Date: Mon, 3 Jun 2013 15:38:14 +0530
Subject: [PATCH 2/6] [FIX] Aligned the employee field in employee timesheet
 wizard and change the parent of the Employee Timesheet menu.

bzr revid: chandni.machchhar3@gmail.com-20130603100814-r12y6aw1m6bzvwv3
---
 .../hr_timesheet/wizard/hr_timesheet_print_employee_view.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 9079735aaae..3603809990b 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -11,7 +11,7 @@
                     <group colspan="4">
                         <field name="month"/>
                         <field name="year"/>
-                        <field name="employee_id" colspan="3"/>
+                        <field name="employee_id" />
                     </group>
                     <footer>
                         <button string="Print" name="print_report" type="object" class="oe_highlight"/>
@@ -33,7 +33,7 @@
 
         <menuitem action="action_hr_timesheet_employee"
             id="menu_hr_timesheet_employee"
-            parent="hr.menu_hr_reporting"
+            parent="hr.menu_hr_reporting_timesheet"
             sequence="2" icon="STOCK_PRINT"/>
 
     </data>

From 977ddc199e94ddcec93f7a7d1ce98dec91d79b39 Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP Trainee)" <baradmahendra344@gmail.com>
Date: Mon, 3 Jun 2013 16:25:13 +0530
Subject: [PATCH 3/6] [IMP] In openerp report designer wizard remove the
 configure icon and in reporting  configuration wizard remove skip button and
 put heighlighted  ok button

bzr revid: baradmahendra344@gmail.com-20130603105513-bwwovqplm5ypipv7
---
 .../base_report_designer_installer.xml                   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 99898f5a703..220c0710409 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -14,9 +14,14 @@
                         <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
                     </separator>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
+                        <button name="action_next" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Skip']" position="after">
+                        <button string="Ok" class="oe_highlight" special="cancel" invisible="context.get('active_model')"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Skip']" position="replace">
+                        <button string="Skip" class="oe_link" special="cancel" invisible="context.get('menu',False)"/>
                     </xpath>
-                    
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" invisible="1"/>

From 290f67fec2aa511383394b9ce8dec37dab0fc7b6 Mon Sep 17 00:00:00 2001
From: "Mahendra Barad (OpenERP Trainee)" <baradmahendra344@gmail.com>
Date: Mon, 3 Jun 2013 18:58:54 +0530
Subject: [PATCH 4/6] [IMP] add the or lable in between configure and skip
 button

bzr revid: baradmahendra344@gmail.com-20130603132854-vw5n0988ppacmfdk
---
 addons/base_report_designer/base_report_designer_installer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 220c0710409..4f07f1d5ea3 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -15,6 +15,7 @@
                     </separator>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
                         <button name="action_next" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
+                        <label string="or" invisible="context.get('menu',False)" class="oe_inline"/>
                     </xpath>
                     <xpath expr="//button[@string='Skip']" position="after">
                         <button string="Ok" class="oe_highlight" special="cancel" invisible="context.get('active_model')"/>

From d3044130c887f3280f93e1aa7a16c12c725dda6a Mon Sep 17 00:00:00 2001
From: "Chandni Machchhar (OpenERP Trainee)" <chandni.machchhar3@gmail.com>
Date: Tue, 4 Jun 2013 11:51:32 +0530
Subject: [PATCH 5/6] [FIX] Optimize the Code.

bzr revid: chandni.machchhar3@gmail.com-20130604062132-n8x9iofinoz9cx43
---
 addons/survey/wizard/survey_selection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 61eba88abaf..56f5f5cda33 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -14,7 +14,7 @@
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
                     <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
-					<footer>
+                    <footer>
                         <button name="action_next" string="Start" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />

From b265839c8370f673f18329cb84ec30cdc4c19d49 Mon Sep 17 00:00:00 2001
From: "Nimesh Contractor (OpenERP)" <nco@tinyerp.com>
Date: Mon, 10 Jun 2013 11:58:57 +0530
Subject: [PATCH 6/6] [IMP] imporve code.

bzr revid: nco@tinyerp.com-20130610062857-mhwu5gkjopcp42ml
---
 .../base_report_designer/base_report_designer_installer.xml   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 4f07f1d5ea3..dea5ed17c9e 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -17,10 +17,8 @@
                         <button name="action_next" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
                         <label string="or" invisible="context.get('menu',False)" class="oe_inline"/>
                     </xpath>
-                    <xpath expr="//button[@string='Skip']" position="after">
-                        <button string="Ok" class="oe_highlight" special="cancel" invisible="context.get('active_model')"/>
-                    </xpath>
                     <xpath expr="//button[@string='Skip']" position="replace">
+                        <button string="Ok" class="oe_highlight" special="cancel" invisible="context.get('active_model')"/>
                         <button string="Skip" class="oe_link" special="cancel" invisible="context.get('menu',False)"/>
                     </xpath>
                     <xpath expr="//separator[@string='title']" position="after">