summaryrefslogtreecommitdiff
path: root/addons/import_google/wizard/import_google_data_view.xml
diff options
context:
space:
mode:
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>2012-07-11 17:22:22 +0530
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>2012-07-11 17:22:22 +0530
commit14beea5700fe97d148f720b6c6942d2d38ff5a2d (patch)
tree459406745e03b36044760951223a80188a9a2e28 /addons/import_google/wizard/import_google_data_view.xml
parent8a847dcf5e6e1dc85c29504fc352e873f63cc51d (diff)
parent79a8450b72f4b23c6b5e86ac69502a49f881fccc (diff)
[MERGE] merge with parent branch
bzr revid: cha@tinyerp.com-20120711115222-9hzmeove3ly2e5bm
Diffstat (limited to 'addons/import_google/wizard/import_google_data_view.xml')
-rw-r--r--addons/import_google/wizard/import_google_data_view.xml20
1 files changed, 10 insertions, 10 deletions
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>