From a80894f4022f2f8170b9926168d7a64f7ddbb528 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 10 Mar 2010 16:30:44 +0530
Subject: [PATCH] [Add] crm: Add the osv_memory wizard of lead_opportunity and
 change the name of function

bzr revid: sbh@tinyerp.com-20100310110044-79cyfknveptf6so4
---
 addons/crm/__terp__.py                  | 1 +
 addons/crm/crm_lead_view.xml            | 2 +-
 addons/crm/wizard/__init__.py           | 1 +
 addons/crm/wizard/lead_to_partner.py    | 5 -----
 addons/crm/wizard/phonecall2meeting.py  | 2 +-
 addons/crm/wizard/phonecall2meeting.xml | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 3bcfabd6aa9..851d0a238ad 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -69,6 +69,7 @@ between mails and Open ERP.""",
         'wizard/opportunity2partner_view.xml',
         'wizard/opportunity2meeting.xml',
         'wizard/opportunity2phonecall.xml',
+        'wizard/lead2opportunity.xml',
         'crm_wizard.xml', 
         'crm_view.xml',
          
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 508929c7ec1..f5fb3349705 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <field name="priority"/>
                     <field name="date_deadline"/>
                     <button
-                            name="%(wizard_crm_lead_opportunity_set)d" 
+                            name="%(action_crm_lead2opportunity)d" 
                             string="Convert"
                             help="Convert into Opportunity"
                             icon="gtk-index" 
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 72dfccad6de..4155dfa69ea 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -29,6 +29,7 @@ import wizard_history_event
 
 
 import lead_to_partner
+import lead2opportunity
 import crm_phonecall2phonecall
 import phonecall2partner
 import phonecall2meeting
diff --git a/addons/crm/wizard/lead_to_partner.py b/addons/crm/wizard/lead_to_partner.py
index 4d1a3d5468e..a7ba5848f05 100644
--- a/addons/crm/wizard/lead_to_partner.py
+++ b/addons/crm/wizard/lead_to_partner.py
@@ -19,12 +19,7 @@
 #
 ##############################################################################
 
-from mx.DateTime import now
-
 from osv import osv, fields
-import netsvc
-import ir
-import pooler
 from tools.translate import _
 
 class crm_lead2partner(osv.osv_memory):
diff --git a/addons/crm/wizard/phonecall2meeting.py b/addons/crm/wizard/phonecall2meeting.py
index 502ad14f702..89c0537aadd 100644
--- a/addons/crm/wizard/phonecall2meeting.py
+++ b/addons/crm/wizard/phonecall2meeting.py
@@ -38,7 +38,7 @@ class crm_phonecall2meeting(osv.osv_memory):
     def action_cancel(self, cr, uid, ids, context=None):
         return {'type':'ir.actions.act_window_close'}
 
-    def _makeMeeting(self, cr, uid, ids, context=None):
+    def action_makeMeeting(self, cr, uid, ids, context=None):
         this = self.browse(cr, uid, ids[0], context=context)
         record_id = context and context.get('record_id', False) or False
         if record_id:
diff --git a/addons/crm/wizard/phonecall2meeting.xml b/addons/crm/wizard/phonecall2meeting.xml
index 9505845a63a..fe90bbe5cd6 100644
--- a/addons/crm/wizard/phonecall2meeting.xml
+++ b/addons/crm/wizard/phonecall2meeting.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Convert To Meeting ">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
+                        <button name="action_makeMeeting" type="object" string="_Apply" icon="gtk-apply" />
                 </form>
             </field>
         </record>