From 2c6023b559af79d655efa1b45476f0b631cda6d8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 13 Jun 2011 12:08:39 +0530
Subject: [REF]import_google: rename the file

bzr revid: dbr@tinyerp.com-20110613063839-zy27ck9t21j6sjdh
---
 .../wizard/import_google_data_view.xml             | 91 ++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 addons/import_google/wizard/import_google_data_view.xml

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
new file mode 100644
index 00000000000..cc044554b31
--- /dev/null
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -0,0 +1,91 @@
+<?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.contact.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import contacts from a google account">
+                    <group colspan="4" col="4" width="430">
+                       <field name="group_name" colspan="4"/>
+                       <separator string="Import Options" colspan="4"/>
+                       <field name="create_partner" colspan="4"/>
+                       <newline/>
+                       <group attrs="{'invisible': [('create_partner','!=','create_all')]}" 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>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2" col="2"/>
+                        <group colspan="2" col="2">
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="import_contact" string="_Import Contacts" type="object" icon="terp-personal+"/>
+                        </group>
+                    </group>
+                </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.contact.import</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Google Calendar Events">
+                    <group colspan="4" col="4" width="320">
+                       <field name="calendar_name" />
+                    </group>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4" col="4">
+                        <group colspan="2" col="2"/>
+                        <group colspan="2" col="2">
+                            <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                            <button name="import_calendar_events" string="_Import Events" type="object" icon="terp-calendar"/>
+                        </group>
+                    </group>
+                </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_address_book"
+                  action="act_google_login_contact_form"
+                  sequence="40" />
+
+        <menuitem id="menu_sync_calendar"
+                  parent="crm.menu_meeting_sale"
+                  action="act_google_login_form"
+                  sequence="20" />
+
+    </data>
+</openerp>
-- 
cgit v1.2.3


From 9680b584707d206e7be57e2268f47127115ddf36 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 13 Jun 2011 18:22:21 +0530
Subject: [IMP]:Remove the extra class and merge the code

bzr revid: dbr@tinyerp.com-20110613125221-f7we3vi67hnw38sm
---
 addons/import_google/wizard/import_google_data_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index cc044554b31..8c01ee7a33e 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -3,7 +3,7 @@
     <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.contact.import</field>
+            <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import contacts from a google account">
@@ -34,7 +34,7 @@
 
         <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.contact.import</field>
+            <field name="model">synchronize.google.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Import Google Calendar Events">
@@ -46,7 +46,7 @@
                         <group colspan="2" col="2"/>
                         <group colspan="2" col="2">
                             <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_calendar_events" string="_Import Events" type="object" icon="terp-calendar"/>
+                            <button name="import_contact" string="_Import Events" type="object" icon="terp-calendar"/>
                         </group>
                     </group>
                 </form>
@@ -58,7 +58,7 @@
         <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="res_model">google.login.contact</field>
           <field name="view_type">form</field>
           <field name="view_mode">form</field>
           <field name="target">new</field>
@@ -69,7 +69,7 @@
         <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="res_model">google.login.contact</field>
           <field name="view_type">form</field>
           <field name="view_mode">form</field>
           <field name="target">new</field>
-- 
cgit v1.2.3


From 03d536c1cf7eca774d3607b7b832b9333f0843ab Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 15 Jun 2011 17:21:46 +0530
Subject: [ADD]import_google: Changes in yml file of contact and calander

bzr revid: dbr@tinyerp.com-20110615115146-su4fj3kwwu7kl0q3
---
 addons/import_google/wizard/import_google_data_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/import_google/wizard/import_google_data_view.xml')

diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
index 8c01ee7a33e..b35e97645e7 100644
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ b/addons/import_google/wizard/import_google_data_view.xml
@@ -23,7 +23,7 @@
                         <group colspan="2" col="2"/>
                         <group colspan="2" col="2">
                             <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_contact" string="_Import Contacts" type="object" icon="terp-personal+"/>
+                            <button name="import_google" string="_Import Contacts" type="object" icon="terp-personal+"/>
                         </group>
                     </group>
                 </form>
@@ -46,7 +46,7 @@
                         <group colspan="2" col="2"/>
                         <group colspan="2" col="2">
                             <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
-                            <button name="import_contact" string="_Import Events" type="object" icon="terp-calendar"/>
+                            <button name="import_google" string="_Import Events" type="object" icon="terp-calendar"/>
                         </group>
                     </group>
                 </form>
@@ -58,7 +58,7 @@
         <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.contact</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>
@@ -69,7 +69,7 @@
         <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.contact</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>
-- 
cgit v1.2.3