[MERGE] Merge with lp:openobject-addons

[odoo/odoo.git] / addons / crm / wizard / __init__.py

diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index b29cbe0..9730b8d 100644 (file)
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -15,14 +15,23 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import crm_wizard
-import wizard_crm_send_email
-import wizard_crm_new_send_email
-import wizard_fetch_mail
+import crm_send_email
+import crm_add_note
+
+import crm_lead_to_partner
+import crm_lead_to_opportunity
+import crm_opportunity_to_phonecall
+import crm_phonecall_to_phonecall
+import crm_phonecall_to_partner
+import crm_phonecall_to_opportunity
+import crm_partner_to_opportunity
+
+import crm_merge_opportunities
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: