[IMP] code improve and merge with latest.

bzr revid: tta@openerp.com-20120716114651-19wmcwhj7f6b4qj9

16 files changed, 290 insertions, 75 deletions

diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index 5c538e5912f..5242633747f 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """The module adds google contact in partner address and add google calendar events details in Meeting""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'import_base', 'google_base_account','crm'],
+    'depends': ['base', 'import_base', 'google_base_account', 'base_calendar'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv',
                 'sync_google_calendar_view.xml',
diff --git a/addons/import_google/i18n/ar.po b/addons/import_google/i18n/ar.po
new file mode 100644
index 00000000000..8ea6b8cc02d
--- /dev/null
+++ b/addons/import_google/i18n/ar.po
@@ -0,0 +1,220 @@
+# Arabic 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 00:36+0000\n"
+"PO-Revision-Date: 2012-07-07 15:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@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-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. module: import_google
+#: help:synchronize.google.import,group_name:0
+msgid "Choose which group to import, By default it takes all."
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Google Calendar Events"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Events"
+msgstr "_جلب الأحداث"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid ""
+"No Google Username or password Defined for user.\n"
+"Please define in user view"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#, python-format
+msgid ""
+"Invalid login detail !\n"
+" Specify Username/Password."
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,supplier:0
+msgid "Supplier"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import Options"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,group_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
+#: model:ir.ui.menu,name:import_google.menu_sync_contact
+msgid "Import Google Contacts"
+msgstr "جلب اتصالات قوقل"
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "Import Google Data"
+msgstr ""
+
+#. module: import_google
+#: view:crm.meeting:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Import contacts from a google account"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Please specify correct user and password !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_synchronize_google_import
+msgid "synchronize.google.import"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "_Import Contacts"
+msgstr ""
+
+#. module: import_google
+#: model:ir.actions.act_window,name:import_google.act_google_login_form
+#: model:ir.ui.menu,name:import_google.menu_sync_calendar
+msgid "Import Google Calendar"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:50
+#, python-format
+msgid "Import google"
+msgstr "اجلب قوقل"
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:127
+#: code:addons/import_google/wizard/import_google_data.py:133
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google_data.py:71
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,create_partner:0
+msgid "Options"
+msgstr ""
+
+#. module: import_google
+#: view:google.import.message:0
+msgid "_Ok"
+msgstr ""
+
+#. module: import_google
+#: code:addons/import_google/wizard/import_google.py:38
+#: code:addons/import_google/wizard/import_google_data.py:28
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: import_google
+#: model:ir.model,name:import_google.model_google_import_message
+msgid "Import Message"
+msgstr ""
+
+#. module: import_google
+#: field:synchronize.google.import,calendar_name:0
+msgid "Calendar Name"
+msgstr ""
+
+#. module: import_google
+#: help:synchronize.google.import,supplier:0
+msgid "Check this box to set newly created partner as Supplier."
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Import only address"
+msgstr "اجلب فقط العنوان"
+
+#. module: import_google
+#: field:crm.case.categ,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: import_google
+#: view:synchronize.google.import:0
+msgid "Partner Status for this Group:"
+msgstr ""
+
+#. module: import_google
+#: field:google.import.message,name:0
+msgid "Message"
+msgstr ""
+
+#. module: import_google
+#: selection:synchronize.google.import,create_partner:0
+msgid "Create partner for each contact"
+msgstr "انشاء شريك لكل اتصال"
+
+#. module: import_google
+#: help:synchronize.google.import,customer:0
+msgid "Check this box to set newly created partner as Customer."
+msgstr "تحقق من هذا المربع ليتم وضع الشريك الجديد كمورد"
+
+#~ msgid "Partner status for this group:"
+#~ msgstr "حالة الشريك لهذه المجموعة:"
diff --git a/addons/import_google/i18n/de.po b/addons/import_google/i18n/de.po
index 7923ff60d13..e94110389ae 100644
--- a/addons/import_google/i18n/de.po
+++ b/addons/import_google/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "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-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/es_CR.po b/addons/import_google/i18n/es_CR.po
index 5728225a03f..aed325a2ae0 100644
--- a/addons/import_google/i18n/es_CR.po
+++ b/addons/import_google/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "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-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/fr.po b/addons/import_google/i18n/fr.po
index 426866a05bb..53dfbfc2979 100644
--- a/addons/import_google/i18n/fr.po
+++ b/addons/import_google/i18n/fr.po
@@ -14,23 +14,23 @@ msgstr ""
 "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-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
 msgid "Choose which group to import, By default it takes all."
-msgstr ""
+msgstr "Choisisser le groupe a importer, par défaut il les prend tous"
 
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "Import Google Calendar Events"
-msgstr ""
+msgstr "Importation des évènements du calendrier"
 
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "_Import Events"
-msgstr ""
+msgstr "_Importer les évènements"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:71
@@ -39,6 +39,8 @@ msgid ""
 "No Google Username or password Defined for user.\n"
 "Please define in user view"
 msgstr ""
+"Pas de nom et d'utilisateur Google définit pour cet utilisateur.\n"
+"Veuillez en définir un pour la vue utilisateur"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:127
@@ -47,6 +49,8 @@ msgid ""
 "Invalid login detail !\n"
 " Specify Username/Password."
 msgstr ""
+"Détail de connexion non valide!\n"
+" Spécifier un Utilisateur/Mot de passe."
 
 #. module: import_google
 #: field:synchronize.google.import,supplier:0
@@ -72,12 +76,12 @@ msgstr "Catégorie de cas"
 #: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
 #: model:ir.ui.menu,name:import_google.menu_sync_contact
 msgid "Import Google Contacts"
-msgstr ""
+msgstr "Importer les contacts Google"
 
 #. module: import_google
 #: view:google.import.message:0
 msgid "Import Google Data"
-msgstr ""
+msgstr "Importer les données Google"
 
 #. module: import_google
 #: view:crm.meeting:0
@@ -103,13 +107,13 @@ msgstr "Contact Google"
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "Import contacts from a google account"
-msgstr ""
+msgstr "Importer les contacts depuis un compte google"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:133
 #, python-format
 msgid "Please specify correct user and password !"
-msgstr ""
+msgstr "Veuiller spécifier un utilisateur et un mot de passe correct !"
 
 #. module: import_google
 #: field:synchronize.google.import,customer:0
@@ -129,19 +133,19 @@ msgstr "synchronize.google.import"
 #. module: import_google
 #: view:synchronize.google.import:0
 msgid "_Import Contacts"
-msgstr ""
+msgstr "_Importer les contacts"
 
 #. module: import_google
 #: model:ir.actions.act_window,name:import_google.act_google_login_form
 #: model:ir.ui.menu,name:import_google.menu_sync_calendar
 msgid "Import Google Calendar"
-msgstr ""
+msgstr "Importer les calendriers Google"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:50
 #, python-format
 msgid "Import google"
-msgstr ""
+msgstr "Import Google"
 
 #. module: import_google
 #: code:addons/import_google/wizard/import_google_data.py:127
@@ -187,16 +191,18 @@ msgstr "Nom du calendrier"
 #: help:synchronize.google.import,supplier:0
 msgid "Check this box to set newly created partner as Supplier."
 msgstr ""
+"Cocher cette case pour mettre les nouveaux partenaires crées comme "
+"fournisseur."
 
 #. module: import_google
 #: selection:synchronize.google.import,create_partner:0
 msgid "Import only address"
-msgstr ""
+msgstr "Importer les adresses seulement"
 
 #. module: import_google
 #: field:crm.case.categ,user_id:0
 msgid "User"
-msgstr ""
+msgstr "utilisateur"
 
 #. module: import_google
 #: view:synchronize.google.import:0
@@ -206,14 +212,19 @@ msgstr ""
 #. module: import_google
 #: field:google.import.message,name:0
 msgid "Message"
-msgstr ""
+msgstr "Message"
 
 #. module: import_google
 #: selection:synchronize.google.import,create_partner:0
 msgid "Create partner for each contact"
-msgstr ""
+msgstr "Créer un partenaire pour chaque contact"
 
 #. module: import_google
 #: help:synchronize.google.import,customer:0
 msgid "Check this box to set newly created partner as Customer."
 msgstr ""
+"Cocher cette case pour mettre les nouveaux partenaires créer en tant que "
+"client"
+
+#~ msgid "Partner status for this group:"
+#~ msgstr "Statut du partenaire pour ce groupe"
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
index ad1ab085495..35f4a91d087 100644
--- a/addons/import_google/i18n/ja.po
+++ b/addons/import_google/i18n/ja.po
@@ -8,19 +8,19 @@ 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-24 18:56+0000\n"
+"PO-Revision-Date: 2012-07-09 04:44+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-25 04:40+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
 msgid "Choose which group to import, By default it takes all."
-msgstr "インポートするグループを選択して下さい。デフォルトでは全てを取得します。"
+msgstr "インポートするグループを選択して下さい。デフォルトでは全てを取得します。１"
 
 #. module: import_google
 #: view:synchronize.google.import:0
@@ -70,7 +70,7 @@ msgstr "グループ名"
 #. module: import_google
 #: model:ir.model,name:import_google.model_crm_case_categ
 msgid "Category of Case"
-msgstr "ケースの分類"
+msgstr "案件の分類"
 
 #. module: import_google
 #: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
diff --git a/addons/import_google/i18n/nl.po b/addons/import_google/i18n/nl.po
index 11e9f41c552..330111a7994 100644
--- a/addons/import_google/i18n/nl.po
+++ b/addons/import_google/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "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-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/pt.po b/addons/import_google/i18n/pt.po
index a17769a57c9..c37ed1d9df1 100644
--- a/addons/import_google/i18n/pt.po
+++ b/addons/import_google/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-24 11:09+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/ro.po b/addons/import_google/i18n/ro.po
index c0aea581d77..732a93b39ff 100644
--- a/addons/import_google/i18n/ro.po
+++ b/addons/import_google/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-27 04:40+0000\n"
-"X-Generator: Launchpad (build 15288)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/sr@latin.po b/addons/import_google/i18n/sr@latin.po
index 3da382862e6..73ce332ecb9 100644
--- a/addons/import_google/i18n/sr@latin.po
+++ b/addons/import_google/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "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-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/sv.po b/addons/import_google/i18n/sv.po
index 73506190503..6f7ca6ef306 100644
--- a/addons/import_google/i18n/sv.po
+++ b/addons/import_google/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "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:41+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/i18n/zh_CN.po b/addons/import_google/i18n/zh_CN.po
index 214c31d6594..1dc6448c3a4 100644
--- a/addons/import_google/i18n/zh_CN.po
+++ b/addons/import_google/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "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-14 06:27+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: import_google
 #: help:synchronize.google.import,group_name:0
diff --git a/addons/import_google/partner.py b/addons/import_google/partner.py
index 232f18d06a3..e7aa4dd8ca7 100644
--- a/addons/import_google/partner.py
+++ b/addons/import_google/partner.py
@@ -21,11 +21,11 @@
 
 from osv import fields,osv
 
-class crm_case_categ(osv.osv):
-    """ Category of Case """
-    _inherit = "crm.case.categ"
+class crm_meeting_type(osv.osv):
+    """ Meeting Types """
+    _inherit = "crm.meeting.type"
     _columns = {
         'user_id': fields.many2one('res.users', 'User')
     }
-crm_case_categ()
+
 # vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index 84f0176c5ec..626d803d4df 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="crm_case_form_view_meet_inherit">
+        <record model="ir.ui.view" id="view_crm_meeting_form">
             <field name="name">CRM - Meetings Form (Inherited)</field>
             <field name="model">crm.meeting</field>
             <field name="type">form</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>
+            <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
             <field name="arch" type="xml">
                 <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="crm_case_tree_view_meet_inherit">
-            <field name="name">CRM - Meetings Tree (Inherited)</field>
-            <field name="model">crm.meeting</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="crm.crm_case_tree_view_meet"/>
-            <field name="arch" type="xml">
-               <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
+                    <field name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
                 </field>
             </field>
         </record>
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
index 9a9b2802826..c34a14e224d 100644
--- a/addons/import_google/wizard/import_google.py
+++ b/addons/import_google/wizard/import_google.py
@@ -235,10 +235,10 @@ class google_import(import_framework):
 
 
     def get_event_category(self, val, name):
-        fields = ['name', 'object_id']
-        nameid = 'event_category_'+name
-        data = [name, 'crm.meeting']
-        return self.import_object(fields, data, 'crm.case.categ', "crm_case_categ", nameid, [('name', 'ilike', name)])
+        nameid = 'event_category_' + name
+        fields = ['name']
+        data = [name]
+        return self.import_object(fields, data, 'crm.meeting.type', "crm_meeting_type", nameid, [('name', 'ilike', name)])
 
     def get_rec(self, val):
         if val.get("recurrency"):
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>