From 28dd15a6942569d0e8539a29483743ae29e894bd Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Tue, 7 Jun 2011 12:53:20 +0530 Subject: [IMP] Rnemed the module and merge contact and calendar modules bzr revid: jam@tinyerp.com-20110607072320-wkkw9q94vsd7mrlh --- addons/import_google/wizard/__init__.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 addons/import_google/wizard/__init__.py (limited to 'addons/import_google/wizard/__init__.py') diff --git a/addons/import_google/wizard/__init__.py b/addons/import_google/wizard/__init__.py new file mode 100644 index 00000000000..5e475d6fc7b --- /dev/null +++ b/addons/import_google/wizard/__init__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +import import_google +import google_contact_import +#import wizard_import_calendar_events +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From 94c2fb962bb4b3aed13d92522ba9193f60cadc6a Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Tue, 7 Jun 2011 18:33:30 +0530 Subject: [IMP] base_calendar_chnages and import_google_changes bzr revid: jam@tinyerp.com-20110607130330-abahqwzjmg95p2ro --- addons/import_google/wizard/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/import_google/wizard/__init__.py') diff --git a/addons/import_google/wizard/__init__.py b/addons/import_google/wizard/__init__.py index 5e475d6fc7b..a36445eebaa 100644 --- a/addons/import_google/wizard/__init__.py +++ b/addons/import_google/wizard/__init__.py @@ -20,5 +20,4 @@ ############################################################################## import import_google import google_contact_import -#import wizard_import_calendar_events # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From 1737deabb14457eaf0ec45c9063e44ce8b532a5d Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 13 Jun 2011 12:17:58 +0530 Subject: [IMP]import_google bzr revid: dbr@tinyerp.com-20110613064758-bezxriw47gujgen5 --- addons/import_google/wizard/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/import_google/wizard/__init__.py') diff --git a/addons/import_google/wizard/__init__.py b/addons/import_google/wizard/__init__.py index a36445eebaa..233409a111e 100644 --- a/addons/import_google/wizard/__init__.py +++ b/addons/import_google/wizard/__init__.py @@ -19,5 +19,5 @@ # ############################################################################## import import_google -import google_contact_import +import import_google_data # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From 0e588677ed41d9a56994de5ca1b59a195176b45a Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 13 Jun 2011 12:40:42 +0530 Subject: [ADD]import_google: Add two files bzr revid: dbr@tinyerp.com-20110613071042-b1zp3enejqip7z5p --- addons/import_google/wizard/__init__.py | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/import_google/wizard/__init__.py') diff --git a/addons/import_google/wizard/__init__.py b/addons/import_google/wizard/__init__.py index 233409a111e..41c118a0ef3 100644 --- a/addons/import_google/wizard/__init__.py +++ b/addons/import_google/wizard/__init__.py @@ -20,4 +20,5 @@ ############################################################################## import import_google import import_google_data +import google_import_message # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3