[MERGE] merge with main addons

bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s

1 files changed, 0 insertions, 81 deletions

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
deleted file mode 100644
index f8e110e6a5d..00000000000
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_synchronize_google_contact_import_form">
-            <field name="name">synchronize.base.form</field>
-            <field name="model">synchronize.google.import</field>
-            <field name="arch" type="xml">
-                <form string="Import contacts from a google account" version="7.0">
-                    <group colspan="4" col="4" width="430">
-                       <field name="group_name" colspan="4"/>
-                       <newline/>
-                       <group colspan="4" col="4">
-                            <separator string="Partner Status for this Group:" colspan="4"/>
-                            <field name="customer" colspan="4"/>
-                            <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>
-
-
-
-        <record model="ir.ui.view" id="view_synchronize_google_calendar_import_form">
-            <field name="name">synchronize.google.calendar.form</field>
-            <field name="model">synchronize.google.import</field>
-            <field name="arch" type="xml">
-                <form string="Import Google Calendar Events" version="7.0">
-                    <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>
-        <!--
-            Login Action
-        -->
-        <record model="ir.actions.act_window" id="act_google_login_form">
-          <field name="name">Import Google Calendar</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.login</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-          <field name="context">{'calendar':True}</field>
-          <field name="view_id" ref="google_base_account.view_google_login_form" />
-        </record>
-
-        <record model="ir.actions.act_window" id="act_google_login_contact_form">
-          <field name="name">Import Google Contacts</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.login</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-          <field name="context">{'contact':True}</field>
-          <field name="view_id" ref="google_base_account.view_google_login_form" />
-        </record>
-
-        <menuitem id="menu_sync_contact"
-                  parent="base.menu_import_crm"
-                  action="act_google_login_contact_form"
-                  sequence="5" />
-
-        <menuitem id="menu_sync_calendar"
-                  parent="base.menu_import_crm"
-                  action="act_google_login_form"
-                  sequence="15" />
-
-    </data>
-</openerp>