[REMOVE]import_google: remove the file and merge the code

bzr revid: dbr@tinyerp.com-20110613061648-oo35e030m88skywj

3 files changed, 7 insertions, 38 deletions

diff --git a/addons/import_google/__init__.py b/addons/import_google/__init__.py
index 0967b82e0b7..bdd83a09208 100644
--- a/addons/import_google/__init__.py
+++ b/addons/import_google/__init__.py
@@ -20,6 +20,5 @@
 ##############################################################################
 
 import import_google_data
-import sync_google_calendar
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/import_google_data.py b/addons/import_google/import_google_data.py
index 1c00a67cd52..b7c640a7850 100644
--- a/addons/import_google/import_google_data.py
+++ b/addons/import_google/import_google_data.py
@@ -36,4 +36,11 @@ class res_partner_address(osv.osv):
 
 res_partner_address()
 
+class crm_case_categ(osv.osv):
+    """ Category of Case """
+    _inherit = "crm.case.categ"
+    _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.py b/addons/import_google/sync_google_calendar.py
deleted file mode 100644
index a8807d355bb..00000000000
--- a/addons/import_google/sync_google_calendar.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-class crm_meeting(osv.osv):
-    _inherit = "crm.meeting"
-
-crm_meeting()
-
-class crm_case_categ(osv.osv):
-    """ Category of Case """
-    _inherit = "crm.case.categ"
-    _columns = {
-        'user_id': fields.many2one('res.users', 'User')
-    }
-crm_case_categ()
-
-# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4: