[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 e4eb233..9730b8d 100644 (file)
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import crm_send_email
-import crm_forward_to_partner
+import crm_add_note
 
 import crm_lead_to_partner
 import crm_lead_to_opportunity
@@ -30,5 +30,8 @@ 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: