diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-11 14:38:14 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-11 14:38:14 +0530 |
| commit | 79a8450b72f4b23c6b5e86ac69502a49f881fccc (patch) | |
| tree | 459406745e03b36044760951223a80188a9a2e28 /addons/base_module_record | |
| parent | 2dfa5e06978afcf074dd38be192ded78f7fb76f7 (diff) | |
| parent | 6cbb04758af8d1e7056df3eadbf1b490b958b0b5 (diff) | |
[MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120711090814-z3khnc83bl9ndcy6
Diffstat (limited to 'addons/base_module_record')
3 files changed, 20 insertions, 20 deletions
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> |