From 3d82d827c854b63316fa1fba29187921c24f38d8 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 10 Oct 2011 18:56:22 +0530
Subject: [PATCH 001/132] [ADD, REF]: CRM: 1)Created new process folder and
 moved test_crm_lead.yml to process_crm_lead.yml, 2)Removed unused created
 user for crm (process_crm_lead.yml), 3)Changed Lead name New Customer to
 proper name, 4)Removed Cancle operation from process_crm_lead.yml

bzr revid: ron@tinyerp.com-20111010132622-329w2fv0jbt0rc7y
---
 addons/crm/__openerp__.py                     |  3 +-
 .../process_crm_lead.yml}                     | 32 ++-----------------
 2 files changed, 4 insertions(+), 31 deletions(-)
 rename addons/crm/test/{test_crm_lead.yml => process/process_crm_lead.yml} (81%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index a6f5f1630f7..27beb8e58ee 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -119,7 +119,8 @@ Creates a dashboard for CRM that includes:
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/test_crm_lead.yml',
+            'test/process/process_crm_lead.yml',
+            'test/process/cancle_crm_lead.yml',
             'test/test_crm_meeting.yml',
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml',
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/process/process_crm_lead.yml
similarity index 81%
rename from addons/crm/test/test_crm_lead.yml
rename to addons/crm/test/process/process_crm_lead.yml
index d5d3c6b933b..f35b03dcd4f 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/process/process_crm_lead.yml
@@ -1,27 +1,10 @@
--
-   In order to test the CRM in OpenERP, I will do a customer qualification
-   process that starts with a fist contact with a customer (a lead), which will
-   be converted to a business opportunity and a partner.
--
-   I create a two new users "user_crm" and I assign the group "salesman".
--
-   !record {model: res.users, id: res_users_usercrm0}:
-     company_id: base.main_company
-     context_lang: en_US
-     context_section_id: crm.section_sales_department
-     groups_id:
-       - base.group_sale_salesman
-     login: user_crm
-     name: user_crm
-     password: user_crm
-
 -  |
-   I start by creating a new lead "New Customer" and I provide an address to this
+   I start by creating a new lead "Steave Jon" and I provide an address to this
    new customer, as well as an email "info@mycustomer.com".
 -
    !record {model: crm.lead, id: crm_lead_newcustomer0}:
      email_from: info@mycustomer.com
-     name: New Customer
+     name: Steave Jon
      partner_name: Capegemini
      partner_id: base.res_partner_9
      phone: (855) 924-4364
@@ -125,17 +108,6 @@
 -
   !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in done state}:
      - state == "done"
--
-  I cancel lead by click on "cancel" button.
--
-   !python {model: crm.lead}: |
-     self.case_cancel(cr, uid, [ref("crm_lead_newcustomer0")])
-- |
-  I check that lead is now in 'cancel' state.
--
-  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in cancel state}:
-     - state == "cancel"
-
 #-
 #  |
 #  yaml is also not working with smtp server and send new email.

From d202549512dea80767b844e2a7a732e58e1f29bc Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 11 Oct 2011 12:25:03 +0530
Subject: [PATCH 002/132] [ADD]: crm: 1) Add new yml on process folder
 cancle_crm_lead.yml 2) Checked for lead from any stage, It will be cancle or
 not 3) If Lead not handle by executive team so its need to Escalate lead from
 sales executive department to sales department and checked that 4) Checked
 for lead cancle from Escalate stage

bzr revid: ron@tinyerp.com-20111011065503-x1o4pbhtkyaznuyp
---
 addons/crm/test/process/cancle_crm_lead.yml | 48 +++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 addons/crm/test/process/cancle_crm_lead.yml

diff --git a/addons/crm/test/process/cancle_crm_lead.yml b/addons/crm/test/process/cancle_crm_lead.yml
new file mode 100644
index 00000000000..c8d02c6414c
--- /dev/null
+++ b/addons/crm/test/process/cancle_crm_lead.yml
@@ -0,0 +1,48 @@
+-
+  Cheking for lead from any stage, It will be cancle or not.
+-
+  !python {model: crm.lead}: |
+    lead_on_draft=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_on_draft.state == 'draft', "Lead is not in draft state"
+    self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    lead_on_cancel=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_on_cancel.state == 'cancel', "Lead is not in cancel state"
+    self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    lead_on_reset=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_on_reset.state == 'draft', "Lead is not in draft state"
+    self.case_pending(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    lead_on_pending=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_on_pending.state == 'pending', "Lead is not in pending state"
+    self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    lead_pending_cancel=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_pending_cancel.state == 'cancel', "Lead is not in cancel state"
+
+-
+  For working on parent child relationship, we are creating sales executive department that will be work under 
+  Sales Department.
+-
+  !record {model: crm.case.section, id: section_sales_exe_department}:
+    name: "Sales Executive"
+    parent_id: crm.section_sales_department
+
+-
+  If Lead not handle by executive team so its need to Escalate lead from sales executive department to sales department,
+  for that purpose i Assign sales executive department on lead, after we will be process to escalate lead to sales department 
+-
+  !record {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0}:
+    section_id: section_sales_exe_department
+-
+  Processing on Lead escalate to sales Departemnt, we are checking for lead Escalate to sales Department from Executive
+  department or not.
+-
+  !python {model: crm.lead}: |
+    lead_rec=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    lead_cancle_reset=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_cancle_reset.state == 'draft', "Lead is not in draft state"
+    self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    lead_on_escalate=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_on_escalate.section_id.name == 'Sales Department', "Do not Escalate lead to on sales team from Executive team"
+    self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    lead_escalate_cancel=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
+    assert lead_escalate_cancel.state == 'cancel', "Lead is not in cancel state"

From 618fc88e3336276cef93502677bbf465c67f3444 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 11 Oct 2011 15:36:49 +0530
Subject: [PATCH 003/132] [ADD, REF]: crm: 1) Moved test_crm_meeting.yml to
 process/process_crm_meeting.yml 2) Used demo data from xml file instead of
 created yml data, 3) Improved all string regarding to end user and remove all
 string like coder, 4) Added confirm state and done state of meeting and
 cheked its worked or not

bzr revid: ron@tinyerp.com-20111011100649-wmokfc1tiknua2zz
---
 addons/crm/__openerp__.py                     |  2 +-
 .../crm/test/process/process_crm_meeting.yml  | 72 ++++++++++++++
 addons/crm/test/test_crm_meeting.yml          | 97 -------------------
 3 files changed, 73 insertions(+), 98 deletions(-)
 create mode 100644 addons/crm/test/process/process_crm_meeting.yml
 delete mode 100644 addons/crm/test/test_crm_meeting.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 27beb8e58ee..36e8fdb4d1e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -121,7 +121,7 @@ Creates a dashboard for CRM that includes:
     'test': [
             'test/process/process_crm_lead.yml',
             'test/process/cancle_crm_lead.yml',
-            'test/test_crm_meeting.yml',
+            'test/process/process_crm_meeting.yml',
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml',
             'test/test_crm_recurrent_meeting.yml',
diff --git a/addons/crm/test/process/process_crm_meeting.yml b/addons/crm/test/process/process_crm_meeting.yml
new file mode 100644
index 00000000000..91535424964
--- /dev/null
+++ b/addons/crm/test/process/process_crm_meeting.yml
@@ -0,0 +1,72 @@
+- |
+  Customer want to do initial discussion with us so we will arrage meeting or
+  phonecalles or internal Meeting with them. 
+-
+  !assert {model: crm.meeting, id: crm.crm_case_initialdiscussion0}:
+     - state == "draft"
+- |
+  For Remember purpose for meeting, i put reminder "30 minutes before" and assign
+  to meeting.
+-
+  !python {model: crm.meeting}: |
+     self.write(cr, uid, [ref('crm_case_initialdiscussion0')], {'alarm_id': ref("base_calendar.alarm5")})
+- |
+  In order to check recurrence on meetings I will set Recurrency to Custom
+  and I set the fields so that the meeting will occur weekly on Monday to Friday 10 times.
+-
+  !python {model: crm.meeting}: |
+     self.write(cr, uid, [ref("crm_case_initialdiscussion0")], {'fr': 1, 'mo': 1, 'th': 1, 'tu': 1, 'we':1, 'count':10, 'interval': 1, 'rrule_type': 'weekly'})
+
+- |
+  The meeting is scheduled on Monday and Friday for 10 times so i can see from the calendar view
+-
+  !python {model: crm.meeting}: |
+    self.fields_view_get(cr, uid, False, 'calendar', context)
+- |
+  We can check for one of the recurrent event and count the number of meeting.
+-
+  !python {model: crm.meeting}: |
+     import time
+     from datetime import datetime, date, timedelta
+     ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Initial discussion')], context={'virtual_id': True})
+     assert len(ids) == 10
+
+- |
+  If I want to edit meetings information for all occurrence I click on "Edit All" button.
+-
+  !python {model: crm.meeting}: |
+     self.write(cr, uid, [ref('crm_case_initialdiscussion0')], {'edit_all':'True'},context)
+- |
+  I can see that new meeting form is opened with same value.
+  I change some data for meeting and save it.
+  I can see from meeting's calendar view that all meeting occurrences are changed accordingly.
+-
+  !record {model: crm.meeting, id: crm.crm_case_initialdiscussion0}:
+    alarm_id: base_calendar.alarm9
+    rrule_type: weekly
+- |
+  In order to invite people(internal user) for this meetings, Create record for
+  people will come on meeting.
+-
+  !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
+    type: internal
+    send_mail: False
+    partner_id: base.res_partner_9
+    user_ids:
+      - base.user_demo
+-
+  Now inviting those people which we are registers.
+-
+  !python {model: base_calendar.invite.attendee}: |
+    self.do_invite(cr, uid, [ref('base_calendar_invite_attendee_0')], {'active_id': ref('crm_case_initialdiscussion0'), 'model' : 'crm.meeting', 'attendee_field':'attendee_ids'})
+- |
+  All conformation is completed for meeting now going to confirm meeting
+  and we can check also after completion of meeting, it is done or not. 
+-
+  !python {model: crm.meeting}: |
+    self.case_open(cr, uid, [ref('crm_case_initialdiscussion0')])
+    meeting_rec = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
+    assert meeting_rec.state == 'open', "Meeting is not in confirm state"
+    self.case_close(cr, uid, [ref('crm_case_initialdiscussion0')])
+    meeting_rec_close = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
+    assert meeting_rec_close.state == 'done', "Meeting is not in done state"
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
deleted file mode 100644
index 8d851dd58c7..00000000000
--- a/addons/crm/test/test_crm_meeting.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-- |
-  I will test Meetings which may be customer meeting or phonecall meeting or
-  internal Meeting.
-- |
-  I start by creating a new Meeting.
--
-  !record {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
-    categ_id: crm.categ_meet2
-    date: !eval time.strftime('%Y-%m-%d 16:04:00')
-    date_deadline: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 00:04:00')"
-    duration: 8.0
-    email_from: info@balmerinc.be
-    location: Ahmedabad
-    name: Regarding Presentation
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    rrule_type: weekly
-    section_id: crm.section_sales_department
-- |
-  I check that the Meetings is in 'UnConfirmed' state.
--
-  !assert {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
-     - state == "draft"
-- |
-  I can set reminder on meeting if I put reminder "40 minutes before" .
-- |
-  For that, I first create alarm.
--
-  !record {model: res.alarm, id: res_alarm_minituesbefore0}:
-    name: 40 minutes before
-    trigger_duration: 40
-    trigger_interval: minutes
-    trigger_occurs: before
-    trigger_related: start
-- |
-  I will assign this reminder.
-
-- !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'alarm_id': ref("res_alarm_minituesbefore0")})
-- |
-  In order to check recurrence on meetings I will set Recurrency to Custom
-  and I set the fields so that the meeting will occur weekly on Monday and Friday 10 times.
--
-  !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref("crm_meeting_regardingpresentation0")], {'fr': 1, 'mo': 1, 'th': 1, 'tu': 1, 'we':1,   'count':10, 'interval': 1, 'rrule_type': 'weekly'})
-
-- |
-  I can see from the calendar view that the meeting is scheduled on Monday and Friday
-  for 10 times.
-
--
-  !python {model: crm.meeting}: |
-    self.fields_view_get(cr, uid, False, 'calendar', context)
-- |
-  I will search for one of the recurrent event and count the number of meeting.
--
-  !python {model: crm.meeting}: |
-     import time
-     from datetime import datetime, date, timedelta
-     ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Regarding Presentation')], context={'virtual_id': True})
-     assert len(ids) == 10
-
-- |
-  If I want to edit meetings information for all occurrence I click on "Edit All" button.
--
-  !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref('crm_meeting_regardingpresentation0')], {'edit_all':'True'},context)
-- |
-  I can see that new meeting form is opened with same value.
-  I change some data for meeting and save it.
-  I can see from meeting's calendar view that all meeting occurrences are changed accordingly.
--
-  !record {model: crm.meeting, id: crm.crm_meeting_regardingpresentation0}:
-    alarm_id: base_calendar.alarm9
-    rrule_type: weekly
-
-- |
-  In order to invite people for this meetings, I click on "Invite People" button
-  I can invite internal user.
--
-  !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
-    type: internal
-    send_mail: False
-    partner_id: base.res_partner_9
-    user_ids:
-      - base.user_demo
--
-  I click on "Invite" button of "Invite attendee" wizard.
--
-  !python {model: base_calendar.invite.attendee}: |
-    self.do_invite(cr, uid, [ref('base_calendar_invite_attendee_0')], {'active_id': ref('crm_meeting_regardingpresentation0'), 'model' : 'crm.meeting', 'attendee_field':'attendee_ids'})
-
-- |
-  After direct/indirect confirmation for meetings I can confirm meeting.
--
-  !python {model: crm.meeting}: |
-    self.case_open(cr, uid, [ref('crm_meeting_regardingpresentation0')])

From 7316a069b348634586c1f0f3864a60c98a3388f9 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 11 Oct 2011 15:42:57 +0530
Subject: [PATCH 004/132] [IMP] crm : user not assign properly on
 test_crm_lead_case2.yml

bzr revid: ron@tinyerp.com-20111011101257-p8fiuov1xtjcfvdh
---
 addons/crm/test/test_crm_lead_case2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/test/test_crm_lead_case2.yml b/addons/crm/test/test_crm_lead_case2.yml
index 23a654d31a8..af1b7e7e07b 100644
--- a/addons/crm/test/test_crm_lead_case2.yml
+++ b/addons/crm/test/test_crm_lead_case2.yml
@@ -25,7 +25,7 @@
 -
    I assign segmentation.
 -
-   !record {model: res.users, id: res_users_usercrm0}:
+   !record {model: res.users, id: base.user_root}:
      context_section_id: crm_case_section_demosalesteam
 -  |
    I create a new lead "Test Customer" and I provide an address to this

From da3aca4263643ca170dd395b81827a2e96dd4fd3 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 11 Oct 2011 18:30:50 +0530
Subject: [PATCH 005/132] [ADD, REF]: crm: 1) Moved test_crm_phonecall.yml to
 process/process_crm_phonecall.yml 2) Removed Phonecall by log seduling, 3)
 Improved varibles names and conversion, 4) changed string Interview call to
 interest with openerp, 5) Improved all string regarding to end user and
 remove all string like coder, 6) Added stage after completion of phonecall
 and cheked that working properly or not

bzr revid: ron@tinyerp.com-20111011130050-vk24chpik6y4ijc4
---
 addons/crm/__openerp__.py                     |   2 +-
 .../test/process/process_crm_phonecall.yml    |  73 +++++++++++
 addons/crm/test/test_crm_phonecall.yml        | 116 ------------------
 3 files changed, 74 insertions(+), 117 deletions(-)
 create mode 100644 addons/crm/test/process/process_crm_phonecall.yml
 delete mode 100644 addons/crm/test/test_crm_phonecall.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 36e8fdb4d1e..05ed350bea1 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/cancle_crm_lead.yml',
             'test/process/process_crm_meeting.yml',
             'test/test_crm_opportunity.yml',
-            'test/test_crm_phonecall.yml',
+            'test/process/process_crm_phonecall.yml',
             'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
diff --git a/addons/crm/test/process/process_crm_phonecall.yml b/addons/crm/test/process/process_crm_phonecall.yml
new file mode 100644
index 00000000000..25f3069fac6
--- /dev/null
+++ b/addons/crm/test/process/process_crm_phonecall.yml
@@ -0,0 +1,73 @@
+- |
+  For customer or partner purpose, I called to him/her for discussion about openerp.
+-
+  !record {model: crm.phonecall, id: crm_phonecall_disc_openerp}:
+    date: !eval time.strftime('%Y-%m-%d 08:00:00')
+    name: Discussion About Openerp
+    duration: 2.0
+    section_id: crm.section_sales_department
+-
+  After called to Customer/partner, So creating record to merge with exiting partner
+-
+  !record {model: crm.phonecall2partner, id: crm_phonecall2partner_existed}:
+    action: exist
+    partner_id: base.res_partner_9
+
+-
+  We are going to create partner.
+-
+  !python {model: crm.phonecall2partner}: |
+
+    self._select_partner(cr, uid,{"active_ids": [ref("crm_phonecall_disc_openerp")]})
+    self.open_create_partner(cr, uid, [ref("crm_phonecall2partner_existed")], {"active_ids": [ref("crm_phonecall_disc_openerp")]})
+    self.make_partner(cr, uid, [ref("crm_phonecall2partner_existed")], {"active_ids": [ref("crm_phonecall_disc_openerp")]})
+
+- |
+  As the success of phonecall seems to be a real business opportunity, It will convert
+  it to opportunity.
+-
+  !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_disc_openerp}:
+    name: Discussion About Openerp
+    partner_id: base.res_partner_9
+    planned_revenue: 0.0
+    probability: 0.0
+- |
+  Business opportunity is now assigned to this phonecall.
+-
+  !assert {model: crm.phonecall, id: crm_phonecall_disc_openerp}:
+     - opportunity_id != False
+-
+   Succeed phonecall, it will be convert into on opportunity.
+-
+  !python {model: crm.phonecall2opportunity}: |
+     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_disc_openerp")], {"active_id": ref("crm_phonecall_disc_openerp")})
+- |
+  For business And I check that the phonecall and the newly created business 
+  opportunity is linked to same  partner.
+-
+  !python {model: crm.phonecall}: |
+    obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_disc_openerp'))
+    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
+    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
+    assert obj_phonecall.partner_id == obj_opp.partner_id
+- |
+  Customer/partner intested with our product, so we will call back to him/her
+-
+  !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_disc_openerp}:
+    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
+    name: interest with openerp
+    section_id: crm.section_sales_department
+    user_id: base.user_root
+    action: schedule
+    categ_id: crm.categ_phone1
+- |
+  Create other sedular call which is interested customer/partner.
+-
+  !python {model: crm.phonecall2phonecall}: |
+    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_disc_openerp')], {'active_id': ref('crm_phonecall_disc_openerp')})
+- |
+  Completion of phonecall, Cheking for phonecall summary is close or not.
+-
+  !python {model: crm.phonecall}: |
+    phonecall_rec = self.browse(cr, uid, ref('crm_phonecall_disc_openerp'))
+    assert phonecall_rec.state == 'done', "Phonecall is not in done state"
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
deleted file mode 100644
index 0754a5b9544..00000000000
--- a/addons/crm/test/test_crm_phonecall.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-- |
-  I start by creating a new phonecall.
--
-  !record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
-    date: !eval time.strftime('%Y-%m-%d 08:00:00')
-    name: Interview call
-    duration: 2.0
-    section_id: crm.section_sales_department
--
-  I select partner by click on "Create a Partner" button.
--
-  !record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
-    action: exist
-    partner_id: base.res_partner_9
-
--
-  I click on "Continue" button of this wizard and make partner.
--
-  !python {model: crm.phonecall2partner}: |
-
-    self._select_partner(cr, uid,{"active_ids": [ref("crm_phonecall_interviewcall0")]})
-    self.open_create_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
-    self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
-
-- |
-  As the success of phonecall seems to be a real business opportunity, I will convert
-  it to opportunity by clicking on the "Convert to Opportunity" button.
--
-  !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_interviewcall0}:
-    name: Interview call
-    partner_id: base.res_partner_9
-    planned_revenue: 0.0
-    probability: 0.0
-- |
-  I can see that a business opportunity is now assigned to this phonecall
--
-  !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
-     - opportunity_id != False
--
-   I click on "Convert" button of this wizard.
--
-  !python {model: crm.phonecall2opportunity}: |
-     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
-- |
-  And I check that the phonecall and the newly created business opportunity is linked
-  to same  partner.
--
-  !python {model:  crm.phonecall}: |
-    obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_interviewcall0'))
-    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
-    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
-    assert obj_phonecall.partner_id == obj_opp.partner_id
-- |
-  I schedule Meeting on this current phonecall by clicking on "schedule
-  Meeting".
--
-   !python {model: crm.phonecall}: |
-     self.action_make_meeting(cr, uid, [ref('crm_phonecall_interviewcall0')])
-
--  |
-   I can see that Meeting's calendar view is shown.
-   then I click on the date on which I want schedule meeting.
-   I fill proper data for that meeting and save it.
--
-  !record {model: crm.meeting, id: crm_meeting_interviewcall0}:
-    alarm_id: base_calendar.alarm3
-    date: !eval "'%s-%s-%s 09:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    date_deadline: !eval "'%s-%s-%s 17:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    duration: 8.0
-    email_from: info@balmerinc.be
-    name: Interview call
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    phonecall_id: 'crm_phonecall_interviewcall0'
-    state: open
-
-- |
-  In order to schedule other phonecall to the partner
-  I click on "schedule other call" button. and plan for other call
-  I can see that it will open other phonecall view with some data same as current
-  phonecall.
--
-  !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall0}:
-    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    name: Interview call
-    section_id: crm.section_sales_department
-    user_id: base.user_root
-    action: schedule
-    categ_id: crm.categ_phone1
--
-  I click on "schedule other call" button. and plan for other call.
--
-  !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall1}:
-    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    name: Interview call
-    section_id: crm.section_sales_department
-    user_id: base.user_root
-    action: log
-    categ_id: crm.categ_phone1
-- |
-  I click on "Schedule" button of this  wizard.
--
-  !python {model: crm.phonecall2phonecall}: |
-    fields = {
-              'name': 'Interview call',
-              'section_id': ref('crm.section_sales_department'),
-              'user_id': ref('base.user_root'),
-              'categ_id': ref('crm.categ_phone1')
-             }
-    self.default_get(cr, uid, fields,{'active_id': ref('crm_phonecall_interviewcall0')})
-    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})
-- |
-  I click on "Schedule" button of this  wizard with log option.
--
-  !python {model: crm.phonecall2phonecall}: |
-        self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall1')], {'active_id': ref('crm_phonecall_interviewcall0')})

From e85f8215237e5feb62311d70c2ed53b53f763a0b Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 11 Oct 2011 18:34:48 +0530
Subject: [PATCH 006/132] [IMP] crm: String improvement in
 process_crm_meeting.yml

bzr revid: ron@tinyerp.com-20111011130448-vtijq1p0s83o3e4y
---
 addons/crm/test/process/process_crm_meeting.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/test/process/process_crm_meeting.yml b/addons/crm/test/process/process_crm_meeting.yml
index 91535424964..8f8ae2cd417 100644
--- a/addons/crm/test/process/process_crm_meeting.yml
+++ b/addons/crm/test/process/process_crm_meeting.yml
@@ -55,7 +55,7 @@
     user_ids:
       - base.user_demo
 -
-  Now inviting those people which we are registers.
+  Now inviting those people which we are registered.
 -
   !python {model: base_calendar.invite.attendee}: |
     self.do_invite(cr, uid, [ref('base_calendar_invite_attendee_0')], {'active_id': ref('crm_case_initialdiscussion0'), 'model' : 'crm.meeting', 'attendee_field':'attendee_ids'})

From cce4c999e1f0095cc6a20023a156341c548b0f59 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 11:06:14 +0530
Subject: [PATCH 007/132] [IMP, REF]: crm: All Changes on process_crm_lead.yml,
 1) Used demo data instead of yml creation data of lead, 2) Improved variables
 names and conversion, 3) Improved all string regarding to end user and remove
 all string like coder, 4) Removed mass wizard to convert lead to opportunity

bzr revid: ron@tinyerp.com-20111012053614-4fddssqes817phtg
---
 addons/crm/test/process/process_crm_lead.yml | 100 +++++++------------
 1 file changed, 34 insertions(+), 66 deletions(-)

diff --git a/addons/crm/test/process/process_crm_lead.yml b/addons/crm/test/process/process_crm_lead.yml
index f35b03dcd4f..db1ffa4e753 100644
--- a/addons/crm/test/process/process_crm_lead.yml
+++ b/addons/crm/test/process/process_crm_lead.yml
@@ -1,112 +1,80 @@
--  |
-   I start by creating a new lead "Steave Jon" and I provide an address to this
-   new customer, as well as an email "info@mycustomer.com".
 -
-   !record {model: crm.lead, id: crm_lead_newcustomer0}:
-     email_from: info@mycustomer.com
-     name: Steave Jon
-     partner_name: Capegemini
-     partner_id: base.res_partner_9
-     phone: (855) 924-4364
-     mobile: (333) 715-1450
-     section_id: crm.section_sales_department
-     referred: False
--  |
-   I check that the lead is in 'draft' state.
+  Communication by phonecall or mail I got lead from Customer/partner, I test to created lead in initial stage.
 -
-   !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in Draft}:
+   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in Draft}:
      - state == "draft"
 -
-   I open lead by click on "Open" button.
+  After some discussion about lead with customer/partner some possibillity to go ahead, so we are opening this lead.
 -
    !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
+     self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
      fields={
             'day_open': 0.0,
             'day_close': 0.0
             }
-     self._compute_day(cr, uid, [ref("crm_lead_newcustomer0")], fields, context)
+     self._compute_day(cr, uid, [ref("crm_case_qrecorp0")], fields, context)
 - |
-  I check that lead is now in 'open' state.
+  In order to test lead, i will test lead is in open stage.
 -
-  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
      - state == "open"
 -
-   I search id for case object.
--
-   !python {model: crm.case.categ}: |
-     self._find_object_id(cr, uid, context)
--  |
-   As the lead seems to be a real business opportunity, I will convert it to a
-   partner
-   and a business opportunity by clicking on the "Convert" button.
+  As the lead seems to be a real business opportunity, I will convert it to a partner
+  and a business opportunity.
 -
    !python {model: crm.lead}: |
-     lead = self.browse(cr, uid, ref('crm_lead_newcustomer0'))
-     action = self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
+     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+     action = self.convert_opportunity(cr, uid, [ref("crm_case_qrecorp0")], {'active_ids': [ref("crm_case_qrecorp0")]})
      assert action['res_model'] == 'crm.lead2opportunity.partner'
 -
-   |
-   I select "create a new partner" option.
+  In order to create partner, It is possible to check for partner is exiting or i will create new partner 
+  according to this lead. so first i will create new partner. 
 -
    !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_0}:
       action: 'create'
       name: 'convert'
 -
-  Then, Click on "Create Opportunity" button.
+  In order to create opportunity and its created by new partner.
 -
    !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
+      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
 -
-   |
-   I select "Link to an existing partner" option.
+  In order to test with exiting partner, so i will test with exiting partner and create opportunities based
+  on exiting partner. 
 -
    !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
       action: 'exist'
 -
-  Then, Click on "Create Opportunity" button.
+  Create opportunity based on exiting partner
 -
    !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
+      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
 -
-   |
-   I select "Do not link to a partner" option.
+  In order to test with no link wih partner, so i will test create opportunities based
+  no link to any partner.
 -
-   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}:
-      action: 'nothing'
+  !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}:
+    action: 'nothing'
 -
-  Then, Click on "Create Opportunity" button.
+  In order to test create opportunity based on no link to any partner.
 -
-   !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_2")], {'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
--  |
-   In order to check the opportunity is created or not, I check type.
+  !python {model: crm.lead2opportunity.partner}: |
+    self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_2")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
+-
+  In order to test lead, i will test to lead is converted to opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref("crm_lead_newcustomer0"))
+    lead = self.browse(cr, uid, ref("crm_case_qrecorp0"))
     assert lead.type == 'opportunity'
-
 -
-  I create mass report of lead to opprtunity partner.
+  Finally, i won this lead and congratulation we have new partner so i will close this lead.
 -
-  !record {model: crm.lead2opportunity.partner.mass, id: crm_lead2opportunity_partner_mass0}:
-    user_ids:
-      - base.user_root
-    section_id: crm.section_sales_department
+  !python {model: crm.lead}: |
+    self.case_close(cr, uid, [ref("crm_case_qrecorp0")])
 -
-  Then, execute that mass wizard.
+  In order to test lead, i will test its on close or not.
 -
-   !python {model: crm.lead2opportunity.partner.mass}: |
-      self.mass_convert(cr, uid, [ref("crm_lead2opportunity_partner_mass0")],{'active_ids': [ref("crm_lead_newcustomer0")], 'active_id': ref("crm_lead_newcustomer0")})
--
-   I close lead by click on "close" button.
--
-   !python {model: crm.lead}: |
-     self.case_close(cr, uid, [ref("crm_lead_newcustomer0")])
-- |
-  I check that lead is now in 'done' state.
--
-  !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in done state}:
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in done state}:
      - state == "done"
 #-
 #  |

From 7e237da6090533e7ea2f374719abef1592986eee Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 12:00:36 +0530
Subject: [PATCH 008/132] [IMP] crm: Error generated by assigned wrong
 reference on test_crm_opportunity.yml

bzr revid: ron@tinyerp.com-20111012063036-hlm825p2gut48o29
---
 addons/crm/test/test_crm_opportunity.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index 734a1cae46c..8f171311b4d 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -109,5 +109,5 @@
    !python {model: crm.merge.opportunity}: |
     op_list = [ref('crm_opportunity_1'),ref('crm_opportunity_2')]
     op_ids=self.pool.get('crm.lead').browse(cr,uid,op_list)
-    lead_ids = [ref('crm_lead_newcustomer0')]
+    lead_ids = [ref('crm_case_qrecorp0')]
     self.merge(cr, uid, op_ids, {'lead_ids': lead_ids})

From ac090c0b3ec42a5d458a7564338694166a717588 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 14:45:33 +0530
Subject: [PATCH 009/132] [REF] crm: 1) rename file process_crm_lead.yml to
 crm_lead_open.yml and its have checked till qualified lead

bzr revid: ron@tinyerp.com-20111012091533-bwxqz7t6f5dsni1s
---
 addons/crm/test/process/crm_lead_open.yml    | 10 +++
 addons/crm/test/process/process_crm_lead.yml | 94 --------------------
 2 files changed, 10 insertions(+), 94 deletions(-)
 create mode 100644 addons/crm/test/process/crm_lead_open.yml
 delete mode 100644 addons/crm/test/process/process_crm_lead.yml

diff --git a/addons/crm/test/process/crm_lead_open.yml b/addons/crm/test/process/crm_lead_open.yml
new file mode 100644
index 00000000000..d5c6bb2d101
--- /dev/null
+++ b/addons/crm/test/process/crm_lead_open.yml
@@ -0,0 +1,10 @@
+-
+  Communication by phonecall or mail I got lead from Customer/partner, I test to created lead in initial stage.
+-
+   !python {model: crm.lead}: |
+     self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
+- |
+  In order to test lead, i will test lead is in open stage.
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
+     - state == "open"
diff --git a/addons/crm/test/process/process_crm_lead.yml b/addons/crm/test/process/process_crm_lead.yml
deleted file mode 100644
index db1ffa4e753..00000000000
--- a/addons/crm/test/process/process_crm_lead.yml
+++ /dev/null
@@ -1,94 +0,0 @@
--
-  Communication by phonecall or mail I got lead from Customer/partner, I test to created lead in initial stage.
--
-   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in Draft}:
-     - state == "draft"
--
-  After some discussion about lead with customer/partner some possibillity to go ahead, so we are opening this lead.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
-     fields={
-            'day_open': 0.0,
-            'day_close': 0.0
-            }
-     self._compute_day(cr, uid, [ref("crm_case_qrecorp0")], fields, context)
-- |
-  In order to test lead, i will test lead is in open stage.
--
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
-     - state == "open"
--
-  As the lead seems to be a real business opportunity, I will convert it to a partner
-  and a business opportunity.
--
-   !python {model: crm.lead}: |
-     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
-     action = self.convert_opportunity(cr, uid, [ref("crm_case_qrecorp0")], {'active_ids': [ref("crm_case_qrecorp0")]})
-     assert action['res_model'] == 'crm.lead2opportunity.partner'
--
-  In order to create partner, It is possible to check for partner is exiting or i will create new partner 
-  according to this lead. so first i will create new partner. 
--
-   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_0}:
-      action: 'create'
-      name: 'convert'
--
-  In order to create opportunity and its created by new partner.
--
-   !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
--
-  In order to test with exiting partner, so i will test with exiting partner and create opportunities based
-  on exiting partner. 
--
-   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
-      action: 'exist'
--
-  Create opportunity based on exiting partner
--
-   !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
--
-  In order to test with no link wih partner, so i will test create opportunities based
-  no link to any partner.
--
-  !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_2}:
-    action: 'nothing'
--
-  In order to test create opportunity based on no link to any partner.
--
-  !python {model: crm.lead2opportunity.partner}: |
-    self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_2")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
--
-  In order to test lead, i will test to lead is converted to opportunity.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref("crm_case_qrecorp0"))
-    assert lead.type == 'opportunity'
--
-  Finally, i won this lead and congratulation we have new partner so i will close this lead.
--
-  !python {model: crm.lead}: |
-    self.case_close(cr, uid, [ref("crm_case_qrecorp0")])
--
-  In order to test lead, i will test its on close or not.
--
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in done state}:
-     - state == "done"
-#-
-#  |
-#  yaml is also not working with smtp server and send new email.
-
-- |
-  I configure with smtp server.
-- |
-  And I communicate with lead through send New mail to Lead using its email address from the user who is logged in.
-- |
-  I check that communication history generated when send email to lead.
-- |
-  Then, I add a cc which receive copy of future communication between partner and users by mail.
-
-- |
-  I Reply to last Email to lead with some document attached.and check that communication history generated or not.
-

From aef95be470d8b889fb4ede1131f000f30ad31abc Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 15:31:34 +0530
Subject: [PATCH 010/132] [ADD] crm: 1) Added new crm_lead_to_opportunity.yml

bzr revid: ron@tinyerp.com-20111012100134-gueog210ck07yhx6
---
 addons/crm/__openerp__.py                     |  3 +-
 .../test/process/crm_lead_to_opportunity.yml  | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 addons/crm/test/process/crm_lead_to_opportunity.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 05ed350bea1..d7256360d40 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -119,7 +119,8 @@ Creates a dashboard for CRM that includes:
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/process/process_crm_lead.yml',
+            'test/process/crm_lead_open.yml',
+            'test/process/crm_lead_to_opportunity.yml',
             'test/process/cancle_crm_lead.yml',
             'test/process/process_crm_meeting.yml',
             'test/test_crm_opportunity.yml',
diff --git a/addons/crm/test/process/crm_lead_to_opportunity.yml b/addons/crm/test/process/crm_lead_to_opportunity.yml
new file mode 100644
index 00000000000..2c1ccc65bfb
--- /dev/null
+++ b/addons/crm/test/process/crm_lead_to_opportunity.yml
@@ -0,0 +1,36 @@
+-
+  As the lead seems to be a real business opportunity, I will convert it to a partner
+  and a business opportunity.
+-
+   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
+      action: 'exist'
+-
+  Create opportunity based on exiting partner
+-
+   !python {model: crm.lead2opportunity.partner}: |
+      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
+-
+  In order to test lead, i will test to lead is converted to opportunity.
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead is not converted on opportunity}:
+    - type == 'opportunity'
+-
+  Finally, i won this lead, so i will close this lead.
+-
+  !python {model: crm.lead}: |
+    self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
+-
+  In order to test lead, it is close or not.
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in done state}:
+    - state == "done"
+-
+  After won this lead probability is 100.
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
+    - probability == 100.0
+-
+  In order to test stage of opportunity after win, i will test stage of opportunity.
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: stage of opportunity is win}:
+    - stage_id.name == "Won"

From b864f6dbb749b093d2b2fb4e2b24155518b8082d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 16:03:09 +0530
Subject: [PATCH 011/132] [REF] crm: 1) Rename process_crm_meeting.yml to
 crm_meeting.yml 2) Covered from confirmatation to close meeting

bzr revid: ron@tinyerp.com-20111012103309-j71jwxzn52xbsnma
---
 addons/crm/test/process/crm_meeting.yml       | 12 ++++
 .../crm/test/process/process_crm_meeting.yml  | 72 -------------------
 2 files changed, 12 insertions(+), 72 deletions(-)
 create mode 100644 addons/crm/test/process/crm_meeting.yml
 delete mode 100644 addons/crm/test/process/process_crm_meeting.yml

diff --git a/addons/crm/test/process/crm_meeting.yml b/addons/crm/test/process/crm_meeting.yml
new file mode 100644
index 00000000000..508b1eaff59
--- /dev/null
+++ b/addons/crm/test/process/crm_meeting.yml
@@ -0,0 +1,12 @@
+- |
+  Customer want to do initial discussion with us so we will arrage meeting 
+  with them and checked also confirm meeting and after cheked it will be
+  completed. 
+-
+  !python {model: crm.meeting}: |
+    self.case_open(cr, uid, [ref('crm_case_initialdiscussion0')])
+    meeting_rec = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
+    assert meeting_rec.state == 'open', "Meeting is not in confirm state"
+    self.case_close(cr, uid, [ref('crm_case_initialdiscussion0')])
+    meeting_rec_close = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
+    assert meeting_rec_close.state == 'done', "Meeting is not in done state"
\ No newline at end of file
diff --git a/addons/crm/test/process/process_crm_meeting.yml b/addons/crm/test/process/process_crm_meeting.yml
deleted file mode 100644
index 8f8ae2cd417..00000000000
--- a/addons/crm/test/process/process_crm_meeting.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-- |
-  Customer want to do initial discussion with us so we will arrage meeting or
-  phonecalles or internal Meeting with them. 
--
-  !assert {model: crm.meeting, id: crm.crm_case_initialdiscussion0}:
-     - state == "draft"
-- |
-  For Remember purpose for meeting, i put reminder "30 minutes before" and assign
-  to meeting.
--
-  !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref('crm_case_initialdiscussion0')], {'alarm_id': ref("base_calendar.alarm5")})
-- |
-  In order to check recurrence on meetings I will set Recurrency to Custom
-  and I set the fields so that the meeting will occur weekly on Monday to Friday 10 times.
--
-  !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref("crm_case_initialdiscussion0")], {'fr': 1, 'mo': 1, 'th': 1, 'tu': 1, 'we':1, 'count':10, 'interval': 1, 'rrule_type': 'weekly'})
-
-- |
-  The meeting is scheduled on Monday and Friday for 10 times so i can see from the calendar view
--
-  !python {model: crm.meeting}: |
-    self.fields_view_get(cr, uid, False, 'calendar', context)
-- |
-  We can check for one of the recurrent event and count the number of meeting.
--
-  !python {model: crm.meeting}: |
-     import time
-     from datetime import datetime, date, timedelta
-     ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Initial discussion')], context={'virtual_id': True})
-     assert len(ids) == 10
-
-- |
-  If I want to edit meetings information for all occurrence I click on "Edit All" button.
--
-  !python {model: crm.meeting}: |
-     self.write(cr, uid, [ref('crm_case_initialdiscussion0')], {'edit_all':'True'},context)
-- |
-  I can see that new meeting form is opened with same value.
-  I change some data for meeting and save it.
-  I can see from meeting's calendar view that all meeting occurrences are changed accordingly.
--
-  !record {model: crm.meeting, id: crm.crm_case_initialdiscussion0}:
-    alarm_id: base_calendar.alarm9
-    rrule_type: weekly
-- |
-  In order to invite people(internal user) for this meetings, Create record for
-  people will come on meeting.
--
-  !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
-    type: internal
-    send_mail: False
-    partner_id: base.res_partner_9
-    user_ids:
-      - base.user_demo
--
-  Now inviting those people which we are registered.
--
-  !python {model: base_calendar.invite.attendee}: |
-    self.do_invite(cr, uid, [ref('base_calendar_invite_attendee_0')], {'active_id': ref('crm_case_initialdiscussion0'), 'model' : 'crm.meeting', 'attendee_field':'attendee_ids'})
-- |
-  All conformation is completed for meeting now going to confirm meeting
-  and we can check also after completion of meeting, it is done or not. 
--
-  !python {model: crm.meeting}: |
-    self.case_open(cr, uid, [ref('crm_case_initialdiscussion0')])
-    meeting_rec = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
-    assert meeting_rec.state == 'open', "Meeting is not in confirm state"
-    self.case_close(cr, uid, [ref('crm_case_initialdiscussion0')])
-    meeting_rec_close = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
-    assert meeting_rec_close.state == 'done', "Meeting is not in done state"

From 6b19d9baa1d501d18a4dd1550ff50d88d6354faa Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 16:22:21 +0530
Subject: [PATCH 012/132] [IMP] crm: 1) Improvement in openerp for correct path
 of  crm_meeting.yml

bzr revid: ron@tinyerp.com-20111012105221-mxlfnzeg16s93d7u
---
 addons/crm/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index d7256360d40..51489fd5aa4 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -122,7 +122,7 @@ Creates a dashboard for CRM that includes:
             'test/process/crm_lead_open.yml',
             'test/process/crm_lead_to_opportunity.yml',
             'test/process/cancle_crm_lead.yml',
-            'test/process/process_crm_meeting.yml',
+            'test/process/crm_meeting.yml',
             'test/test_crm_opportunity.yml',
             'test/process/process_crm_phonecall.yml',
             'test/test_crm_recurrent_meeting.yml',

From e355b8b55d9995bb4533fac1f914a83908159f32 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 17:26:44 +0530
Subject: [PATCH 013/132] [ADD] crm: 1) Added lead_form.yml, 2) Covered
 onchange_partner operation and unlink operation

bzr revid: ron@tinyerp.com-20111012115644-q91ejya01c8k28m1
---
 addons/crm/__openerp__.py        |  1 +
 addons/crm/test/ui/lead_form.yml | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 addons/crm/test/ui/lead_form.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 51489fd5aa4..dee4a6766ed 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,6 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/crm_lead_to_opportunity.yml',
             'test/process/cancle_crm_lead.yml',
             'test/process/crm_meeting.yml',
+            'test/ui/lead_form.yml',
             'test/test_crm_opportunity.yml',
             'test/process/process_crm_phonecall.yml',
             'test/test_crm_recurrent_meeting.yml',
diff --git a/addons/crm/test/ui/lead_form.yml b/addons/crm/test/ui/lead_form.yml
new file mode 100644
index 00000000000..5ad241ca104
--- /dev/null
+++ b/addons/crm/test/ui/lead_form.yml
@@ -0,0 +1,20 @@
+-
+  In order to check for changes on partner, data will be change automatically according to partner,
+-
+  !python {model: crm.lead}: |
+    action = self.onchange_partner_address_id(cr, uid, ref("crm_case_initialdiscussion0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
+    assert action['value']['country_id'] == 20, "Country name not True"
+    assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
+-
+  I try to Unlink the Lead I create new record of lead. 
+-
+   !record {model: crm.lead, id: crm_lead_intested_openerp}:
+     name: Interested in openerp
+-
+  In order to test unlink lead, i will do unlink this lead
+-
+  !python {model: crm.lead}: |
+    from tools.translate import _
+    self.unlink(cr, uid, [ref("crm_lead_intested_openerp")])
+    id = self.search(cr, uid, [('id', '=', ref("crm_lead_intested_openerp"))])
+    assert len(id) < 1, _('Lead is not deleted') 

From 0df8ef1c6c7b3f0154efb8717617bf9d7b68b2ac Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 17:51:41 +0530
Subject: [PATCH 014/132] [REF] crm: 1) Rename process_crm_phonecall.yml to
 crm_phonecall.yml, 2) Covered phonecall and its coverted to opportunity and
 close this phonecall

bzr revid: ron@tinyerp.com-20111012122141-7slvyilesfbxq1cw
---
 addons/crm/test/process/crm_phonecall.yml     | 34 +++++++++
 .../test/process/process_crm_phonecall.yml    | 73 -------------------
 2 files changed, 34 insertions(+), 73 deletions(-)
 create mode 100644 addons/crm/test/process/crm_phonecall.yml
 delete mode 100644 addons/crm/test/process/process_crm_phonecall.yml

diff --git a/addons/crm/test/process/crm_phonecall.yml b/addons/crm/test/process/crm_phonecall.yml
new file mode 100644
index 00000000000..541f92133fe
--- /dev/null
+++ b/addons/crm/test/process/crm_phonecall.yml
@@ -0,0 +1,34 @@
+- |
+  For customer or partner purpose, I called to him/her for discussion about openerp.
+  As the success of phonecall seems to be a real business opportunity, It will convert
+  it to opportunity.
+-
+  !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_disc_openerp}:
+    name: Discuss Review Process
+    partner_id: base.res_partner_tinyatwork
+    planned_revenue: 0.0
+    probability: 0.0
+- |
+  Business opportunity is now assigned to this phonecall.
+-
+  !assert {model: crm.phonecall, id: crm_case_phone04}:
+     - opportunity_id != False
+-
+  Succeed phonecall, it will be convert into on opportunity.
+-
+  !python {model: crm.phonecall2opportunity}: |
+    self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_disc_openerp")], {"active_id": ref("crm_case_phone04")})
+- |
+  For business And I check that the phonecall and the newly created business 
+  opportunity is linked to same  partner.
+-
+  !python {model: crm.phonecall}: |
+    obj_phonecall = self.browse(cr, uid, ref('crm_case_phone04'))
+    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
+    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
+    assert obj_phonecall.partner_id == obj_opp.partner_id, "created business opportunity is not linked to same  partner"
+-
+  Completion of phonecall, Cheking for phonecall summary is close or not.
+-
+  !assert {model: crm.phonecall, id: crm.crm_case_phone04, string: phonecall is held}:
+    - state == 'done'
diff --git a/addons/crm/test/process/process_crm_phonecall.yml b/addons/crm/test/process/process_crm_phonecall.yml
deleted file mode 100644
index 25f3069fac6..00000000000
--- a/addons/crm/test/process/process_crm_phonecall.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-- |
-  For customer or partner purpose, I called to him/her for discussion about openerp.
--
-  !record {model: crm.phonecall, id: crm_phonecall_disc_openerp}:
-    date: !eval time.strftime('%Y-%m-%d 08:00:00')
-    name: Discussion About Openerp
-    duration: 2.0
-    section_id: crm.section_sales_department
--
-  After called to Customer/partner, So creating record to merge with exiting partner
--
-  !record {model: crm.phonecall2partner, id: crm_phonecall2partner_existed}:
-    action: exist
-    partner_id: base.res_partner_9
-
--
-  We are going to create partner.
--
-  !python {model: crm.phonecall2partner}: |
-
-    self._select_partner(cr, uid,{"active_ids": [ref("crm_phonecall_disc_openerp")]})
-    self.open_create_partner(cr, uid, [ref("crm_phonecall2partner_existed")], {"active_ids": [ref("crm_phonecall_disc_openerp")]})
-    self.make_partner(cr, uid, [ref("crm_phonecall2partner_existed")], {"active_ids": [ref("crm_phonecall_disc_openerp")]})
-
-- |
-  As the success of phonecall seems to be a real business opportunity, It will convert
-  it to opportunity.
--
-  !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_disc_openerp}:
-    name: Discussion About Openerp
-    partner_id: base.res_partner_9
-    planned_revenue: 0.0
-    probability: 0.0
-- |
-  Business opportunity is now assigned to this phonecall.
--
-  !assert {model: crm.phonecall, id: crm_phonecall_disc_openerp}:
-     - opportunity_id != False
--
-   Succeed phonecall, it will be convert into on opportunity.
--
-  !python {model: crm.phonecall2opportunity}: |
-     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_disc_openerp")], {"active_id": ref("crm_phonecall_disc_openerp")})
-- |
-  For business And I check that the phonecall and the newly created business 
-  opportunity is linked to same  partner.
--
-  !python {model: crm.phonecall}: |
-    obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_disc_openerp'))
-    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
-    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
-    assert obj_phonecall.partner_id == obj_opp.partner_id
-- |
-  Customer/partner intested with our product, so we will call back to him/her
--
-  !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_disc_openerp}:
-    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day)"
-    name: interest with openerp
-    section_id: crm.section_sales_department
-    user_id: base.user_root
-    action: schedule
-    categ_id: crm.categ_phone1
-- |
-  Create other sedular call which is interested customer/partner.
--
-  !python {model: crm.phonecall2phonecall}: |
-    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_disc_openerp')], {'active_id': ref('crm_phonecall_disc_openerp')})
-- |
-  Completion of phonecall, Cheking for phonecall summary is close or not.
--
-  !python {model: crm.phonecall}: |
-    phonecall_rec = self.browse(cr, uid, ref('crm_phonecall_disc_openerp'))
-    assert phonecall_rec.state == 'done', "Phonecall is not in done state"

From cbe30f479ebbfacaf2fd2f287a40efa759227b52 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 18:07:50 +0530
Subject: [PATCH 015/132] [IMP] crm: 1) Improvement in openerp for correct path
 of  crm_phonecall.yml

bzr revid: ron@tinyerp.com-20111012123750-31997j4tkpx4odjt
---
 addons/crm/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index dee4a6766ed..ff9030cc2e8 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -125,7 +125,7 @@ Creates a dashboard for CRM that includes:
             'test/process/crm_meeting.yml',
             'test/ui/lead_form.yml',
             'test/test_crm_opportunity.yml',
-            'test/process/process_crm_phonecall.yml',
+            'test/process/crm_phonecall.yml',
             'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',

From 8e32600b09b62c0edd505c2c974c9fa99dad457d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 18:22:13 +0530
Subject: [PATCH 016/132] [IMP] crm: Add more assert cheking and remove initial
 checking on crm_phonecall.yml

bzr revid: ron@tinyerp.com-20111012125213-yq4vhekyblxl7017
---
 addons/crm/test/process/crm_phonecall.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/addons/crm/test/process/crm_phonecall.yml b/addons/crm/test/process/crm_phonecall.yml
index 541f92133fe..7f81a7d86fc 100644
--- a/addons/crm/test/process/crm_phonecall.yml
+++ b/addons/crm/test/process/crm_phonecall.yml
@@ -8,11 +8,6 @@
     partner_id: base.res_partner_tinyatwork
     planned_revenue: 0.0
     probability: 0.0
-- |
-  Business opportunity is now assigned to this phonecall.
--
-  !assert {model: crm.phonecall, id: crm_case_phone04}:
-     - opportunity_id != False
 -
   Succeed phonecall, it will be convert into on opportunity.
 -
@@ -20,15 +15,13 @@
     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_disc_openerp")], {"active_id": ref("crm_case_phone04")})
 - |
   For business And I check that the phonecall and the newly created business 
-  opportunity is linked to same  partner.
+  opportunity is linked to same  partner and also check with phonecall close or not.
 -
   !python {model: crm.phonecall}: |
     obj_phonecall = self.browse(cr, uid, ref('crm_case_phone04'))
     ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
     obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
     assert obj_phonecall.partner_id == obj_opp.partner_id, "created business opportunity is not linked to same  partner"
--
-  Completion of phonecall, Cheking for phonecall summary is close or not.
--
-  !assert {model: crm.phonecall, id: crm.crm_case_phone04, string: phonecall is held}:
-    - state == 'done'
+    assert obj_opp.stage_id.name == "New", "Converted opportunity is not in New stage"
+    assert obj_opp.stage_id.probability == 10.0, "Probability of opportunity is 10.0"
+    assert obj_phonecall.state == "done", "phonecall is held"

From 371ad07f80ff9210a0f309c888392609029d312d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 12 Oct 2011 18:54:02 +0530
Subject: [PATCH 017/132] [REF] crm : 1) Renamed cancle_crm_lead.yml to
 cancel_lead.yml, 2)Renamed crm_lead_to_opportunity.yml to
 lead2opportunity.yml, 3)Renamed crm_lead_open.yml to lead_open.yml 4)Renamed
 crm_meeting.yml to meeting.yml 5)Renamed crm_phonecall.yml to
 phonecall2opportunity.yml

bzr revid: ron@tinyerp.com-20111012132402-9xichtqjqdwo5g8i
---
 addons/crm/test/process/{cancle_crm_lead.yml => cancel_lead.yml}  | 0
 .../process/{crm_lead_to_opportunity.yml => lead2opportunity.yml} | 0
 addons/crm/test/process/{crm_lead_open.yml => lead_open.yml}      | 0
 addons/crm/test/process/{crm_meeting.yml => meeting.yml}          | 0
 .../test/process/{crm_phonecall.yml => phonecall2opportunity.yml} | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename addons/crm/test/process/{cancle_crm_lead.yml => cancel_lead.yml} (100%)
 rename addons/crm/test/process/{crm_lead_to_opportunity.yml => lead2opportunity.yml} (100%)
 rename addons/crm/test/process/{crm_lead_open.yml => lead_open.yml} (100%)
 rename addons/crm/test/process/{crm_meeting.yml => meeting.yml} (100%)
 rename addons/crm/test/process/{crm_phonecall.yml => phonecall2opportunity.yml} (100%)

diff --git a/addons/crm/test/process/cancle_crm_lead.yml b/addons/crm/test/process/cancel_lead.yml
similarity index 100%
rename from addons/crm/test/process/cancle_crm_lead.yml
rename to addons/crm/test/process/cancel_lead.yml
diff --git a/addons/crm/test/process/crm_lead_to_opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
similarity index 100%
rename from addons/crm/test/process/crm_lead_to_opportunity.yml
rename to addons/crm/test/process/lead2opportunity.yml
diff --git a/addons/crm/test/process/crm_lead_open.yml b/addons/crm/test/process/lead_open.yml
similarity index 100%
rename from addons/crm/test/process/crm_lead_open.yml
rename to addons/crm/test/process/lead_open.yml
diff --git a/addons/crm/test/process/crm_meeting.yml b/addons/crm/test/process/meeting.yml
similarity index 100%
rename from addons/crm/test/process/crm_meeting.yml
rename to addons/crm/test/process/meeting.yml
diff --git a/addons/crm/test/process/crm_phonecall.yml b/addons/crm/test/process/phonecall2opportunity.yml
similarity index 100%
rename from addons/crm/test/process/crm_phonecall.yml
rename to addons/crm/test/process/phonecall2opportunity.yml

From 08a288eceabce77145d59d1775ef5e903912541c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 10:42:32 +0530
Subject: [PATCH 018/132] [IMP]: crm: All changes done on lead2opportunity.yml
 1) string improved from lead to opportunity when lead has been qualified 2)
 checked probability after opportunity had won

bzr revid: ron@tinyerp.com-20111013051232-k9oih94g1fvmdhbh
---
 addons/crm/test/process/lead2opportunity.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
index 2c1ccc65bfb..db85d634b21 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity.yml
@@ -15,22 +15,23 @@
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead is not converted on opportunity}:
     - type == 'opportunity'
 -
-  Finally, i won this lead, so i will close this lead.
+  Finally, i won this opportunity, so i will close this lead.
 -
   !python {model: crm.lead}: |
     self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
 -
-  In order to test lead, it is close or not.
+  In order to test opportunity, it is close or not.
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in done state}:
     - state == "done"
--
-  After won this lead probability is 100.
--
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
-    - probability == 100.0
 -
   In order to test stage of opportunity after win, i will test stage of opportunity.
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: stage of opportunity is win}:
     - stage_id.name == "Won"
+-
+  After won the opportunity, i will test probability is 100.
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
+    - probability == 100.0
+    
\ No newline at end of file

From 0d3652a60b657ad055634276c3de2519414d61e3 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 11:06:51 +0530
Subject: [PATCH 019/132] [IMP] crm : All renamed file name Updated on
 __opnerp.py file

bzr revid: ron@tinyerp.com-20111013053651-yfoku3auqg1s730i
---
 addons/crm/__openerp__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ff9030cc2e8..54cc33c1dd9 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -119,13 +119,13 @@ Creates a dashboard for CRM that includes:
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/process/crm_lead_open.yml',
-            'test/process/crm_lead_to_opportunity.yml',
-            'test/process/cancle_crm_lead.yml',
-            'test/process/crm_meeting.yml',
+            'test/process/lead_open.yml',
+            'test/process/lead2opportunity.yml',
+            'test/process/cancel_lead.yml',
+            'test/process/meeting.yml',
             'test/ui/lead_form.yml',
             'test/test_crm_opportunity.yml',
-            'test/process/crm_phonecall.yml',
+            'test/process/phonecall2opportunity.yml',
             'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',

From 5cdcd1bf45ac8dee47c8fcba4adc44934456ace7 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 11:22:09 +0530
Subject: [PATCH 020/132] [IMP]: crm: All changes done on
 phonecall2opportunity.yml 1) string improved because put more assert, 2)
 Removed code search by name Its done by id all

bzr revid: ron@tinyerp.com-20111013055209-3e6741omkojcs9vm
---
 addons/crm/test/process/phonecall2opportunity.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/crm/test/process/phonecall2opportunity.yml b/addons/crm/test/process/phonecall2opportunity.yml
index 7f81a7d86fc..89b11a80f50 100644
--- a/addons/crm/test/process/phonecall2opportunity.yml
+++ b/addons/crm/test/process/phonecall2opportunity.yml
@@ -15,13 +15,11 @@
     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_disc_openerp")], {"active_id": ref("crm_case_phone04")})
 - |
   For business And I check that the phonecall and the newly created business 
-  opportunity is linked to same  partner and also check with phonecall close or not.
+  opportunity is linked to same  partner and also check with phonecall closed and opportunity
+  is on intial stage or not.
 -
   !python {model: crm.phonecall}: |
-    obj_phonecall = self.browse(cr, uid, ref('crm_case_phone04'))
-    ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
-    obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
-    assert obj_phonecall.partner_id == obj_opp.partner_id, "created business opportunity is not linked to same  partner"
-    assert obj_opp.stage_id.name == "New", "Converted opportunity is not in New stage"
-    assert obj_opp.stage_id.probability == 10.0, "Probability of opportunity is 10.0"
-    assert obj_phonecall.state == "done", "phonecall is held"
+    phonecall = self.browse(cr, uid, ref('crm_case_phone04'))
+    assert phonecall.partner_id.id == phonecall.opportunity_id.partner_id.id, "created business opportunity is not linked to same  partner"
+    assert phonecall.opportunity_id.stage_id.id == ref("stage_lead1"), "Converted opportunity is not in Initial stage"
+    assert phonecall.state == "done", "phonecall is held"

From f7da9553df2138294d98d5744a88b3cd4d6cb72c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 12:04:11 +0530
Subject: [PATCH 021/132] [REF, IMP]: crm: All changes done on cancel_lead.yml
 1) Put more assert and done code more reliable, 2) checked all assert
 differently 3) Improved string

bzr revid: ron@tinyerp.com-20111013063411-bestdccmzkqo8w4y
---
 addons/crm/test/process/cancel_lead.yml | 67 ++++++++++++++++++-------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index c8d02c6414c..3a3366c05e4 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -1,22 +1,43 @@
 -
-  Cheking for lead from any stage, It will be cancle or not.
+  Cheking for lead from draft to cancel, I will cancelling this lead.
 -
   !python {model: crm.lead}: |
-    lead_on_draft=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_on_draft.state == 'draft', "Lead is not in draft state"
     self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    lead_on_cancel=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_on_cancel.state == 'cancel', "Lead is not in cancel state"
+-
+  In order to test for cancel lead , i will test lead is on cancel state.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
+     - state == "cancel"
+-
+  Cheking for lead from cancel to reset, I will reseting this lead.
+-
+  !python {model: crm.lead}: |
     self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    lead_on_reset=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_on_reset.state == 'draft', "Lead is not in draft state"
+-
+  In order to test for reset lead , i will test lead is on draft state.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in draft state}:
+     - state == "draft"
+-
+  Cheking for lead from reset to pending, I will pending this lead.
+-
+  !python {model: crm.lead}: |
     self.case_pending(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    lead_on_pending=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_on_pending.state == 'pending', "Lead is not in pending state"
+-
+  In order to test for pending lead , i will test lead is on pending state.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in pending state}:
+     - state == "pending"
+-
+  Cheking for lead from pending to cancel, I will cancelling this lead.
+-
+  !python {model: crm.lead}: |
     self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    lead_pending_cancel=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_pending_cancel.state == 'cancel', "Lead is not in cancel state"
-
+-
+  In order to test for cancel lead , i will test lead is on cancel state.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
+     - state == "cancel"
 -
   For working on parent child relationship, we are creating sales executive department that will be work under 
   Sales Department.
@@ -36,13 +57,21 @@
   department or not.
 -
   !python {model: crm.lead}: |
-    lead_rec=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
     self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    lead_cancle_reset=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_cancle_reset.state == 'draft', "Lead is not in draft state"
     self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    lead_on_escalate=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_on_escalate.section_id.name == 'Sales Department', "Do not Escalate lead to on sales team from Executive team"
+-
+  In order to test for escalate lead , i will test lead Escalate from sales Department from Executive
+  department.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Escalate lead to on sales team from Executive teame}:
+     - section_id.name == "Sales Department"
+-
+  Cheking for lead from escalate to cancel, I will cancelling this lead.
+-
+  !python {model: crm.lead}: |
     self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    lead_escalate_cancel=self.browse(cr, uid, ref("crm_case_itisatelesalescampaign0"))
-    assert lead_escalate_cancel.state == 'cancel', "Lead is not in cancel state"
+-
+  In order to test for cancel lead , i will test lead is on cancel state.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
+     - state == "cancel"

From 57cc6f533c3ec69285922f68c5261457cdd81807 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 12:40:53 +0530
Subject: [PATCH 022/132] [REF, IMP]: crm: default value removed from
 phonecall2opportunity.yml

bzr revid: ron@tinyerp.com-20111013071053-nqzonf822815l3ey
---
 addons/crm/test/process/phonecall2opportunity.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/crm/test/process/phonecall2opportunity.yml b/addons/crm/test/process/phonecall2opportunity.yml
index 89b11a80f50..2575daf8665 100644
--- a/addons/crm/test/process/phonecall2opportunity.yml
+++ b/addons/crm/test/process/phonecall2opportunity.yml
@@ -6,8 +6,6 @@
   !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_disc_openerp}:
     name: Discuss Review Process
     partner_id: base.res_partner_tinyatwork
-    planned_revenue: 0.0
-    probability: 0.0
 -
   Succeed phonecall, it will be convert into on opportunity.
 -

From 5fb61d943f311c81ed52572bbf60fa785c160035 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 14:41:23 +0530
Subject: [PATCH 023/132] [REF, IMP]: crm: All changes done on lead_form.yml 1)
 Added lead on form for copy and delete function 2) Checked code according to
 delete lead

bzr revid: ron@tinyerp.com-20111013091123-refu3d0l1b7g7swl
---
 addons/crm/test/ui/lead_form.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/crm/test/ui/lead_form.yml b/addons/crm/test/ui/lead_form.yml
index 5ad241ca104..2e73aa5766b 100644
--- a/addons/crm/test/ui/lead_form.yml
+++ b/addons/crm/test/ui/lead_form.yml
@@ -2,19 +2,20 @@
   In order to check for changes on partner, data will be change automatically according to partner,
 -
   !python {model: crm.lead}: |
-    action = self.onchange_partner_address_id(cr, uid, ref("crm_case_initialdiscussion0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
+    action = self.onchange_partner_address_id(cr, uid, ref("crm_case_qrecorp0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
     assert action['value']['country_id'] == 20, "Country name not True"
     assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
 -
   I try to Unlink the Lead I create new record of lead. 
 -
-   !record {model: crm.lead, id: crm_lead_intested_openerp}:
-     name: Interested in openerp
+  !record {model: crm.lead, id: crm_case_new_lead}:
+    name: Opnerp Trainning
+    state: cancel
 -
   In order to test unlink lead, i will do unlink this lead
 -
   !python {model: crm.lead}: |
-    from tools.translate import _
-    self.unlink(cr, uid, [ref("crm_lead_intested_openerp")])
-    id = self.search(cr, uid, [('id', '=', ref("crm_lead_intested_openerp"))])
-    assert len(id) < 1, _('Lead is not deleted') 
+    try:
+      self.unlink(cr, uid, [ref("crm_case_new_lead")])
+    except:
+      pass

From 213fa886f1603853779b17282caa77323f564c5c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 14:59:24 +0530
Subject: [PATCH 024/132] [REF, IMP]: crm: Added copy of lead and checked on
 lead_form.yml

bzr revid: ron@tinyerp.com-20111013092924-oowazupgpnajrqpb
---
 addons/crm/test/ui/lead_form.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/crm/test/ui/lead_form.yml b/addons/crm/test/ui/lead_form.yml
index 2e73aa5766b..c6cbbb3fcb2 100644
--- a/addons/crm/test/ui/lead_form.yml
+++ b/addons/crm/test/ui/lead_form.yml
@@ -9,12 +9,15 @@
   I try to Unlink the Lead I create new record of lead. 
 -
   !record {model: crm.lead, id: crm_case_new_lead}:
-    name: Opnerp Trainning
+    name: Openerp Trainning
     state: cancel
 -
   In order to test unlink lead, i will do unlink this lead
 -
   !python {model: crm.lead}: |
+    self.copy(cr, uid, ref("crm_case_new_lead"))
+    sid = self.search(cr, uid, [('name', '=', 'Openerp Trainning')])
+    assert len(sid) == 2, 'Lead is not copied Successfully'
     try:
       self.unlink(cr, uid, [ref("crm_case_new_lead")])
     except:

From 65304c97f773ad20c03105b5b6678cb84e856698 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 17:13:04 +0530
Subject: [PATCH 025/132] [REF]: crm: Added more checking after convert
 opportunity from lead and also added partner on existing record on
 lead2opportunity.yml

bzr revid: ron@tinyerp.com-20111013114304-wuxvpnnmubtc9s8r
---
 addons/crm/test/process/lead2opportunity.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
index db85d634b21..5a9668adfd3 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity.yml
@@ -2,18 +2,24 @@
   As the lead seems to be a real business opportunity, I will convert it to a partner
   and a business opportunity.
 -
-   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
-      action: 'exist'
+  !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
+    action: 'exist'
+    partner_id: base.res_partner_agrolait
 -
   Create opportunity based on exiting partner
 -
-   !python {model: crm.lead2opportunity.partner}: |
-      self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
+  !python {model: crm.lead2opportunity.partner}: |
+    self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
 -
   In order to test lead, i will test to lead is converted to opportunity.
 -
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead is not converted on opportunity}:
-    - type == 'opportunity'
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert lead.planned_revenue == 0.0, 'Planned revenue should be 0!'
+    assert lead.probability == 0.0, 'probability revenue should be 0!'
+    assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -
   Finally, i won this opportunity, so i will close this lead.
 -
@@ -34,4 +40,3 @@
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
     - probability == 100.0
-    
\ No newline at end of file

From c8b4c07d9b5bbf256249e9c51d6d5e83cf8b60cd Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 13 Oct 2011 18:42:02 +0530
Subject: [PATCH 026/132] [ADD]: crm: Added new yml
 lead2_mass_convert_opportunity.yml 1) cheked convert two lead to opportunity.
 2) Checked record according to lead

bzr revid: ron@tinyerp.com-20111013131202-aku0tvzavpyz4efp
---
 addons/crm/__openerp__.py                     |  1 +
 .../lead2_mass_convert_opportunity.yml        | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 addons/crm/test/process/lead2_mass_convert_opportunity.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 54cc33c1dd9..508c7dff370 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,6 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/lead2opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/meeting.yml',
+            'test/process/lead2_mass_convert_opportunity.yml',
             'test/ui/lead_form.yml',
             'test/test_crm_opportunity.yml',
             'test/process/phonecall2opportunity.yml',
diff --git a/addons/crm/test/process/lead2_mass_convert_opportunity.yml b/addons/crm/test/process/lead2_mass_convert_opportunity.yml
new file mode 100644
index 00000000000..22c22d7a376
--- /dev/null
+++ b/addons/crm/test/process/lead2_mass_convert_opportunity.yml
@@ -0,0 +1,32 @@
+-
+  Using mass wizard, convert two lead to opportunity.
+-
+  !record {model: crm.lead2opportunity.partner.mass, id: crm_lead2opportunity_partner_mass0}:
+    user_ids:
+      - base.user_root
+    section_id: crm.section_sales_department
+-
+  Leads coverts to mass opportunity.
+-
+  !python {model: crm.lead2opportunity.partner.mass}: |
+    self.mass_convert(cr, uid, [ref("crm_lead2opportunity_partner_mass0")],{'active_ids': [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], 'active_id': ref("crm_case_qrecorp0")})
+-
+  First lead converted on opportunity.i test it.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_employee0'))
+    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert lead.planned_revenue == 0.0, 'Planned revenue should be 0!'
+    assert lead.probability == 0.0, 'probability revenue should be 0!'
+    assert lead.partner_id.name == "Agrolait", 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
+-
+  Second lead converted on opportunity.i test it.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_electonicgoodsdealer0'))
+    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert lead.planned_revenue == 0.0, 'Planned revenue should be 0!'
+    assert lead.probability == 0.0, 'probability revenue should be 0!'
+    assert lead.partner_id.name == "Le Club SARL", 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'

From a589f59ee9822e71020c4da02957852d5a223316 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 11:54:32 +0530
Subject: [PATCH 027/132] [ADD]: crm: Added new yml merge2opportunity.yml 1)
 Merged two opportunity. 2) Checked Merged opportunity succeed

bzr revid: ron@tinyerp.com-20111014062432-gywyd1nevu33wfwy
---
 addons/crm/__openerp__.py                     |  1 +
 addons/crm/test/process/merge2opportunity.yml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 addons/crm/test/process/merge2opportunity.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 508c7dff370..7a30166b46d 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -122,6 +122,7 @@ Creates a dashboard for CRM that includes:
             'test/process/lead_open.yml',
             'test/process/lead2opportunity.yml',
             'test/process/cancel_lead.yml',
+            'test/process/merge2opportunity.yml',
             'test/process/meeting.yml',
             'test/process/lead2_mass_convert_opportunity.yml',
             'test/ui/lead_form.yml',
diff --git a/addons/crm/test/process/merge2opportunity.yml b/addons/crm/test/process/merge2opportunity.yml
new file mode 100644
index 00000000000..2161e191a81
--- /dev/null
+++ b/addons/crm/test/process/merge2opportunity.yml
@@ -0,0 +1,17 @@
+-
+  I Merge two Opportunities.
+-
+  !python {model: crm.merge.opportunity}: |
+    op_ids=self.pool.get('crm.lead').browse(cr, uid, [ref('crm_case_bankwealthy2'), ref('crm_case_unifliege')])
+    self.merge(cr, uid, op_ids)
+
+-
+  I will test merged two opportunity.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_bankwealthy2'))
+    merge = 'Merged opportunities' in lead.message_ids[0].subject
+    assert merge,'Fail to create Merge opportunity'
+    assert lead.type == 'opportunity', 'Merged opportunity type not change!'
+    assert lead.partner_id.id == ref("base.res_partner_accent"), 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead2"), 'Stage of probability is incorrect!'

From 2e897842ff538499e679d424789772124154740f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 12:50:00 +0530
Subject: [PATCH 028/132] [REM]: crm: 1)Removed test_crm_opportunity.yml,
 2)Removed test_crm_lead_case2.yml, 3)Removed test_crm_opportunity_case2.yml

bzr revid: ron@tinyerp.com-20111014072000-yl3q15mdimss6fri
---
 addons/crm/__openerp__.py                     |   3 -
 addons/crm/test/test_crm_lead_case2.yml       | 151 ------------------
 addons/crm/test/test_crm_opportunity.yml      | 113 -------------
 .../crm/test/test_crm_opportunity_case2.yml   |  45 ------
 4 files changed, 312 deletions(-)
 delete mode 100644 addons/crm/test/test_crm_lead_case2.yml
 delete mode 100644 addons/crm/test/test_crm_opportunity.yml
 delete mode 100644 addons/crm/test/test_crm_opportunity_case2.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 7a30166b46d..e3bd172d4e1 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -126,13 +126,10 @@ Creates a dashboard for CRM that includes:
             'test/process/meeting.yml',
             'test/process/lead2_mass_convert_opportunity.yml',
             'test/ui/lead_form.yml',
-            'test/test_crm_opportunity.yml',
             'test/process/phonecall2opportunity.yml',
             'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
-            'test/test_crm_lead_case2.yml',
-            'test/test_crm_opportunity_case2.yml',
             'test/test_crm_phonecall_case2.yml',
             'test/test_crm_partner2opportunity.yml',
             'test/test_crm_segmentation.yml',
diff --git a/addons/crm/test/test_crm_lead_case2.yml b/addons/crm/test/test_crm_lead_case2.yml
deleted file mode 100644
index af1b7e7e07b..00000000000
--- a/addons/crm/test/test_crm_lead_case2.yml
+++ /dev/null
@@ -1,151 +0,0 @@
--
-   In order to do complete test the CRM in OpenERP,
-   I will create new full configured record and carry test on it.
--  |
-   I Start by creating "Test Sales Team" with No Unlink.
-   I create a crm.case.section record.
--
-  !record {model: crm.case.section, id: crm_case_section_demosalesteam}:
-    code: DEMO
-    complete_name: Test Sales Team
-    name: Test Sales Team
-    allow_unlink: False
-    member_ids:
-      - base.user_admin
-    stage_ids:
-      - crm.stage_lead1
-      - crm.stage_lead2
-      - crm.stage_lead3
-      - crm.stage_lead4
-      - crm.stage_lead5
-      - crm.stage_lead6
-    working_hours: 0.0
-    resource_calendar_id: resource.timesheet_group1
-    parent_id: crm.section_sales_department
--
-   I assign segmentation.
--
-   !record {model: res.users, id: base.user_root}:
-     context_section_id: crm_case_section_demosalesteam
--  |
-   I create a new lead "Test Customer" and I provide an address to this
-   demo customer and email "info@democustomer.com" and Also "Test Sales Team".
--
-   !record {model: crm.lead, id: crm_lead_democustomer}:
-     email_from: info@democustomer.com
-     name: Test Customer
-     partner_name: NotSoTinySARL
-     phone: (+32).81.81.37.00
-     mobile: (+32).81.81.37.00
-     section_id: crm_case_section_demosalesteam
-     referred: False
-     type: lead
--
-   I check that the lead is in 'draft' state.
--
-   !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Draft}:
-     - state == "draft"
--
-   I create categories.
--
-   !record {model: crm.case.categ, id: crm_case_categ0}:
-     name: crm_case_section_demosalesteam
-     section_id: crm_case_section_demosalesteam
--
-  I assigning contact detail to the Lead "Test Customer" without address.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), None, email=False)
-
--
-  I assigning contact detail to the Lead "Test Customer" with address.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_address_id(cr, uid, ref("crm_lead_democustomer"), ref("base.res_partner_address_notsotinysarl0"), email=False)
-
--
-  I selecting email "Opt-out" option for the "Test Customer" Lead.
--
-  !python {model: crm.lead}: |
-    self.on_change_optout(cr, uid, ref("crm_lead_democustomer"), True)
-
--
-  I change the Opt-out to Opt-in to show email receive preference.
--
-  !python {model: crm.lead}: |
-    self.on_change_optin(cr, uid, ref("crm_lead_democustomer"), True)
--
-   I open lead by click on "Open" button.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_lead_democustomer")])
--
-  I check that lead "Test Customer" is now in 'open' state.
--
-  !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in open state}:
-     - state == "open"
--
-  I reset the lead "Test Customer".
--
-    !python {model: crm.lead}: |
-      self.case_reset(cr, uid, [ref("crm_lead_democustomer")])
--
-   I again opening lead by click on "Open" button.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_lead_democustomer")])
--
-  I setting stage "New" for the lead "Test Customer".
--
-   !python {model: crm.lead}: |
-     self.stage_next(cr, uid, [ref("crm_lead_democustomer")], context={'stage_type': 'lead'})
--
-  I try to Unlink the Lead "Test Customer" demo Lead.
--
-   !python {model: crm.lead}: |
-    try:
-      self.unlink(cr, uid, [ref("crm_lead_democustomer")])
-    except:
-      pass
--
-   I setting Lead "Test Customer" to Pending State.
--
-    !python {model: crm.lead}: |
-      self.case_pending(cr, uid, [ref("crm_lead_democustomer")])
--
-  I check that lead "Test Customer" is now in 'Pending' state.
--
-  !assert {model: crm.lead, id: crm_lead_democustomer, string: Lead in Pending state}:
-     - state == "pending"
--
-  I Escalate the Lead "Test Customer" Parent "Sales Team".
--
-    !python {model: crm.lead}: |
-      self.case_escalate(cr, uid, [ref("crm_lead_democustomer")])
--
-  I add Internal Note Saying Escalated Reason.
--
-  !record {model: crm.add.note, id: crm_add_note_0}:
-    body: Sales Lead Has Been Escalated Due to Some Technical reason to the parent  'Sales
-      Team'
-    state: unchanged
--
-  I click a note button to attach the record.
--
-  !python {model: crm.add.note}: |
-    context['active_model'] = "crm.lead"
-    context['active_ids'] = [ref("crm_lead_democustomer")]
-    self.action_add(cr, uid, [ref("crm_add_note_0")], context=context)
-
--
-  I Copying this lead "Test Customer" to New Lead.
--
-    !python {model: crm.lead}: |
-      self.copy(cr, uid, ref("crm_lead_democustomer"))
--
-  I checking the Lead Copied or Not.
--
-    !python {model: crm.lead}: |
-      sid = self.search(cr, uid, [('name', '=', 'Test Customer'),('state', '=', 'draft')])
-      if not sid:
-        raise AssertionError("Lead is not copied Successfully")
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
deleted file mode 100644
index 8f171311b4d..00000000000
--- a/addons/crm/test/test_crm_opportunity.yml
+++ /dev/null
@@ -1,113 +0,0 @@
--  |
-   I start by creating a new Opportunity. And I select partner for opportunity.
-   I can see that after selecting partner his contact and email is automatically filled.
--
-   !record {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
-    email_from: info@balmerinc.be
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    stage_id: crm.stage_lead1
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
--  |
-   I check that the opportunity is in 'New' state.
--
-   !assert {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
-     - state == "draft"
-
-- |
-  I  check that phonecall record is created for that opportunity.
--
-  !python {model: crm.phonecall}: |
-    phone_obj = self.pool.get('crm.phonecall')
--  |
-   I schedule Meeting on this current opportunity by clicking on "schedule
-   Meeting".
--
-   !python {model: crm.lead}: |
-    self.action_makeMeeting(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
-
--  |
-   I can see that Meeting's calendar view is shown.
-   then I click on the date on which I want to schedule meeting.
-   I fill proper data for that meeting and save it.
--
-  !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}:
-    date: !eval time.strftime('%Y-%m-%d 00:00:00')
-    date_deadline: !eval time.strftime('%Y-%m-%d 08:00:00')
-    duration: 8.0
-    email_from: info@balmerinc.be
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    opportunity_id: 'crm_opportunity_abcfuelcounits0'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    section_id: crm.section_sales_department
-    state: open
-- |
-  In order to schedule a phonecall to the partner
-  I click on "schedule call" button and select planned date for the call.
--
-  !record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}:
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')"
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    section_id: crm.section_sales_department
-    user_id: base.user_demo
-    categ_id: crm.categ_phone1
-- |
-  schedule phonecall by opportunity2phoncall wizard.
--
-  !python {model: crm.opportunity2phonecall}: |
-      self.action_apply(cr, uid, [ref('crm_opportunity2phonecall_abcfuelcounits0')], {'active_ids': [ref("crm_opportunity_abcfuelcounits0")]})
-- |
-  I  check that phonecall record is created for that opportunity.
--
-  !python {model: crm.phonecall}: |
-    phone_obj = self.pool.get('crm.phonecall')
-    ids = phone_obj.search(cr, uid, [('name', '=', 'ABC FUEL CO 829264 - 10002 units')])
-    assert len(ids)
-- |
-  I can see phonecall record after click on "Schedule call" wizard.
--
-  !record {model: crm.phonecall, id: crm_phonecall_abcfuelcounits0}:
-    date: !eval "(datetime.now() + timedelta(1)).strftime('%Y-%m-%d 11:15:00')"
-    duration: 3.0
-    name: 'ABC FUEL CO 829264 - 10002 units'
-    partner_address_id:  base.res_partner_address_1
-    partner_id:  base.res_partner_9
-    section_id: crm.section_sales_department
-- |
-  I Merge the opportunities.
--
-  for that create two opportunities first opportunity 'Test FUEL CO'.
--
-   !record {model: crm.lead, id: crm_opportunity_1}:
-    email_from: info@balmerinc.be
-    name: 'Test FUEL CO 829264 - 10002 units'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    stage_id: crm.stage_lead1
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
--
-  I create the opportunity 'FUEL CO'.
--
-   !record {model: crm.lead, id: crm_opportunity_2}:
-    email_from: info@balmerinc.be
-    name: 'FUEL CO 829264 - 10002 units'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    stage_id: crm.stage_lead1
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
--  |
-   I Merge two Opportunities.
--
-   !python {model: crm.merge.opportunity}: |
-    op_list = [ref('crm_opportunity_1'),ref('crm_opportunity_2')]
-    op_ids=self.pool.get('crm.lead').browse(cr,uid,op_list)
-    lead_ids = [ref('crm_case_qrecorp0')]
-    self.merge(cr, uid, op_ids, {'lead_ids': lead_ids})
diff --git a/addons/crm/test/test_crm_opportunity_case2.yml b/addons/crm/test/test_crm_opportunity_case2.yml
deleted file mode 100644
index dc0dbe517f1..00000000000
--- a/addons/crm/test/test_crm_opportunity_case2.yml
+++ /dev/null
@@ -1,45 +0,0 @@
--  |
-  I start by creating a new Opportunity. And I select partner for opportunity.
-  I can see that after selecting partner his contact and email is automatically filled.
--
-  !record {model: crm.lead, id: crm_opportunity_demotestopportunity}:
-    email_from: info@balmerinc.be
-    name: 'Demo Test Opportunity'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
-    type: opportunity
--
-  I check that the opportunity is in 'New' state.
--
-  !assert {model: crm.lead, id: crm_opportunity_demotestopportunity, string: Opportunity in Draft}:
-    - state == "draft"
--
-  I open opportunity by click on "Open" button.
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_opportunity_demotestopportunity")])
--
-  I change partner of the  opportunity.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_id(cr, uid, [ref("crm_opportunity_demotestopportunity")], ref("base.res_partner_agrolait"))
-
--
-  I change Contact Detail of the  opportunity.
--
-  !python {model: crm.lead}: |
-    self.onchange_partner_address_id(cr, uid,[ref("crm_opportunity_demotestopportunity")], ref("base.res_partner_address_8invoice"))
-
--
-  I change Opportunity to Won State.
--
-  !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref("crm_opportunity_demotestopportunity")])
--
-  I check that the opportunity is in 'Done' state.
--
-  !assert {model: crm.lead, id: crm_opportunity_demotestopportunity, string: Opportunity is Won}:
-    - state == "done"

From 7ed74f873e9caebbd0de77f099dfb95ba7df95f4 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 14:24:06 +0530
Subject: [PATCH 029/132] [REM, IMP]: crm: 1)Removed merge2opportunity.yml,
 2)Merged two Opportunities code moved to lead2opportunity.yml

bzr revid: ron@tinyerp.com-20111014085406-fg8javdjiohh6ojh
---
 addons/crm/__openerp__.py                     |  1 -
 addons/crm/test/process/lead2opportunity.yml  | 18 ++++++++++++++++++
 addons/crm/test/process/merge2opportunity.yml | 17 -----------------
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 addons/crm/test/process/merge2opportunity.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index e3bd172d4e1..6d05d3edd3d 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -122,7 +122,6 @@ Creates a dashboard for CRM that includes:
             'test/process/lead_open.yml',
             'test/process/lead2opportunity.yml',
             'test/process/cancel_lead.yml',
-            'test/process/merge2opportunity.yml',
             'test/process/meeting.yml',
             'test/process/lead2_mass_convert_opportunity.yml',
             'test/ui/lead_form.yml',
diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
index 5a9668adfd3..75026ccfb3e 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity.yml
@@ -40,3 +40,21 @@
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
     - probability == 100.0
+-
+  I have two opportunity ,so i will merge this two Opportunities.
+-
+  !python {model: crm.merge.opportunity}: |
+    op_ids=self.pool.get('crm.lead').browse(cr, uid, [ref('crm_case_bankwealthy2'), ref('crm_case_unifliege')])
+    self.merge(cr, uid, op_ids)
+
+-
+  I will test which two opportunity merged .
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_bankwealthy2'))
+    merge = 'Merged opportunities' in lead.message_ids[0].subject
+    assert merge,'Fail to create Merge opportunity'
+    assert lead.type == 'opportunity', 'Merged opportunity type not change!'
+    assert lead.partner_id.id == ref("base.res_partner_accent"), 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead2"), 'Stage of probability is incorrect!'
+    
\ No newline at end of file
diff --git a/addons/crm/test/process/merge2opportunity.yml b/addons/crm/test/process/merge2opportunity.yml
deleted file mode 100644
index 2161e191a81..00000000000
--- a/addons/crm/test/process/merge2opportunity.yml
+++ /dev/null
@@ -1,17 +0,0 @@
--
-  I Merge two Opportunities.
--
-  !python {model: crm.merge.opportunity}: |
-    op_ids=self.pool.get('crm.lead').browse(cr, uid, [ref('crm_case_bankwealthy2'), ref('crm_case_unifliege')])
-    self.merge(cr, uid, op_ids)
-
--
-  I will test merged two opportunity.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_bankwealthy2'))
-    merge = 'Merged opportunities' in lead.message_ids[0].subject
-    assert merge,'Fail to create Merge opportunity'
-    assert lead.type == 'opportunity', 'Merged opportunity type not change!'
-    assert lead.partner_id.id == ref("base.res_partner_accent"), 'Partner missmatch!'
-    assert lead.stage_id.id == ref("stage_lead2"), 'Stage of probability is incorrect!'

From 86e0aa5cc26e643cf04d1c4b6b4b32aaa758bafc Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 14:29:03 +0530
Subject: [PATCH 030/132] [REM]: crm: 1)Removed
 test_crm_partner2opportunity.yml

bzr revid: ron@tinyerp.com-20111014085903-b2i8gk93nuo5ckd5
---
 addons/crm/__openerp__.py                     |  1 -
 .../crm/test/test_crm_partner2opportunity.yml | 25 -------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 addons/crm/test/test_crm_partner2opportunity.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 6d05d3edd3d..58342283bbc 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -130,7 +130,6 @@ Creates a dashboard for CRM that includes:
             'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
             'test/test_crm_phonecall_case2.yml',
-            'test/test_crm_partner2opportunity.yml',
             'test/test_crm_segmentation.yml',
              ],
     'installable': True,
diff --git a/addons/crm/test/test_crm_partner2opportunity.yml b/addons/crm/test/test_crm_partner2opportunity.yml
deleted file mode 100644
index fe026074f4f..00000000000
--- a/addons/crm/test/test_crm_partner2opportunity.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-- |
-  I start by creating a new opportunity from partner.
--
-  !record {model: crm.partner2opportunity, id: crm_partner2opportunity_id_0}:
-    name: test
-    planned_revenue: 0.0
-    partner_id:  base.res_partner_9
-    probability: 0.0
--
-  I click on "Create Opportunity" button of this wizard.
--
-  !python {model: crm.partner2opportunity}: |
-    fields = {
-             'name': 'test',
-             'planned_revenue': '0.0',
-             'partner_id': ref('base.res_partner_9'),
-             'probability': '0.0' 
-             }
-    self.default_get(cr, uid, fields, {"active_ids": [ref("crm_partner2opportunity_id_0")]})
-- |
-  In order to check the opportunity is created or not, I check type.
--
-  !python {model: crm.partner2opportunity}: |
-    opportunity = self.make_opportunity(cr, uid, [ref("crm_partner2opportunity_id_0")], {"active_ids": [ref("crm_partner2opportunity_id_0")]})
-    assert True

From daeeef945d05e9b7a60c22f9e127f53f9c1f6314 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 14:36:23 +0530
Subject: [PATCH 031/132] [REM]: crm: 1)Removed test_crm_phonecall_case2.yml 2)
 Updated __opeperp__.py

bzr revid: ron@tinyerp.com-20111014090623-jf5atbxze6e9w8iv
---
 addons/crm/__openerp__.py                    |  1 -
 addons/crm/test/test_crm_phonecall_case2.yml | 26 --------------------
 2 files changed, 27 deletions(-)
 delete mode 100644 addons/crm/test/test_crm_phonecall_case2.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 58342283bbc..a4416ca8add 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -129,7 +129,6 @@ Creates a dashboard for CRM that includes:
             'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
-            'test/test_crm_phonecall_case2.yml',
             'test/test_crm_segmentation.yml',
              ],
     'installable': True,
diff --git a/addons/crm/test/test_crm_phonecall_case2.yml b/addons/crm/test/test_crm_phonecall_case2.yml
deleted file mode 100644
index 1b07121183c..00000000000
--- a/addons/crm/test/test_crm_phonecall_case2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- |
-  I start by creating a new phonecall.
--
-  !record {model: crm.phonecall, id: crm_phonecall_dummycall}:
-    date: !eval time.strftime('%Y-%m-%d 08:00:00')
-    name: Dummy call
-    duration: 0.0
-    section_id: crm.section_sales_department
-    partner_id: base.res_partner_agrolait
-    state: open
--
-  I change Contact Detail of the Partner.
--
-  !python {model: crm.phonecall}: |
-    self.onchange_partner_address_id(cr, uid,[ref("crm_phonecall_dummycall")], ref("base.res_partner_address_8invoice"))
-
--
-  I setting Phone call to Held (Done).
--
-  !python {model: crm.phonecall}: |
-    self.case_close(cr, uid, [ref("crm_phonecall_dummycall")])
--
-  I check that the hone call is in 'Held' state.
--
-  !assert {model: crm.phonecall, id: crm_phonecall_dummycall, string: Phone call Helded}:
-    - state == "done"

From ff842dde4de206ac504120c59d6e9c3ae385b535 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 15:06:28 +0530
Subject: [PATCH 032/132] [IMP]: crm: 1)All changes done in
 lead2opportunity.yml 2) Added scenario of when opportunity has been lost

bzr revid: ron@tinyerp.com-20111014093628-j3o0m4ji3javmapb
---
 addons/crm/test/process/lead2opportunity.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
index 75026ccfb3e..108a0a74dbf 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity.yml
@@ -36,10 +36,24 @@
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: stage of opportunity is win}:
     - stage_id.name == "Won"
 -
-  After won the opportunity, i will test probability is 100.
+  After winning the opportunity, i will test probability is 100.
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
     - probability == 100.0
+-
+  Suppose i have opportinity in initial stage, i will check after loss my `opportunity` , probability of that opportunity is 0
+-
+  !python {model: crm.lead}: |
+    self.case_open(cr, uid, [ref("crm_case_rdroundfundingunits0")])
+    self.case_mark_lost(cr, uid, [ref("crm_case_rdroundfundingunits0")])
+-
+  I check after loss the opportunity, probability set to 0.0 and lost stage set accordingly.
+-
+  !python {model: crm.lead}: |
+    opportunity = self.browse(cr, uid, ref('crm_case_rdroundfundingunits0'))
+    assert opportunity.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
+    assert opportunity.probability == 0.0, 'Probability is wrong!'
+
 -
   I have two opportunity ,so i will merge this two Opportunities.
 -

From 81c8f80edc17b6a8f904d5124d42e5fb454defd1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 15:12:57 +0530
Subject: [PATCH 033/132] [REM]: crm: Removed test_crm_stage_changes.yml

bzr revid: ron@tinyerp.com-20111014094257-qmch5458436ibis4
---
 addons/crm/__openerp__.py                  |  1 -
 addons/crm/test/test_crm_stage_changes.yml | 96 ----------------------
 2 files changed, 97 deletions(-)
 delete mode 100644 addons/crm/test/test_crm_stage_changes.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index a4416ca8add..fdd841c2534 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -127,7 +127,6 @@ Creates a dashboard for CRM that includes:
             'test/ui/lead_form.yml',
             'test/process/phonecall2opportunity.yml',
             'test/test_crm_recurrent_meeting.yml',
-            'test/test_crm_stage_changes.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
             'test/test_crm_segmentation.yml',
              ],
diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml
deleted file mode 100644
index 391a328bffe..00000000000
--- a/addons/crm/test/test_crm_stage_changes.yml
+++ /dev/null
@@ -1,96 +0,0 @@
--
-  In order to test the changes on stage of a lead or an opportunity with OpenERP,
-  I create some leads and test the stage changes.
--
-  I want to change the probability to 0.0 when the opportunity is marked as lost.
-  So I set its Change probability automatically true.
--
-  !record {model: crm.case.stage, id: crm.stage_lead6}:
-    name: Lost
-    on_change: true
-    probability: 0.0
-    section_ids:
-      - crm.section_sales_department
-    sequence: 0
--
-  I create a lead 'Test Lead1'.
--
-  !record {model: crm.lead, id: crm_lead_openerppresentation0}:
-    categ_id: crm.categ_oppor4
-    day_close: 0.0
-    day_open: 0.0
-    name: Test Lead1
-    planned_revenue: 0.0
-    probability: 10.0
-    section_id: crm.section_sales_department
--
-  I open the lead.
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref('crm_lead_openerppresentation0')])
--
-  I assigning stage.
--
-  !python {model: crm.lead}: |
-    self.onchange_stage_id(cr, uid, [ref('crm_lead_openerppresentation0')], [], context)
--
-  I assigning percent.
--
-  !python {model: crm.lead}: |
-    self.stage_find_percent(cr, uid, 10.0, [])
--
-  I find that this lead can be converted to opportunity.
--
-  !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner0}:
-    action: 'create'
-    name: 'convert'
--
-  So I convert the lead to opportunity.
--
-  !python {model: crm.lead2opportunity.partner}: |
-    self.action_apply(cr, uid, [ref('crm_lead2opportunity_partner0')], context={'active_ids': [ref('crm_lead_openerppresentation0')]})
--
-  I check that lead is now converted to opportunity.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
-    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
--
-  I mark this opportunity as lost.
--
-  !python {model: crm.lead}: |
-    self.case_mark_lost(cr, uid, [ref('crm_lead_openerppresentation0')])
--
-  I check whether the probability is set according to stage change or not.
--
-  !python {model: crm.lead}: |
-    opportunity = self.browse(cr, uid, ref('crm_lead_openerppresentation0'))
-    assert opportunity.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
-    assert opportunity.probability == 0.0, 'Probability is wrong!'
--
-  I create one more opportunity.
--
-  !record {model: crm.lead, id: crm_lead_test2}:
-    name: Partner Demo
-    type: opportunity
-    categ_id: crm.categ_oppor3
-    planned_revenue: 50000.0
-    probability: 100.0
-    section_id: crm.section_sales_department
--
-  I open this opportunity.
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref('crm_lead_test2')])
--
-  I mark this opportunity as won.
--
-  !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref('crm_lead_test2')])
--
-  I check whether the stage is changed to 'Won' and probability is 100.0 or not.
--
-  !python {model: crm.lead}: |
-    opportunity = self.browse(cr, uid, ref('crm_lead_test2'))
-    assert opportunity.stage_id.id == ref('crm.stage_lead5'), 'Stage is not changed!'
-    assert opportunity.probability == 100.0, 'Probability is wrong!'

From 7c8c006beb6fe137035edaa933b85a8903b02bca Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 16:17:29 +0530
Subject: [PATCH 034/132] [IMP]: crm: Added internal note after wining the
 opportunity in lead2opportunity.yml

bzr revid: ron@tinyerp.com-20111014104729-1la21n3mxpzb0qz7
---
 addons/crm/test/process/lead2opportunity.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
index 108a0a74dbf..bb6ecef5327 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity.yml
@@ -35,6 +35,23 @@
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: stage of opportunity is win}:
     - stage_id.name == "Won"
+-
+  I want to add internal note to this opportunity, so i create note.
+-
+  !record {model: crm.add.note, id: crm_add_note_won_opportunity}:
+    body: 'I won this Opportunity'
+-
+  Apply this note to opportunity.
+-
+  !python {model: crm.add.note}: |
+    self.action_add(cr, uid, [ref("crm_add_note_won_opportunity")], {"active_model": "crm.lead","active_ids": [ref("crm_case_qrecorp0")]})
+-
+  I will test Internal note added on opportunity .
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+    message = 'I won this Opportunity' in lead.message_ids[-1].subject
+    assert message,'Fail to Added interal note on opportunity'
 -
   After winning the opportunity, i will test probability is 100.
 -

From f1c236c3aed7732a685e03a7c042f72b6b839641 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 16:22:56 +0530
Subject: [PATCH 035/132] [REF]: crm: Removed code of cheking probability and
 planned_revenue in lead2opportunity.yml

bzr revid: ron@tinyerp.com-20111014105256-anhbcrgqvtpgm1n6
---
 addons/crm/test/process/lead2opportunity.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
index bb6ecef5327..b09ed397fe0 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity.yml
@@ -16,8 +16,6 @@
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
     assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert lead.planned_revenue == 0.0, 'Planned revenue should be 0!'
-    assert lead.probability == 0.0, 'probability revenue should be 0!'
     assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -

From 12c7d62a53f1b561f105900ff7cc810473eae0c7 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 16:45:44 +0530
Subject: [PATCH 036/132] [REM]: crm: Removed test_crm_recurrent_meeting.yml
 because its have only demo data created

bzr revid: ron@tinyerp.com-20111014111544-shi3hshjja7yxpw5
---
 addons/crm/__openerp__.py                     |   1 -
 .../crm/test/test_crm_recurrent_meeting.yml   | 106 ------------------
 2 files changed, 107 deletions(-)
 delete mode 100644 addons/crm/test/test_crm_recurrent_meeting.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index fdd841c2534..2ad30af3c85 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -126,7 +126,6 @@ Creates a dashboard for CRM that includes:
             'test/process/lead2_mass_convert_opportunity.yml',
             'test/ui/lead_form.yml',
             'test/process/phonecall2opportunity.yml',
-            'test/test_crm_recurrent_meeting.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
             'test/test_crm_segmentation.yml',
              ],
diff --git a/addons/crm/test/test_crm_recurrent_meeting.yml b/addons/crm/test/test_crm_recurrent_meeting.yml
deleted file mode 100644
index 297ca8d5e4e..00000000000
--- a/addons/crm/test/test_crm_recurrent_meeting.yml
+++ /dev/null
@@ -1,106 +0,0 @@
--
-  In order to test recurrent meetings in OpenERP, I create meetings with different recurrency.
--
-  I create a customer meeting record with daily recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_pricelistdiscussion0}:
-    categ_id: crm.categ_meet1
-    count: 0.0
-    date: '2011-01-05 00:00:00'
-    date_deadline: '2011-01-05 01:00:00'
-    day: 0.0
-    duration: 1.0
-    end_date: '2011-01-12'
-    end_type: end_date
-    name: Pricelist Discussion
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=DAILY;INTERVAL=1;UNTIL=20110112T235959Z
-    rrule_type: daily
-    sequence: 0.0
-- 
-  I create another meeting record with weekly recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_changesindesigning0}:
-    categ_id: crm.categ_meet2
-    count: 15
-    date: '2011-01-22 11:05:05'
-    date_deadline: '2011-01-22 16:05:05'
-    day: 0.0
-    duration: 5.0
-    email_from: info@opensides.be
-    end_type: count
-    fr: true
-    mo: true
-    name: Changes in Designing
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=WEEKLY;BYDAY=FR,TU,TH,WE,MO;INTERVAL=1;COUNT=15
-    rrule_type: weekly
-    section_id: crm.section_sales_department
-    sequence: 0.0
-    th: true
-    tu: true
-    user_id: base.user_demo
-    we: true
--
-  I create a meeting record with monthly recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_reviewneeds0}:
-    categ_id: crm.categ_meet3
-    count: 0.0
-    date: '2011-01-20 10:02:02'
-    date_deadline: '2011-01-20 16:02:02'
-    day: 15
-    duration: 6.0
-    end_date: '2011-05-31'
-    end_type: end_date
-    name: Review needs
-    partner_address_id: base.res_partner_address_15
-    partner_id: base.res_partner_11
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=MONTHLY;INTERVAL=1;UNTIL=20110531T235959Z;BYMONTHDAY=15
-    rrule_type: monthly
-    section_id: crm.section_sales_department
-    sequence: 0.0
-    user_id: base.user_demo
-- 
-  I create a record for daily scrum meeting.
-- 
-  !record {model: crm.meeting, id: crm_meeting_scrummeeting0}:
-    categ_id: crm.categ_meet2
-    count: 0.0
-    date: '2011-01-06 00:00:00'
-    date_deadline: '2011-01-06 01:00:00'
-    day: 0.0
-    duration: 1.0
-    name: Scrum meeting
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=DAILY;INTERVAL=1
-    rrule_type: daily
-    sequence: 0.0    
--
-  I create a meeting record for yearly recurrency.
-- 
-  !record {model: crm.meeting, id: crm_meeting_updatethedata0}:
-    categ_id: crm.categ_meet2
-    count: 0.0
-    date: '2011-01-18 13:12:49'
-    date_deadline: '2011-01-19 02:30:49'
-    day: 0.0
-    duration: 13.300000000000001
-    end_date: '2015-01-06'
-    end_type: end_date
-    name: Update the data
-    partner_address_id: base.res_partner_address_7
-    partner_id: base.res_partner_4
-    recurrency: true
-    recurrent_uid: 0.0
-    rrule: FREQ=YEARLY;INTERVAL=1;UNTIL=20150106T235959Z
-    rrule_type: yearly
-    section_id: crm.section_sales_department
-    sequence: 0.0

From 0625ab16fc4f46e70b226f908e1064a79e15804f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 14 Oct 2011 17:26:12 +0530
Subject: [PATCH 037/132] [REF, MV]: Todo code in lead2opportunity.yml and move
 test_crm_segmentation.yml to crm_profile

bzr revid: ron@tinyerp.com-20111014115612-wze2p8dcnh6gvopg
---
 addons/crm/__openerp__.py                       |  1 -
 addons/crm/test/process/lead2opportunity.yml    | 17 +++++++++--------
 addons/crm_profiling/__openerp__.py             |  3 ++-
 .../test/test_crm_segmentation.yml              |  0
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename addons/{crm => crm_profiling}/test/test_crm_segmentation.yml (100%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 2ad30af3c85..9c45d9237b6 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -127,7 +127,6 @@ Creates a dashboard for CRM that includes:
             'test/ui/lead_form.yml',
             'test/process/phonecall2opportunity.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
-            'test/test_crm_segmentation.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity.yml
index b09ed397fe0..ef8d20fc602 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity.yml
@@ -34,7 +34,7 @@
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: stage of opportunity is win}:
     - stage_id.name == "Won"
 -
-  I want to add internal note to this opportunity, so i create note.
+  I add internal note to this opportunity, so i create note.
 -
   !record {model: crm.add.note, id: crm_add_note_won_opportunity}:
     body: 'I won this Opportunity'
@@ -43,13 +43,14 @@
 -
   !python {model: crm.add.note}: |
     self.action_add(cr, uid, [ref("crm_add_note_won_opportunity")], {"active_model": "crm.lead","active_ids": [ref("crm_case_qrecorp0")]})
--
-  I will test Internal note added on opportunity .
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
-    message = 'I won this Opportunity' in lead.message_ids[-1].subject
-    assert message,'Fail to Added interal note on opportunity'
+
+# TODO: cheked For ordering of history of message
+#-
+#  I test Internal latest note added on opportunity .
+#-
+#  !python {model: crm.lead}: |
+#    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+#    assert lead.message_ids[0].subject == 'I won this Opportunity', 'Fail to Added interal note on opportunity'
 -
   After winning the opportunity, i will test probability is 100.
 -
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 656f8360f0b..71b4e2f126e 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -41,7 +41,8 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
-    'test': ['test/test_crm_profiling.yml'],
+    'test': ['test/test_crm_profiling.yml',
+             'test/test_crm_segmentation.yml',],
     'installable': True,
     'active': False,
     'certificate': '0033984979005',
diff --git a/addons/crm/test/test_crm_segmentation.yml b/addons/crm_profiling/test/test_crm_segmentation.yml
similarity index 100%
rename from addons/crm/test/test_crm_segmentation.yml
rename to addons/crm_profiling/test/test_crm_segmentation.yml

From c656f53e81f7940bfd7cfc80d62d667ed5d57de0 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 15:16:17 +0530
Subject: [PATCH 038/132] [ADD] crm: 1) Added yml partner2opportunity.yml, 2)
 Covered partner to opportunity scenario

bzr revid: ron@tinyerp.com-20111017094617-9ctr8c7liedjo2fh
---
 addons/crm/__openerp__.py                     |  1 +
 .../crm/test/process/partner2opportunity.yml  | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 addons/crm/test/process/partner2opportunity.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 9c45d9237b6..b1fdfd3ff62 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -121,6 +121,7 @@ Creates a dashboard for CRM that includes:
     'test': [
             'test/process/lead_open.yml',
             'test/process/lead2opportunity.yml',
+            'test/process/partner2opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/meeting.yml',
             'test/process/lead2_mass_convert_opportunity.yml',
diff --git a/addons/crm/test/process/partner2opportunity.yml b/addons/crm/test/process/partner2opportunity.yml
new file mode 100644
index 00000000000..542056f0f9b
--- /dev/null
+++ b/addons/crm/test/process/partner2opportunity.yml
@@ -0,0 +1,20 @@
+- |
+  I will create opportunity by partner.
+-
+  !record {model: crm.partner2opportunity, id: crm_partner2opportunity_id_0}:
+    name: BalmerInc S.A.
+    planned_revenue: 200.0
+    partner_id: base.res_partner_9
+    probability: 150.0
+
+-
+  Convert partner to opportunity, i will test to convert opportunity is correct.
+-
+  !python {model: crm.partner2opportunity}: |
+    opportunity = self.make_opportunity(cr, uid, [ref("crm_partner2opportunity_id_0")])
+    opportunity_rec = self.pool.get('crm.lead').browse(cr, uid, opportunity['res_id'])
+    assert opportunity_rec.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert opportunity_rec.planned_revenue == 200.0, 'Planned revenue should be 200!'
+    assert opportunity_rec.probability == 150.0, 'probability revenue should be 150!'
+    assert opportunity_rec.partner_id.id == ref("base.res_partner_9"), 'Partner missmatch!'
+    assert opportunity_rec.state == 'draft', 'Opportunity stage not in draft state'

From b147d8a4c113530430d1e8ae77d89209ec8a3952 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 15:19:55 +0530
Subject: [PATCH 039/132] [ADD] crm:  Added phonecall2meeting.yml

bzr revid: ron@tinyerp.com-20111017094955-dgeazzmitmq3jf4v
---
 addons/crm/__openerp__.py                     | 1 +
 addons/crm/test/process/phonecall2meeting.yml | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 addons/crm/test/process/phonecall2meeting.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index b1fdfd3ff62..853c9f85568 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -127,6 +127,7 @@ Creates a dashboard for CRM that includes:
             'test/process/lead2_mass_convert_opportunity.yml',
             'test/ui/lead_form.yml',
             'test/process/phonecall2opportunity.yml',
+            'test/process/phonecall2meeting.yml',
             'test/test_crm_recurrent_meeting_case2.yml',
              ],
     'installable': True,
diff --git a/addons/crm/test/process/phonecall2meeting.yml b/addons/crm/test/process/phonecall2meeting.yml
new file mode 100644
index 00000000000..c0579157494
--- /dev/null
+++ b/addons/crm/test/process/phonecall2meeting.yml
@@ -0,0 +1,6 @@
+-
+  I test to arrage meeting from Phonecall, so i convert and check phonecall to meeting.
+-
+  !python {model: crm.phonecall}: |
+    res = self.action_make_meeting(cr, uid, [ref('crm_case_phone06')])
+    assert res, "No create Meeting from phonecall"

From 1fa0e18c2b72f98d202307644338cccbe76ef6c5 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 15:26:01 +0530
Subject: [PATCH 040/132] [MOVE] crm, base_calander: Move
 test_crm_recurrent_meeting_case2.yml to base_calender

bzr revid: ron@tinyerp.com-20111017095601-akmk2nmkn955inbi
---
 .../test/test_crm_recurrent_meeting_case2.yml                     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/{crm => base_calendar}/test/test_crm_recurrent_meeting_case2.yml (100%)

diff --git a/addons/crm/test/test_crm_recurrent_meeting_case2.yml b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
similarity index 100%
rename from addons/crm/test/test_crm_recurrent_meeting_case2.yml
rename to addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml

From 87727d9b541bd54fbd5bb87681a7d215d4764ea1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 15:28:12 +0530
Subject: [PATCH 041/132] [IMP] crm: delete from __openerp__.py,
 test_crm_recurrent_meeting_case2.yml

bzr revid: ron@tinyerp.com-20111017095812-ybn537b37hap94sg
---
 addons/crm/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 853c9f85568..49fc12f9747 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -128,7 +128,6 @@ Creates a dashboard for CRM that includes:
             'test/ui/lead_form.yml',
             'test/process/phonecall2opportunity.yml',
             'test/process/phonecall2meeting.yml',
-            'test/test_crm_recurrent_meeting_case2.yml',
              ],
     'installable': True,
     'active': False,

From dc95f95342cf360e74ae9332cc5b0b52dd045a83 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 16:55:25 +0530
Subject: [PATCH 042/132] [ADD] crm: 1) Added schedule_other_phonecall.yml, 2)
 checked schedule call created

bzr revid: ron@tinyerp.com-20111017112525-8fhqb8iuclh9hdkp
---
 addons/crm/__openerp__.py                     |  1 +
 .../test/process/schedule_other_phonecall.yml | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 addons/crm/test/process/schedule_other_phonecall.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 49fc12f9747..cbcaa774c05 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -128,6 +128,7 @@ Creates a dashboard for CRM that includes:
             'test/ui/lead_form.yml',
             'test/process/phonecall2opportunity.yml',
             'test/process/phonecall2meeting.yml',
+            'test/process/schedule_other_phonecall.yml'
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/test/process/schedule_other_phonecall.yml b/addons/crm/test/process/schedule_other_phonecall.yml
new file mode 100644
index 00000000000..a92496dc265
--- /dev/null
+++ b/addons/crm/test/process/schedule_other_phonecall.yml
@@ -0,0 +1,23 @@
+-
+  I schedule phonecall to another phonecall, so first i create record of schedule call.
+-
+  !record {model: crm.phonecall2phonecall, id: crm_schedule_phonecall}:
+    name: 'Test Discuss Review Process'
+    categ_id: crm.categ_phone1
+    date: !eval time.strftime('%Y-%m-%d') 
+-
+  I Convert schedule phonecall.
+-
+  !python {model: crm.phonecall2phonecall}: |
+    self.action_apply(cr, uid, [ref('crm_schedule_phonecall')], {'active_id': ref('crm_case_phone04')})
+-
+  I check for another schedule call.
+-
+  !python {model: crm.phonecall}: |
+    phonecall = self.search(cr, uid, [('name', '=', 'Test Discuss Review Process')])
+    assert phonecall, "Do not create another schedule call"
+    schedule_phonecall = self.browse(cr, uid, phonecall)[0]
+    assert schedule_phonecall.user_id.id == ref("base.user_root"), "Responsible person not assign"
+    assert schedule_phonecall.section_id.id == ref("crm.section_sales_department"), "Do not assign proper section"
+    assert schedule_phonecall.categ_id.id == ref("crm.categ_phone1"), "Category of phonecall is not apply"
+    assert schedule_phonecall.partner_id.id == ref("base.res_partner_tinyatwork"), "Partner missmatch"
\ No newline at end of file

From 3f26dce9f8ec2fc80adb1b9d424a734318140af1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 18:06:01 +0530
Subject: [PATCH 043/132] [IMP, REF] crm: 1) Renamed lead2opportunity.yml to
 lead2opportunity_win_lost.yml, 2) Removed code of Merge2opportunity
 3)Improved string

bzr revid: ron@tinyerp.com-20111017123601-vnyfiekpupjkxgf1
---
 addons/crm/__openerp__.py                     |  2 +-
 ...nity.yml => lead2opportunity_win_lost.yml} | 32 ++++---------------
 2 files changed, 7 insertions(+), 27 deletions(-)
 rename addons/crm/test/process/{lead2opportunity.yml => lead2opportunity_win_lost.yml} (68%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index cbcaa774c05..7b11d12cede 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -120,7 +120,7 @@ Creates a dashboard for CRM that includes:
     ],
     'test': [
             'test/process/lead_open.yml',
-            'test/process/lead2opportunity.yml',
+            'test/process/lead2opportunity_win_lost.yml',
             'test/process/partner2opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/meeting.yml',
diff --git a/addons/crm/test/process/lead2opportunity.yml b/addons/crm/test/process/lead2opportunity_win_lost.yml
similarity index 68%
rename from addons/crm/test/process/lead2opportunity.yml
rename to addons/crm/test/process/lead2opportunity_win_lost.yml
index ef8d20fc602..e5103c48ef0 100644
--- a/addons/crm/test/process/lead2opportunity.yml
+++ b/addons/crm/test/process/lead2opportunity_win_lost.yml
@@ -1,17 +1,16 @@
 -
-  As the lead seems to be a real business opportunity, I will convert it to a partner
-  and a business opportunity.
+  I test to convert lead to real business opportunity, so first i create existing partner attached with lead.
 -
   !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
     action: 'exist'
     partner_id: base.res_partner_agrolait
 -
-  Create opportunity based on exiting partner
+  Create opportunity based on exiting partner.
 -
   !python {model: crm.lead2opportunity.partner}: |
     self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
 -
-  In order to test lead, i will test to lead is converted to opportunity.
+  After converted in opportunity, i test to lead is converted to opportunity.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
@@ -19,12 +18,12 @@
     assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -
-  Finally, i won this opportunity, so i will close this lead.
+  Finally, i won this opportunity, so i close this opportunity.
 -
   !python {model: crm.lead}: |
     self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
 -
-  In order to test opportunity, it is close or not.
+  I check lead is close or not.
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in done state}:
     - state == "done"
@@ -52,7 +51,7 @@
 #    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
 #    assert lead.message_ids[0].subject == 'I won this Opportunity', 'Fail to Added interal note on opportunity'
 -
-  After winning the opportunity, i will test probability is 100.
+  After winning the opportunity, i test probability is 100.
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
     - probability == 100.0
@@ -69,22 +68,3 @@
     opportunity = self.browse(cr, uid, ref('crm_case_rdroundfundingunits0'))
     assert opportunity.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
     assert opportunity.probability == 0.0, 'Probability is wrong!'
-
--
-  I have two opportunity ,so i will merge this two Opportunities.
--
-  !python {model: crm.merge.opportunity}: |
-    op_ids=self.pool.get('crm.lead').browse(cr, uid, [ref('crm_case_bankwealthy2'), ref('crm_case_unifliege')])
-    self.merge(cr, uid, op_ids)
-
--
-  I will test which two opportunity merged .
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_bankwealthy2'))
-    merge = 'Merged opportunities' in lead.message_ids[0].subject
-    assert merge,'Fail to create Merge opportunity'
-    assert lead.type == 'opportunity', 'Merged opportunity type not change!'
-    assert lead.partner_id.id == ref("base.res_partner_accent"), 'Partner missmatch!'
-    assert lead.stage_id.id == ref("stage_lead2"), 'Stage of probability is incorrect!'
-    
\ No newline at end of file

From 4ffbf5fc8583e04852a69ab4f61b487f6e1e6848 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 18:14:33 +0530
Subject: [PATCH 044/132] [ADD] crm: Added new yml merge_opportunity.yml and
 also updated __openerp__.py

bzr revid: ron@tinyerp.com-20111017124433-21wwyc3yvs4qs2ca
---
 addons/crm/__openerp__.py                     |  1 +
 addons/crm/test/process/merge_opportunity.yml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 addons/crm/test/process/merge_opportunity.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 7b11d12cede..965222976aa 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -121,6 +121,7 @@ Creates a dashboard for CRM that includes:
     'test': [
             'test/process/lead_open.yml',
             'test/process/lead2opportunity_win_lost.yml',
+            'test/process/merge_opportunity.yml',
             'test/process/partner2opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/meeting.yml',
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
new file mode 100644
index 00000000000..2028c304276
--- /dev/null
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -0,0 +1,17 @@
+-
+  I have two opportunity ,so i merge this two Opportunities.
+-
+  !python {model: crm.merge.opportunity}: |
+    op_ids=self.pool.get('crm.lead').browse(cr, uid, [ref('crm_case_bankwealthy2'), ref('crm_case_unifliege')])
+    self.merge(cr, uid, op_ids)
+
+-
+  I test which two opportunity has been merged .
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_bankwealthy2'))
+    merge = 'Merged opportunities' in lead.message_ids[0].subject
+    assert merge,'Fail to create Merge opportunity'
+    assert lead.type == 'opportunity', 'Merged opportunity type not change!'
+    assert lead.partner_id.id == ref("base.res_partner_accent"), 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead2"), 'Stage of probability is incorrect!'

From 845828efe96014453542819003a377882b7a38a5 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 18:22:34 +0530
Subject: [PATCH 045/132] [IMP, REF] crm: 1) Renamed
 lead2_mass_convert_opportunity.yml to mass_leads2opportunity.yml, 2) Improved
 string value, 3) Updated __openerp__.py

bzr revid: ron@tinyerp.com-20111017125234-6clvbte3zc7l0ivf
---
 addons/crm/__openerp__.py                                    | 2 +-
 ...ss_convert_opportunity.yml => mass_leads2opportunity.yml} | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename addons/crm/test/process/{lead2_mass_convert_opportunity.yml => mass_leads2opportunity.yml} (90%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 965222976aa..66115e97e30 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -125,7 +125,7 @@ Creates a dashboard for CRM that includes:
             'test/process/partner2opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/meeting.yml',
-            'test/process/lead2_mass_convert_opportunity.yml',
+            'test/process/mass_leads2opportunity.yml',
             'test/ui/lead_form.yml',
             'test/process/phonecall2opportunity.yml',
             'test/process/phonecall2meeting.yml',
diff --git a/addons/crm/test/process/lead2_mass_convert_opportunity.yml b/addons/crm/test/process/mass_leads2opportunity.yml
similarity index 90%
rename from addons/crm/test/process/lead2_mass_convert_opportunity.yml
rename to addons/crm/test/process/mass_leads2opportunity.yml
index 22c22d7a376..4286eac1848 100644
--- a/addons/crm/test/process/lead2_mass_convert_opportunity.yml
+++ b/addons/crm/test/process/mass_leads2opportunity.yml
@@ -1,12 +1,13 @@
 -
-  Using mass wizard, convert two lead to opportunity.
+  Using mass wizard convert two lead to opportunity ,so first i create mass record for 
+  converting in opportunity.
 -
   !record {model: crm.lead2opportunity.partner.mass, id: crm_lead2opportunity_partner_mass0}:
     user_ids:
       - base.user_root
     section_id: crm.section_sales_department
 -
-  Leads coverts to mass opportunity.
+  Convert mass Leads to opportunity.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
     self.mass_convert(cr, uid, [ref("crm_lead2opportunity_partner_mass0")],{'active_ids': [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], 'active_id': ref("crm_case_qrecorp0")})

From d756ccfb55bf349096029c6b7bf2fed094f6f99f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 17 Oct 2011 18:36:51 +0530
Subject: [PATCH 046/132] [IMP, REF] crm: 1) Renamed lead_open.yml to
 draft2open_lead.yml, 2) Improved string value, 3) Updated __openerp__.py

bzr revid: ron@tinyerp.com-20111017130651-kbsl9j33jui7at98
---
 addons/crm/__openerp__.py                                     | 2 +-
 .../crm/test/process/{lead_open.yml => draft2open_lead.yml}   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename addons/crm/test/process/{lead_open.yml => draft2open_lead.yml} (54%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 66115e97e30..b7d4332d319 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -119,7 +119,7 @@ Creates a dashboard for CRM that includes:
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/process/lead_open.yml',
+            'test/process/draft2open_lead.yml',
             'test/process/lead2opportunity_win_lost.yml',
             'test/process/merge_opportunity.yml',
             'test/process/partner2opportunity.yml',
diff --git a/addons/crm/test/process/lead_open.yml b/addons/crm/test/process/draft2open_lead.yml
similarity index 54%
rename from addons/crm/test/process/lead_open.yml
rename to addons/crm/test/process/draft2open_lead.yml
index d5c6bb2d101..97947b5846b 100644
--- a/addons/crm/test/process/lead_open.yml
+++ b/addons/crm/test/process/draft2open_lead.yml
@@ -1,10 +1,10 @@
 -
-  Communication by phonecall or mail I got lead from Customer/partner, I test to created lead in initial stage.
+  I got lead from Customer, I open this lead.
 -
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
 - |
-  In order to test lead, i will test lead is in open stage.
+  In order to test lead, i test lead is in open stage.
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
      - state == "open"

From a5e50a5a272bcadd8b4d092152113cd8486b99c5 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 10:30:09 +0530
Subject: [PATCH 047/132] [IMP] crm: Improved string on cancel_lead.yml

bzr revid: ron@tinyerp.com-20111018050009-drdg39ws1w9gnj5d
---
 addons/crm/test/process/cancel_lead.yml | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index 3a3366c05e4..abd966b5e9d 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -1,45 +1,45 @@
 -
-  Cheking for lead from draft to cancel, I will cancelling this lead.
+  Cheking for lead from draft to cancel, I cancel this lead.
 -
   !python {model: crm.lead}: |
     self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  In order to test for cancel lead , i will test lead is on cancel state.
+  I test lead is on cancel state.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
      - state == "cancel"
 -
-  Cheking for lead from cancel to reset, I will reseting this lead.
+  Checking for lead from cancel to reset, I reset this lead.
 -
   !python {model: crm.lead}: |
     self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  In order to test for reset lead , i will test lead is on draft state.
+  I test lead is on draft state.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in draft state}:
      - state == "draft"
 -
-  Cheking for lead from reset to pending, I will pending this lead.
+  Cheking for lead from reset to pending, I pending this lead.
 -
   !python {model: crm.lead}: |
     self.case_pending(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  In order to test for pending lead , i will test lead is on pending state.
+  I test lead is on pending state.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in pending state}:
      - state == "pending"
 -
-  Cheking for lead from pending to cancel, I will cancelling this lead.
+  Cheking for lead from pending to cancel, I cancel this lead.
 -
   !python {model: crm.lead}: |
     self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  In order to test for cancel lead , i will test lead is on cancel state.
+  I test lead is on cancel state.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
      - state == "cancel"
 -
-  For working on parent child relationship, we are creating sales executive department that will be work under 
+  For working on parent child relationship, I create sales executive department that will be work under 
   Sales Department.
 -
   !record {model: crm.case.section, id: section_sales_exe_department}:
@@ -47,31 +47,31 @@
     parent_id: crm.section_sales_department
 
 -
-  If Lead not handle by executive team so its need to Escalate lead from sales executive department to sales department,
-  for that purpose i Assign sales executive department on lead, after we will be process to escalate lead to sales department 
+  Escalate lead from sales executive department to sales department,
+  for that purpose i assign sales executive department on lead, 
+  after i will be process to escalate lead to sales department 
 -
   !record {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0}:
     section_id: section_sales_exe_department
 -
-  Processing on Lead escalate to sales Departemnt, we are checking for lead Escalate to sales Department from Executive
+  Processing on Lead escalate to sales departemnt, i check for lead escalate to sales Department from Executive
   department or not.
 -
   !python {model: crm.lead}: |
     self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
     self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  In order to test for escalate lead , i will test lead Escalate from sales Department from Executive
-  department.
+  I test lead escalate from sales department from Executive  department.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Escalate lead to on sales team from Executive teame}:
      - section_id.name == "Sales Department"
 -
-  Cheking for lead from escalate to cancel, I will cancelling this lead.
+  Cheking for lead from escalate to cancel, I cancel this lead.
 -
   !python {model: crm.lead}: |
     self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  In order to test for cancel lead , i will test lead is on cancel state.
+  I test lead is on cancel state.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
      - state == "cancel"

From d61ea7b209e023681ae1a78cf818a15af8af31a1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 10:32:08 +0530
Subject: [PATCH 048/132] [IMP] crm: removed one  string on cancel_lead.yml

bzr revid: ron@tinyerp.com-20111018050208-jocyosbhswo08gw5
---
 addons/crm/test/process/cancel_lead.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index abd966b5e9d..75afa71c1d9 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -39,8 +39,7 @@
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
      - state == "cancel"
 -
-  For working on parent child relationship, I create sales executive department that will be work under 
-  Sales Department.
+  I create sales executive department that will be work under Sales Department.
 -
   !record {model: crm.case.section, id: section_sales_exe_department}:
     name: "Sales Executive"

From f43ab4b01e35945bccd04302d57a4113d76d3939 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 10:37:16 +0530
Subject: [PATCH 049/132] [IMP] crm: Improved string on lead_form.yml(onchange
 event, copy and unlink the record)

bzr revid: ron@tinyerp.com-20111018050716-xn8015acnwwvitb4
---
 addons/crm/test/ui/lead_form.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/test/ui/lead_form.yml b/addons/crm/test/ui/lead_form.yml
index c6cbbb3fcb2..8cfc96283b0 100644
--- a/addons/crm/test/ui/lead_form.yml
+++ b/addons/crm/test/ui/lead_form.yml
@@ -1,18 +1,18 @@
 -
-  In order to check for changes on partner, data will be change automatically according to partner,
+  In order to check for changes on partner, country and phone number change automatically according to partner,
 -
   !python {model: crm.lead}: |
     action = self.onchange_partner_address_id(cr, uid, ref("crm_case_qrecorp0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
     assert action['value']['country_id'] == 20, "Country name not True"
     assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
 -
-  I try to Unlink the Lead I create new record of lead. 
+  I try to Unlink the lead, so I create new record of lead on cancel stage. 
 -
   !record {model: crm.lead, id: crm_case_new_lead}:
     name: Openerp Trainning
     state: cancel
 -
-  In order to test unlink lead, i will do unlink this lead
+  I test copy and unlink this lead.
 -
   !python {model: crm.lead}: |
     self.copy(cr, uid, ref("crm_case_new_lead"))

From faea3fa2130fa2cb7f178d986add1606fe580809 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 10:46:39 +0530
Subject: [PATCH 050/132] [IMP] crm: Improved string on
 lead2opportunity_win_lost.yml

bzr revid: ron@tinyerp.com-20111018051639-kdy5pvaqeg3witvr
---
 addons/crm/test/process/lead2opportunity_win_lost.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/test/process/lead2opportunity_win_lost.yml b/addons/crm/test/process/lead2opportunity_win_lost.yml
index e5103c48ef0..eacb919c3eb 100644
--- a/addons/crm/test/process/lead2opportunity_win_lost.yml
+++ b/addons/crm/test/process/lead2opportunity_win_lost.yml
@@ -16,16 +16,16 @@
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
     assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
     assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
-    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
+    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
 -
   Finally, i won this opportunity, so i close this opportunity.
 -
   !python {model: crm.lead}: |
     self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
 -
-  I check lead is close or not.
+  I check opportunity is close or not.
 -
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in done state}:
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Opportunity in done state}:
     - state == "done"
 -
   In order to test stage of opportunity after win, i will test stage of opportunity.

From a1ab9fdfe6aca1faba3a0919ca2014eb4eaf6fa1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 11:00:37 +0530
Subject: [PATCH 051/132] [IMP] crm: Improved string on
 phonecall2opportunity.yml

bzr revid: ron@tinyerp.com-20111018053037-u9s24ffbjusg8cfj
---
 .../crm/test/process/phonecall2opportunity.yml   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/crm/test/process/phonecall2opportunity.yml b/addons/crm/test/process/phonecall2opportunity.yml
index 2575daf8665..03671d6df3b 100644
--- a/addons/crm/test/process/phonecall2opportunity.yml
+++ b/addons/crm/test/process/phonecall2opportunity.yml
@@ -1,19 +1,19 @@
-- |
-  For customer or partner purpose, I called to him/her for discussion about openerp.
-  As the success of phonecall seems to be a real business opportunity, It will convert
-  it to opportunity.
+-
+  For customer purpose, I called to him/her for discussion about openerp.
+  As the success of phonecall seems to be a real business opportunity, so first i
+  create record of phonecall.
 -
   !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_disc_openerp}:
     name: Discuss Review Process
     partner_id: base.res_partner_tinyatwork
 -
-  Succeed phonecall, it will be convert into on opportunity.
+  Succeed phonecall, it's convert into on opportunity.
 -
   !python {model: crm.phonecall2opportunity}: |
     self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_disc_openerp")], {"active_id": ref("crm_case_phone04")})
-- |
-  For business And I check that the phonecall and the newly created business 
-  opportunity is linked to same  partner and also check with phonecall closed and opportunity
+-
+  I check that the phonecall and the newly created business opportunity is 
+  linked to same  partner and also check with phonecall closed and opportunity
   is on intial stage or not.
 -
   !python {model: crm.phonecall}: |

From 570c0fabc53191d7d7706dc75f70240def1885d7 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 11:15:30 +0530
Subject: [PATCH 052/132] [REN]: crm: 1) Renamed from phonecall2opportunity.yml
 to phone-call2meeting.yml, 2) Renamed from phonecall2opportunity.yml to
 phone-call2opportunity.yml, 3) Renamed from schedule_other_phonecall.yml to
 schedule_other_phone-call.yml, 4) Updated __openerp__.py

bzr revid: ron@tinyerp.com-20111018054530-b06brnnspgalkjmb
---
 addons/crm/__openerp__.py                                   | 6 +++---
 .../{phonecall2meeting.yml => phone-call2meeting.yml}       | 0
 ...phonecall2opportunity.yml => phone-call2opportunity.yml} | 0
 ...le_other_phonecall.yml => schedule_other_phone-call.yml} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename addons/crm/test/process/{phonecall2meeting.yml => phone-call2meeting.yml} (100%)
 rename addons/crm/test/process/{phonecall2opportunity.yml => phone-call2opportunity.yml} (100%)
 rename addons/crm/test/process/{schedule_other_phonecall.yml => schedule_other_phone-call.yml} (100%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index b7d4332d319..fb2aa8679d4 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -127,9 +127,9 @@ Creates a dashboard for CRM that includes:
             'test/process/meeting.yml',
             'test/process/mass_leads2opportunity.yml',
             'test/ui/lead_form.yml',
-            'test/process/phonecall2opportunity.yml',
-            'test/process/phonecall2meeting.yml',
-            'test/process/schedule_other_phonecall.yml'
+            'test/process/phone-call2opportunity.yml',
+            'test/process/phone-call2meeting.yml',
+            'test/process/schedule_other_phone-call.yml'
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/test/process/phonecall2meeting.yml b/addons/crm/test/process/phone-call2meeting.yml
similarity index 100%
rename from addons/crm/test/process/phonecall2meeting.yml
rename to addons/crm/test/process/phone-call2meeting.yml
diff --git a/addons/crm/test/process/phonecall2opportunity.yml b/addons/crm/test/process/phone-call2opportunity.yml
similarity index 100%
rename from addons/crm/test/process/phonecall2opportunity.yml
rename to addons/crm/test/process/phone-call2opportunity.yml
diff --git a/addons/crm/test/process/schedule_other_phonecall.yml b/addons/crm/test/process/schedule_other_phone-call.yml
similarity index 100%
rename from addons/crm/test/process/schedule_other_phonecall.yml
rename to addons/crm/test/process/schedule_other_phone-call.yml

From cc262bbd1ea9384aa5904b0bd0fc43142c1619ee Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 12:00:30 +0530
Subject: [PATCH 053/132] [ADD, MOVE] crm_claim: 1)Added process directory:
 crm_claim/test/process, 2) Move and renamed file from
 crm_claim/test/test_crm_claim.yml => crm_claim/test/process/claim.yml

bzr revid: ron@tinyerp.com-20111018063030-4dp0jkjbmpu0csml
---
 addons/crm_claim/test/{test_crm_claim.yml => process/claim.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/crm_claim/test/{test_crm_claim.yml => process/claim.yml} (100%)

diff --git a/addons/crm_claim/test/test_crm_claim.yml b/addons/crm_claim/test/process/claim.yml
similarity index 100%
rename from addons/crm_claim/test/test_crm_claim.yml
rename to addons/crm_claim/test/process/claim.yml

From b7641ab3d213426e34cc2fdf7c423f4880aa415b Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 12:43:58 +0530
Subject: [PATCH 054/132] [IMP, REM] crm_claim: All changes done in claim.yml
 1) Removed code of onchange_partner_id, onchange_partner_address_id,
 stage_change 2) Updated code only claim is open to close process 3) updated
 __openerp__.py

bzr revid: ron@tinyerp.com-20111018071358-l5424dpckx7327n1
---
 addons/crm_claim/__openerp__.py         |  2 +-
 addons/crm_claim/test/process/claim.yml | 48 ++++++-------------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index ae493c5dac2..2fabcd4b100 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -48,7 +48,7 @@ automatically new claims based on incoming emails.
     'demo_xml': [
         'crm_claim_demo.xml',
     ],
-    'test': ['test/test_crm_claim.yml'],
+    'test': ['test/process/claim.yml'],
     'installable': True,
     'active': False,
     'certificate' : '00612027414703404749',
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index 9ee130329a7..b12698797cb 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -1,44 +1,18 @@
-- |
-  I check claims which contain customer claim information about document
-  related problem, product related problem.
-- |
-  I start by creating new claims for Damaged product as Value Claims with priority High and specify
-  date of claim at which  claim is created.
 -
-  !record {model: crm.claim, id: crm_claim_damagedproduct0}:
-    categ_id: crm_claim.categ_claim2
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    email_from: info@balmerinc.be
-    name: 'Damaged product '
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    priority: '2'
-    section_id: crm.section_sales_department
-
-- |
-  I check that the claims  is in 'draft' state.
+  I check claim which contain customer claim information about 
+  product related problem.
 -
-  !assert {model: crm.claim, id: crm_claim_damagedproduct0}:
-    - state == 'draft'
-- |
-  I can change that stage by next button right on it.
--
-  !python {model: crm.claim}: |
-    self.stage_next(cr, uid, [ref('crm_claim_damagedproduct0')])
-- |
   I make this claim as Open.
 -
   !python {model: crm.claim}: |
-    self.case_open(cr, uid, [ref('crm_claim_damagedproduct0')])
-- |
-  I  am changing partner Assigned to the Claim.
+    self.case_open(cr, uid, [ref('crm_case_claim04')])
+    claim = self.browse(cr, uid, ref('crm_case_claim04'))
+    assert claim.state == "open", "Claim is not in Open state"
+    assert claim.stage_id.id == ref("crm.stage_lead1"), "Claim is not in New stage"
+-
+  After complete all service from our side i close this claim.
 -
   !python {model: crm.claim}: |
-    self.onchange_partner_id(cr, uid, [ref('crm_claim_damagedproduct0')], [])
-    self.onchange_partner_id(cr, uid, [ref('crm_claim_damagedproduct0')], ref('base.res_partner_10'))
-- |
-  I  am changing partner Address to the Claim.
--
-  !python {model: crm.claim}: |
-    self.onchange_partner_address_id(cr, uid, [ref('crm_claim_damagedproduct0')], [], email = False)
-
+    self.case_close(cr, uid, [ref('crm_case_claim04')])
+    claim = self.browse(cr, uid, ref('crm_case_claim04'))
+    assert claim.state == "done", "Claim is not in close state"

From 83b5a42efce56ac25f007f476587d554736b49b4 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 15:26:22 +0530
Subject: [PATCH 055/132] [ADD] crm_claim: 1) Added directory
 =>crm_claim/test/ui, 1) Added file crm_claim/test/ui/claim_form.yml, 2)
 covered partner_onchange_id and checked data

bzr revid: ron@tinyerp.com-20111018095622-ceg2nur0nlt93pjp
---
 addons/crm_claim/__openerp__.py         | 3 ++-
 addons/crm_claim/test/ui/claim_form.yml | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 addons/crm_claim/test/ui/claim_form.yml

diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 2fabcd4b100..8f0aef1bf37 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -48,7 +48,8 @@ automatically new claims based on incoming emails.
     'demo_xml': [
         'crm_claim_demo.xml',
     ],
-    'test': ['test/process/claim.yml'],
+    'test': ['test/process/claim.yml',
+             'test/ui/claim_form.yml'],
     'installable': True,
     'active': False,
     'certificate' : '00612027414703404749',
diff --git a/addons/crm_claim/test/ui/claim_form.yml b/addons/crm_claim/test/ui/claim_form.yml
new file mode 100644
index 00000000000..bbf37688ed6
--- /dev/null
+++ b/addons/crm_claim/test/ui/claim_form.yml
@@ -0,0 +1,8 @@
+-
+  In order to test for changes on partner, data change automatically according to partner.
+-
+  !python {model: crm.claim}: |
+    partner_onchange = self.onchange_partner_id(cr, uid, [ref('crm_case_claim04')], ref('base.res_partner_10'))
+    assert partner_onchange['value']['partner_phone'] == "+33-658-256545" ,"Phone number is wrong"
+    assert partner_onchange['value']['partner_address_id'] == 20 ,"Address is wrong"
+    assert partner_onchange['value']['email_from'] == 'l.dupont@tecsas.fr' ,"Email address is wrong"

From fe454d5d26707e527f3b2d42c259d62bb2c1e895 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 18 Oct 2011 16:31:39 +0530
Subject: [PATCH 056/132] [ADD, MOVE] crm_helpdesk: 1) added directory
 =>crm_helpdesk/test/process, 2) renamed file
 crm_helpdesk/test/test_crm_helpdesk.yml =>
 crm_helpdesk/test/process/help-desk.yml

bzr revid: ron@tinyerp.com-20111018110139-i88q4i1nf17t1h4y
---
 .../test/{test_crm_helpdesk.yml => process/help-desk.yml}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/crm_helpdesk/test/{test_crm_helpdesk.yml => process/help-desk.yml} (100%)

diff --git a/addons/crm_helpdesk/test/test_crm_helpdesk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
similarity index 100%
rename from addons/crm_helpdesk/test/test_crm_helpdesk.yml
rename to addons/crm_helpdesk/test/process/help-desk.yml

From 7724dda7bb570f5abccbcbf4eaa8bbf65c404eee Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 19 Oct 2011 11:50:35 +0530
Subject: [PATCH 057/132] [IMP] crm_helpdesk: Improved help-desk.yml, first
 create message manually regarding functional question for helpdesk and test
 it, open this helpdesk and update that message accordingly, after i complete
 this helpdesk then close it

bzr revid: ron@tinyerp.com-20111019062035-mxa0kdia4tfhxf2w
---
 addons/crm_helpdesk/__openerp__.py            |  2 +-
 .../crm_helpdesk/test/process/help-desk.yml   | 68 ++++---------------
 2 files changed, 15 insertions(+), 55 deletions(-)

diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index 5124c3c5817..2adf7d26dcc 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -49,7 +49,7 @@ and categorize your interventions with a channel and a priority level.
     'demo_xml': [
         'crm_helpdesk_demo.xml',
     ],
-    'test': ['test/test_crm_helpdesk.yml'],
+    'test': ['test/process/help-desk.yml'],
     'installable': True,
     'active': False,
     'certificate' : '00830691522781519309',
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index eb0a25d2110..687238ab269 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -1,57 +1,17 @@
 -
-  |
-  I start by creating New helpdesk request regarding some functional questions.
-  I select Date at which helpdesk request is created.
-- 
-  !record {model: crm.helpdesk, id: crm_helpdesk_somefunctionalquestion0}:
-    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-    email_from: info@balmerinc.be
-    name: Some functional question.
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    section_id: crm.section_sales_department
--
-  I create the message.
+  I start by create helpdesk request regarding some functional questions, 
+  so first create message manually regarding functional question for helpdesk
+  and test it, open this helpdesk and update that message accordingly, after
+  i complete this helpdesk then close it.
 -
   !python {model: crm.helpdesk}: |
-    msg = {
-       'subject': 'test_email',
-       'body_text': 'Testing',
-       'from': 'Administrator <admin@openerp.com>',
-      }
-    context = None
-    self.message_new(cr, uid,msg,context)
-
-- |
-  I check that the Helpdesk request  is in 'Draft' state.
--
-  !assert {model: crm.helpdesk, id: crm_helpdesk_somefunctionalquestion0}: 
-    - state == 'draft'  
-- |
-  I make it "Open".
--
-  !python {model: crm.helpdesk}: |
-    self.case_open(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')])  
--
-  Update the created message.
--
-  !python {model: crm.helpdesk}: |
-    vals = {}
-    msg = {
-       'subject': 'test_email',
-       'body_text': 'Testing',
-       'from': 'Administrator <admin@openerp.com>',
-       'priority': 'done'
-      }
-    context = None
-    default_act = 'pending'
-    try:
-      self.message_update(cr, uid,[ref('crm_helpdesk_somefunctionalquestion0')], msg,context)
-    except:
-      pass
-- |
-  After a proper communication for the request via email I make sure that the request is fulfilled and
-  I close this HelpDesk Request by clicking on "Close" button.
-- 
-  !python {model: crm.helpdesk}: |
-    self.case_close(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')])
+    msg = {'subject': 'Functional questions', 'body_text': 'How the CRM working?', 'from': 'admin@openerp.com'}
+    helpdesk_id = self.message_new(cr, uid, msg, context=None)
+    data = self.browse(cr, uid ,helpdesk_id)
+    assert data.name == "Functional questions", "Subject name is incorrect"
+    assert data.email_from == "admin@openerp.com","Email Id incorrect"
+    assert data.description == "How the CRM working?", "Description is incorrect"
+    self.case_open(cr, uid, [helpdesk_id])
+    msg = {'subject': 'Email regarding to CRM', 'body_text': 'Details of CRM Documentation', 'from': 'admin@openerp.com'}
+    self.message_update(cr, uid,[helpdesk_id], msg, default_act = 'pending',context=None)
+    self.case_close(cr, uid, [helpdesk_id])
\ No newline at end of file

From ba3e68b09243cf14006fe3c055e455463099a621 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 19 Oct 2011 12:43:25 +0530
Subject: [PATCH 058/132] [FIX]: crm_partner_assign: Cannot find field body in
 the following view parts composing the view of object model
 crm.lead.forward.to.partner

bzr revid: ron@tinyerp.com-20111019071325-vwxdwdtmk42bia48
---
 .../crm_partner_assign/wizard/crm_forward_to_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 8bdb03cf962..aa2c45ea1c9 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -35,7 +35,7 @@
                     <separator string="" colspan="4"/>
                     <notebook colspan="4">
                         <page string="Body">
-                            <field name="body" colspan="4" nolabel="1"/>
+                            <field name="body_text" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Attachments">
                             <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
@@ -80,7 +80,7 @@
                     </group>
                     <notebook colspan="6" >
                         <page string="Message" >
-                            <field name="body" nolabel="1" colspan="4" default_focus="1" readonly="1"/>
+                            <field name="body_text" nolabel="1" colspan="4" default_focus="1" readonly="1"/>
                         </page>
                         <page string="Attachments" >
                             <field name="attachment_ids" colspan="4" nolabel="1">

From 90d155398c4a67649e62b6bcefb52cccc0813cc0 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 19 Oct 2011 14:14:31 +0530
Subject: [PATCH 059/132] [ADD, MOVE, IMP] crm_partner_assign: 1)added
 directory crm_partner_assign/test/process, 2) moved and renamed file
 crm_partner_assign/test/test_crm_partner_assign.yml =>
 crm_partner_assign/test/process/partner_assign.yml, 3) Updated __openerp__.py

bzr revid: ron@tinyerp.com-20111019084431-9llmji0luxlyav7t
---
 addons/crm_partner_assign/__openerp__.py                        | 2 +-
 .../{test_crm_partner_assign.yml => process/partner_assign.yml} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/crm_partner_assign/test/{test_crm_partner_assign.yml => process/partner_assign.yml} (100%)

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 9e72204e31d..cc993fe2a74 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -46,7 +46,7 @@ You can also use the geolocalization without using the GPS coordinates.
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
     ],
-    'test': ['test/test_crm_partner_assign.yml'],
+    'test': ['test/process/partner_assign.yml'],
     'installable': True,
     'active': False,
     'certificate': '00503409558942442061',
diff --git a/addons/crm_partner_assign/test/test_crm_partner_assign.yml b/addons/crm_partner_assign/test/process/partner_assign.yml
similarity index 100%
rename from addons/crm_partner_assign/test/test_crm_partner_assign.yml
rename to addons/crm_partner_assign/test/process/partner_assign.yml

From 5b439580e19d0e6ad6dadefd10a02d48b0111a41 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 19 Oct 2011 17:31:49 +0530
Subject: [PATCH 060/132] [IMP] crm_partner_assign: Improved
 partner_assign.yml, Tested and find nearest Partner functionality and assign
 that partner to opportunity

bzr revid: ron@tinyerp.com-20111019120149-oy14qu84j5vb92ez
---
 .../test/process/partner_assign.yml           | 146 +++---------------
 1 file changed, 23 insertions(+), 123 deletions(-)

diff --git a/addons/crm_partner_assign/test/process/partner_assign.yml b/addons/crm_partner_assign/test/process/partner_assign.yml
index 359fa8454f6..d7e7ba5b290 100644
--- a/addons/crm_partner_assign/test/process/partner_assign.yml
+++ b/addons/crm_partner_assign/test/process/partner_assign.yml
@@ -1,137 +1,37 @@
 -
-  In order to test Forward Partner functionality, I create an opportunity and forward it to partner.
+  In order to test find nearest Partner functionality and assign to opportunity ,
+  so First i create a grade 'First' for partner.
 -
-  I assign an email address to Administrator.
--
-  !record {model: res.users, id: base.user_root}:
-    user_email: admin@openerp.com
--
-  I create some partner grades.
--
-  I create a grade 'First'.
--
-  !record {model: res.partner.grade, id: res_partner_grade_first0}:
+  !record {model: res.partner.grade, id: res_partner_grade_first}:
     name: First
     sequence: 1
 -
-  I create another grade 'Second'.
+  I assign grade 'First' to the partner 'Eric' and give more probability to assign a lead to this partner.
 -
-  !record {model: res.partner.grade, id: res_partner_grade_second0}:
-    name: Second
-    sequence: 2
+  !record {model: res.partner, id: base.res_partner_ericdubois0}:
+    grade_id: res_partner_grade_first
+    partner_weight: 10
 -
-  I create one more grade 'Third'.
--
-  !record {model: res.partner.grade, id: res_partner_grade_third0}:
-    name: Third
-    sequence: 3
--
-  I assign grade 'First' to the partner 'Axelor'.
--
-  !record {model: res.partner, id: base.res_partner_desertic_hispafuentes}:
-    grade_id: res_partner_grade_first0
--
-  I change the User email id or partner if needed.
+  Set Lattitude and Longitude according to partner address.
 -
   !python {model: res.partner}: |
-    self.geo_localize(cr, uid, [ref('base.res_partner_desertic_hispafuentes')], context)
+    self.geo_localize(cr, uid, [ref('base.res_partner_ericdubois0')], context)
+    partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
+    assert partner.partner_latitude == 50.4530495 , "Lattitude is wrong"
+    assert partner.partner_longitude == 3.9693885 , "Longitude is wrong"
 -
-  I assgin a reply-to email address to Sales Team.
--
-  !record {model: crm.case.section, id: crm.section_sales_department}:
-    reply_to: sales_openerp@openerp.com
--
-  I create an opportunity 'Questionnaire on OpenERP'.
--
-  !record {model: crm.lead, id: crm_lead_questionnaireonopenerp0}:
-    categ_id: crm.categ_oppor7
-    section_id: crm.section_sales_department
-    country_id: base.fr
-    date_assign: '2011-02-07'
-    day_close: 0.0
-    day_open: 0.0
-    email_from: info@axelor.com
-    name: Questionnaire on OpenERP
-    partner_address_id: base.res_partner_address_3000
-    partner_assigned_id: base.res_partner_desertic_hispafuentes
-    partner_id: base.res_partner_desertic_hispafuentes
-    partner_latitude: 0.0
-    partner_longitude: 0.0
-    phone: +33 1 64 61 04 01
-    planned_revenue: 0.0
-    probability: 0.0
-    type: opportunity
--
-  I change the assigned partner.
+  I would like to change the assign partner on opportunity, so find nearest partner assign to this opportunity.
 -
   !python {model: crm.lead}: |
-    self.onchange_assign_id(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], ref('base.res_partner_desertic_hispafuentes'), context)
-    self.assign_partner(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], context)
+    res = self.onchange_assign_id(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], ref('base.res_partner_ericdubois0'), context)
+    assert res['value']['user_id'] == ref('base.user_demo'), "User not correct"
+    self.assign_partner(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], context)
 -
-  I change the User email id or partner if needed.
+  In order to assigned partner to opportunity, so i test latitude and longitude of partner of opportunity
+  and opportuniy assign to assigned partner.
 -
-  !python {model: crm.lead.forward.to.partner}: |
-    context.update({'history': 'latest', })
-    user = ref('base.user_root')
-    self.on_change_email(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], user)
-    self.on_change_partner(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], ref('base.res_partner_desertic_hispafuentes'))
--
-  I change in history define.
--
-  !python {model: crm.lead.forward.to.partner}: |
-    context.update({'history': 'info', })
-    self.on_change_history(cr, uid, [ref('crm_lead_questionnaireonopenerp0')], context.get('history'), context)
--
-  I check the case history.
--
-  !python {model: crm.lead.forward.to.partner}: |
-    context.update({'history': 'latest', })
-    self._get_case_history(cr, uid, context.get('history'), ref('crm_lead_questionnaireonopenerp0'), context=context)
-    
-    context.update({'history': 'info', })
-    self._get_case_history(cr, uid, context.get('history'), ref('crm_lead_questionnaireonopenerp0'), context=context)
-    
-    context.update({'history': 'whole', })
-    self._get_case_history(cr, uid, context.get('history'), ref('crm_lead_questionnaireonopenerp0'), context=context)
--
-  I get lead details.
--
-  !python {model: crm.lead.forward.to.partner}: |
-    self.get_lead_details(cr, uid, ref('crm_lead_questionnaireonopenerp0'), context)
--
-  I click on Forward button.
--
-  !python {model: crm.lead.forward.to.partner}: |
-    from tools import config
-    vals = {
-       'subject': 'email',
-       'email_to': 'info@axelor.com',
-       'email_from': 'Administrator <admin@openerp.com>',
-       'reply_to': 'sales_openerp@openerp.com',
-       'state': 'draft',
-       'history': 'latest', 
-    }
-    ids = self.create(cr, uid, vals, context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
-    host = config.get('smtp_user', '127.0.0.1')
-    assert config.get(host, True), 'SMTP not configured !'
-    try:
-      self.action_forward(cr, uid, [ids], context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
-    except:
-      pass
--
-  I create the opportunity.
--
-   !record {model: crm.lead, id: crm_opportunity2}:
-    email_from: info@balmerinc.be
-    name: 'FUEL CO 829264 - 10002 units'
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    probability: 1.0
-    stage_id: crm.stage_lead1
-    categ_id: crm.categ_oppor2
-    section_id: crm.section_sales_department
--  |
-   I Update the data.
--
-   !python {model: crm.merge.opportunity}: |
-    self._update_data([ref('crm_opportunity2')], ref('crm_lead_questionnaireonopenerp0'))
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, [ref('crm.crm_case_abcfuelcounits0')])[0]
+    assert lead.partner_latitude == 50.8495239 , "Lattitude is wrong"
+    assert lead.partner_longitude == 4.3667002 , "Longitude is wrong"
+    assert lead.partner_assigned_id.id == ref('base.res_partner_ericdubois0') , "Opportuniy not assign partner"

From 4d016b97a787f4d78e245fdf895c66c6dcc18d06 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 19 Oct 2011 18:03:23 +0530
Subject: [PATCH 061/132] [ADD] crm_partner_assign: 1) added directory
 crm_partner_assign/test/ui, 2)added file
 crm_partner_assign/test/ui/partner_assign_form.yml

bzr revid: ron@tinyerp.com-20111019123323-k86utwz77ck09iid
---
 addons/crm_partner_assign/test/ui/partner_assign_form.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 addons/crm_partner_assign/test/ui/partner_assign_form.yml

diff --git a/addons/crm_partner_assign/test/ui/partner_assign_form.yml b/addons/crm_partner_assign/test/ui/partner_assign_form.yml
new file mode 100644
index 00000000000..e69de29bb2d

From 1911fab69c8c9eb09033212b207400dc04cbe493 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 19 Oct 2011 18:49:10 +0530
Subject: [PATCH 062/132] [IMP] crm_partner_assign: Improved
 partner_assign.yml, Checked Oppportuniry forword to its nearest partner

bzr revid: ron@tinyerp.com-20111019131910-f1nd58iazih54qka
---
 .../test/process/partner_assign.yml           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/addons/crm_partner_assign/test/process/partner_assign.yml b/addons/crm_partner_assign/test/process/partner_assign.yml
index d7e7ba5b290..43c413fb588 100644
--- a/addons/crm_partner_assign/test/process/partner_assign.yml
+++ b/addons/crm_partner_assign/test/process/partner_assign.yml
@@ -35,3 +35,24 @@
     assert lead.partner_latitude == 50.8495239 , "Lattitude is wrong"
     assert lead.partner_longitude == 4.3667002 , "Longitude is wrong"
     assert lead.partner_assigned_id.id == ref('base.res_partner_ericdubois0') , "Opportuniy not assign partner"
+-
+  Oppportuniry forword to its nearest partner, so first i create record of forword mail
+-
+  !record {model: crm.lead.forward.to.partner, id: crm_lead_forward_to_partner_rec}:
+    send_to: email
+    email_from: 'admin@openerp.com'
+    email_to: 'admin@tinyerp.com'
+    subject: 'Openerp lead forward'
+    history: latest 
+-
+  I forword this opportunity to its nearest partner.
+-
+  !python {model: crm.lead.forward.to.partner}: |
+    from tools import config
+    host = config.get('smtp_user', '127.0.0.1')
+    assert config.get(host, True), 'SMTP not configured !'
+    try:
+      self.action_forward(cr, uid, ref("crm_lead_forward_to_partner_rec"), context={'active_id': ref('crm.crm_case_abcfuelcounits0'),
+      'active_ids': [ref('crm.crm_case_abcfuelcounits0')], 'active_model': 'crm.lead'})
+    except:
+      pass

From 493ee35c1a03e44bc596a76ccfdd1eb77efb6f6f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 20 Oct 2011 10:53:51 +0530
Subject: [PATCH 063/132] [ADD, IMP] crm_partner_assign: 1) Coverage,Improved
 and tested onchange on email, partner, history and test the data accordingly
 changed 2) Updated __openerp__.py

bzr revid: ron@tinyerp.com-20111020052351-elvtmn8yo8au2j2l
---
 addons/crm_partner_assign/__openerp__.py       |  3 ++-
 .../test/ui/partner_assign_form.yml            | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index cc993fe2a74..0b9e14c29bf 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -46,7 +46,8 @@ You can also use the geolocalization without using the GPS coordinates.
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
     ],
-    'test': ['test/process/partner_assign.yml'],
+    'test': ['test/process/partner_assign.yml',
+             'test/ui/partner_assign_form.yml'],
     'installable': True,
     'active': False,
     'certificate': '00503409558942442061',
diff --git a/addons/crm_partner_assign/test/ui/partner_assign_form.yml b/addons/crm_partner_assign/test/ui/partner_assign_form.yml
index e69de29bb2d..747297a833c 100644
--- a/addons/crm_partner_assign/test/ui/partner_assign_form.yml
+++ b/addons/crm_partner_assign/test/ui/partner_assign_form.yml
@@ -0,0 +1,18 @@
+-
+  For onchange on partner , i assign an email address to Administrator user.
+-
+  !record {model: res.users, id: base.user_root}:
+    user_email: admin@openerp.com
+
+-
+  I check onchange on email, partner, history and test the data accordingly change.
+-
+  !python {model: crm.lead.forward.to.partner}: |
+    context.update({'history': 'latest', 'active_id': ref('crm.crm_case_abcfuelcounits0')})
+    email = self.on_change_email(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], ref('base.user_root'))
+    assert email['value']['email_to'] == "Administrator <admin@openerp.com>", "Email is not correct"
+    partner = self.on_change_partner(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], ref('base.res_partner_desertic_hispafuentes'))
+    assert partner['value']['address_id'] == ref('base.res_partner_desertic_hispafuentes'), "Address invalid"
+    assert partner['value']['email_to'] == 'info@axelor.com', "Email id incorrect"
+    history = self.on_change_history(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], context.get('history'), context)
+    assert history, "History is blank"
\ No newline at end of file

From 7225115a0f89aa3818b8139d878e8579497d2b35 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 20 Oct 2011 11:35:42 +0530
Subject: [PATCH 064/132] [ADD, MOVE, REN] crm_fundraising: 1) Added directory
 crm_fundraising/test/process 2) renamed file
 crm_fundraising/test/test_crm_fund.yml =>
 crm_fundraising/test/process/fund-rising.yml 3) In order to check Fund
 Raising for Renovating government schools which contain information about
 donation for schools, so open and close this stage and addded message event
 4) Update __openerp__.py

bzr revid: ron@tinyerp.com-20111020060542-tv0bk0azk3xxr6g8
---
 addons/crm_fundraising/__openerp__.py         |  2 +-
 .../test/process/fund-rising.yml              | 34 ++++++++++++++
 addons/crm_fundraising/test/test_crm_fund.yml | 45 -------------------
 3 files changed, 35 insertions(+), 46 deletions(-)
 create mode 100644 addons/crm_fundraising/test/process/fund-rising.yml
 delete mode 100644 addons/crm_fundraising/test/test_crm_fund.yml

diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index 2d75f9e69b7..993b3dc6434 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -51,7 +51,7 @@ fund status.
     'demo_xml': [
         'crm_fundraising_demo.xml',
     ],
-    'test': ['test/test_crm_fund.yml'],
+    'test': ['test/process/fund-rising.yml'],
     'installable': True,
     'active': False,
     'certificate' : '00871545204231528989',
diff --git a/addons/crm_fundraising/test/process/fund-rising.yml b/addons/crm_fundraising/test/process/fund-rising.yml
new file mode 100644
index 00000000000..ef49f3207e6
--- /dev/null
+++ b/addons/crm_fundraising/test/process/fund-rising.yml
@@ -0,0 +1,34 @@
+-
+  In order to check Fund Raising for "Renovating government schools" which contain information 
+  about donation for schools, so i open Funds rising.
+-
+  !python {model: crm.fundraising}: |
+    self.case_open(cr, uid, [ref('crm_case_renovatinggovernmentschools0')])
+-
+  In order to test fundraising, i test fundraising is in open stage.
+-
+  !assert {model: crm.fundraising, id: crm_case_renovatinggovernmentschools0, string: fundraising in open state}:
+     - state == "open"
+-
+  I create the message regarding the all details of fundraising.
+-
+  !python {model: crm.fundraising}: |
+    msg = {
+       'subject': 'fundraising_email',
+       'body_text': 'fundraising details',
+       'from': 'Administrator <admin@openerp.com>',
+       'priority':'3',
+      }
+    self.message_new(cr, uid, msg, context=None)
+
+-
+  After a request via email now I close this fundraising Request.
+-
+  !python {model: crm.fundraising}: |
+    self.case_close(cr, uid, [ref('crm_case_renovatinggovernmentschools0')])
+-
+  After closed this fundraising Request, i test fundraising is in done stage.
+-
+  !assert {model: crm.fundraising, id: crm_case_renovatinggovernmentschools0, string: fundraising in done state}:
+     - state == "done"
+    
\ No newline at end of file
diff --git a/addons/crm_fundraising/test/test_crm_fund.yml b/addons/crm_fundraising/test/test_crm_fund.yml
deleted file mode 100644
index ef81afeb563..00000000000
--- a/addons/crm_fundraising/test/test_crm_fund.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-- |
-  I start test Fund Raising  which contain information about Donation or charity
-  given by user.
-- |
-  I start by creating new Funds entry for donation for books to poor school children
-  with cost 500000.00 and category as "Learning And Education"
-  I make payment by Cheque so I make sure that the mode on fund is selected as cheque.
--
-  !record {model: crm.fundraising, id: crm_fundraising_donationforbookstopoorschoolchildren0}:
-    categ_id: crm_fundraising.categ_fund2
-    email_from: info@balmerinc.be
-    name: Donation for books to poor school children
-    partner_address_id: base.res_partner_address_1
-    partner_id: base.res_partner_9
-    planned_cost: 500000.0
-    section_id: crm.section_sales_department
-    type_id: crm_fundraising.type_fund2
-- |
-  I check that the Funds  is in 'draft' state.
--
-  !assert {model: crm.fundraising, id: crm_fundraising_donationforbookstopoorschoolchildren0}:
-    - state == 'draft'
-- |
-  I open Funds by click on "Open" button.
--
-  !python {model: crm.fundraising}: |
-    self.case_open(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])
--
-  I create the message regarding the all details of fundraising.
--
-  !python {model: crm.fundraising}: |
-    msg = {
-       'subject': 'fundraising_email',
-       'body_text': 'fundraising details',
-       'from': 'Administrator <admin@openerp.com>',
-       'priority':'3',
-      }
-    context = None
-    self.message_new(cr, uid,msg,context)
-
-- |
-  After a request via email now I close this fundraising Request by clicking on "Done" button.
--
-  !python {model: crm.fundraising}: |
-    self.case_close(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])

From b60162dc0cf1e13f3df69ccbab1097771a63b0c8 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 20 Oct 2011 14:39:06 +0530
Subject: [PATCH 065/132] [ADD, MOVE, REN] crm_profiling: 1) added directory
 crm_profiling/test/process 2) renamed file
 crm_profiling/test/test_crm_profiling.yml =>
 crm_profiling/test/process/profiling.yml 3) First computed questions(answers)
 scenario with parther and check that category set according to questions 4)
 Update __openerp__.py

bzr revid: ron@tinyerp.com-20111020090906-3jab42z8a0y4moy6
---
 addons/crm_profiling/__openerp__.py           |  2 +-
 .../crm_profiling/test/process/profiling.yml  | 10 +++
 .../crm_profiling/test/test_crm_profiling.yml | 77 -------------------
 3 files changed, 11 insertions(+), 78 deletions(-)
 create mode 100644 addons/crm_profiling/test/process/profiling.yml
 delete mode 100644 addons/crm_profiling/test/test_crm_profiling.yml

diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 71b4e2f126e..30fb6115edf 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -41,7 +41,7 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
-    'test': ['test/test_crm_profiling.yml',
+    'test': ['test/process/profiling.yml',
              'test/test_crm_segmentation.yml',],
     'installable': True,
     'active': False,
diff --git a/addons/crm_profiling/test/process/profiling.yml b/addons/crm_profiling/test/process/profiling.yml
new file mode 100644
index 00000000000..91c48410f8d
--- /dev/null
+++ b/addons/crm_profiling/test/process/profiling.yml
@@ -0,0 +1,10 @@
+-
+  I check segmentation which allows users to perform segmentation within partners
+  and set the category according to question, so first compute questions(answers) 
+  scenario with parther and check that category set according to questions. 
+-
+  !python {model: res.partner}: |
+    data ={'form': {'quest_form3': ref("partner_quality3"), 'quest_form2': ref("nb_employees2"),'quest_form1': ref("sector1"),'questionnaire_name': ref('questionnaire1')}, 'ids': [ref('base.res_partner_ericdubois0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('base.res_partner_ericdubois0')}
+    data = self._questionnaire_compute(cr, uid, data, context)
+    partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
+    assert partner.category_id[0].id == ref("base.res_partner_category_17"), "Category not assign properly" 
diff --git a/addons/crm_profiling/test/test_crm_profiling.yml b/addons/crm_profiling/test/test_crm_profiling.yml
deleted file mode 100644
index 2b70cac592b..00000000000
--- a/addons/crm_profiling/test/test_crm_profiling.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-- |
-  I check segmentation which allows users to perform segmentation within partners.
--
-  I create a crm profiling question record.
--
-  !record {model: crm_profiling.question, id: crm_profiling_question_openerppartner0}:
-    answers_ids:
-      - name: 'no'
-    name: OpenERP partner?
--
-  I create a crm profiling answer record.
--
-  !record {model: crm_profiling.answer, id: crm_profiling_answer_openerppartner0}:
-    name: 'yes'
-    question_id: crm_profiling_question_openerppartner0
--
-  I create Partner category Customers.
--
-  !record {model: res.partner.category, id: res_partner_category_customers0}:
-    name: Customers
-- |
-  I'm creating new partner "John" with his email "info@mycustomer.com".
--
-  !record {model: res.partner, id: res_partner_john0}:
-    address:
-      - city: Bruxelles
-        country_id: base.be
-        street: Rue des Palais 51, bte 33
-        type: default
-        zip: '1000'
-        email: 'info@mycustomer.com'
-    name: John
-    category_id:
-      - res_partner_category_customers0
-    answers_ids:
-      - crm_profiling_answer_openerppartner0
-
--
-  Define the answers and category to partner.
--
-  !python {model: res.partner}: |
-    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
-    self._questionnaire_compute(cr, uid, data, context)
-- |
-  I start by creating new Questionnaire.
--
-  !record {model: crm_profiling.questionnaire, id: crm_profiling_questionnaire_basequestionnaire0}:
-    description: First questionnaire.
-    name: Base questionnaire
-    questions_ids:
-      - crm_profiling.activity_sector
-      - crm_profiling.nb_employees
-      - crm_profiling.partner_level
-- |
-  I create the form for the "Base questionnaire".
--
-  !python {model: crm_profiling.questionnaire}: |
-    context.update({'active_id':ref('res_partner_john0')})
-    data ={'form': {'questionnaire_name': ref('res_partner_john0')}, 'ids': [ref('res_partner_john0')], 'report_type': 'pdf', 'model': 'res.partner', 'id': ref('res_partner_john0')}
-    self.build_form(cr, uid, data, context)
--
-  I create a segmentation record.
--
-  !record {model: crm.segmentation, id: crm_segmentation_test1}:
-    answer_yes:
-      - crm_profiling_answer_openerppartner0
-    categ_id: res_partner_category_customers0
-    name: test
-    parent_id: crm_profiling.crm_segmentation0
-    profiling_active: true
-    som_interval: 0.0
-- |
-  I continue the process of segmentation.
--
-  !python {model: crm.segmentation}: |
-    self.process_continue(cr, uid, [ref('crm_segmentation_test1')], start=False)
-

From ce5a42177085cf00de7b15e4db15c578541825f2 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 20 Oct 2011 16:39:59 +0530
Subject: [PATCH 066/132] [IMP] crm_profiling :# TODO
 crm_profiling/test/process/profiling.yml-It is not debuging now because
 problem to write data for open.questionnaire from partner section.

bzr revid: ron@tinyerp.com-20111020110959-0a6q626vfb9oqsst
---
 addons/crm_profiling/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 835880c9f19..1ae45b526ca 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -41,7 +41,7 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
-    'test': ['test/process/profiling.yml',
+    'test': [#'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
              'test/test_crm_segmentation.yml',],
     'installable': True,
     'active': False,

From c650f6eac93b8986fae89145d0cd14a67867aadd Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 21 Oct 2011 10:54:56 +0530
Subject: [PATCH 067/132] [IMP, MOVE, REN] crm_profiling: 1) Updated
 crm_profiling/crm_profiling_demo.xml(Added Exclusive field value True) 2)
 Renamed crm_profiling/test/test_crm_segmentation.yml =>
 crm_profiling/test/process/segmentation.yml, 2) Improved segmentation.yml, 3)
 Updated __openerp__.py

bzr revid: ron@tinyerp.com-20111021052456-1exoucyc5134qute
---
 addons/crm_profiling/__openerp__.py           |  2 +-
 addons/crm_profiling/crm_profiling_demo.xml   |  1 +
 .../test/process/segmentation.yml             | 14 +++++++
 .../test/test_crm_segmentation.yml            | 38 -------------------
 4 files changed, 16 insertions(+), 39 deletions(-)
 create mode 100644 addons/crm_profiling/test/process/segmentation.yml
 delete mode 100644 addons/crm_profiling/test/test_crm_segmentation.yml

diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 1ae45b526ca..1c78859ecb6 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -42,7 +42,7 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
     'test': [#'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
-             'test/test_crm_segmentation.yml',],
+             'test/process/segmentation.yml',],
     'installable': True,
     'active': False,
     'certificate': '0033984979005',
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index 1789e8bace8..e541c116265 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -127,6 +127,7 @@
 		<field name="answer_yes" eval="[(6,0,[partner_quality3])]" />
 		<field name="parent_id" ref="crm_segmentation0"/>
 		<field name="categ_id" ref="base.res_partner_category_5"/>
+		<field name="exclusif">True</field>
 		<field name="profiling_active">True</field>
 	</record>
 	<record model="crm.segmentation" id="crm_segmentation4">
diff --git a/addons/crm_profiling/test/process/segmentation.yml b/addons/crm_profiling/test/process/segmentation.yml
new file mode 100644
index 00000000000..136bdf5e872
--- /dev/null
+++ b/addons/crm_profiling/test/process/segmentation.yml
@@ -0,0 +1,14 @@
+- 
+  In order to test segmentation process which create specific partner categories criteria.so i start
+  the process.
+-
+  !python {model: crm.segmentation}: |
+    self.process_start(cr, uid, [ref("crm_segmentation3")],context)
+    #Todo: Need to check after segmentation started
+-
+  I continue the segmentation process.
+-
+  !python {model: crm.segmentation}: |
+    context.update({'start': True})
+    self.process_continue(cr, uid, [ref("crm_segmentation3")], context)
+    #Todo: Need to check After segmentation process completed
\ No newline at end of file
diff --git a/addons/crm_profiling/test/test_crm_segmentation.yml b/addons/crm_profiling/test/test_crm_segmentation.yml
deleted file mode 100644
index 5563f1ce52f..00000000000
--- a/addons/crm_profiling/test/test_crm_segmentation.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-- |
-  I will test segmentation which create specific partner categories criteria.
--
-  I create a new segmentation record.
--
-  !record {model: crm.segmentation, id: crm_segmentation_id_0}:
-    categ_id: base.res_partner_category_5
-    exclusif: true
-    name: segment
-    som_interval: 0.0
-    sales_purchase_active : True
--
-  I start the process.
--
-  !python {model: crm.segmentation}: |
-    self.process_start(cr, uid, [ref("crm_segmentation_id_0")],context)
--
-  I continue the segmentation process.
--
-  !python {model: crm.segmentation}: |
-    context.update({'start': True})
-    self.process_continue(cr, uid, [ref("crm_segmentation_id_0")], context)
--
-  I create the segmentation line.
--
-  !record {model: crm.segmentation.line, id: crm_segmentation_line_id_0}:
-    expr_name: sale
-    expr_operator: '>'
-    expr_value: 1000.0
-    name: Rule1
-    operator: or
-    segmentation_id: crm_segmentation_id_0
-
--
-  I check the Segmentation line record.
--
-  !python {model: crm.segmentation.line}: |
-    self.test(cr, uid, [ref("crm_segmentation_line_id_0")],partner_id=0)

From c6a71b8dbb7ce461868c45e6ede304893f43ae41 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 21 Oct 2011 12:31:11 +0530
Subject: [PATCH 068/132] [IMP] crm: clear apis

bzr revid: hmo@tinyerp.com-20111021070111-tzgqm0jo3gor9jvm
---
 addons/crm/crm_lead.py                        | 326 +++++++++++++++++-
 addons/crm/crm_lead_view.xml                  |   2 +-
 addons/crm/res_partner.py                     |  23 ++
 addons/crm/wizard/crm_lead_to_opportunity.py  | 172 ++-------
 addons/crm/wizard/crm_lead_to_partner.py      |  94 +----
 addons/crm/wizard/crm_merge_opportunities.py  | 204 +----------
 .../crm/wizard/crm_partner_to_opportunity.py  |  66 +---
 7 files changed, 392 insertions(+), 495 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b53028c952a..a281ea66c07 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -334,7 +334,331 @@ class crm_lead(crm_case, osv.osv):
         """
         return self.set_priority(cr, uid, ids, '3')
 
-    def convert_opportunity(self, cr, uid, ids, context=None):
+    
+    def _merge_data(self, cr, uid, ids, oldest, context=None):
+        # prepare opportunity data into dictionary for merging
+        opportunities = self.browse(cr, uid, ids, context=context)
+        def _get_first_not_null(attr):
+            if hasattr(oldest, attr):
+                return getattr(oldest, attr)
+            for opportunity in opportunities:
+                if hasattr(opportunity, attr):
+                    return getattr(opportunity, attr)
+            return False
+
+        def _get_first_not_null_id(attr):
+            res = _get_first_not_null(attr)
+            return res and res.id or False
+    
+        def _concat_all(attr):
+            return ', '.join([getattr(opportunity, attr) for opportunity in opportunities if hasattr(opportunity, attr)])
+
+        data = {
+            'partner_id': _get_first_not_null_id('partner_id'),  # !!
+            'title': _get_first_not_null_id('title'),
+            'name' : _get_first_not_null('name'),  #not lost
+            'categ_id' : _get_first_not_null_id('categ_id'), # !!
+            'channel_id' : _get_first_not_null_id('channel_id'), # !!
+            'city' : _get_first_not_null('city'),  # !!
+            'company_id' : _get_first_not_null_id('company_id'), #!!
+            'contact_name' : _get_first_not_null('contact_name'), #not lost
+            'country_id' : _get_first_not_null_id('country_id'), #!!
+            'partner_address_id' : _get_first_not_null_id('partner_address_id'), #!!
+            'type_id' : _get_first_not_null_id('type_id'), #!!
+            'user_id' : _get_first_not_null_id('user_id'), #!!
+            'section_id' : _get_first_not_null_id('section_id'), #!!
+            'state_id' : _get_first_not_null_id('state_id'),
+            'description' : _concat_all('description'),  #not lost
+            'email' : _get_first_not_null('email'), # !!
+            'fax' : _get_first_not_null('fax'),
+            'mobile' : _get_first_not_null('mobile'),
+            'partner_name' : _get_first_not_null('partner_name'),
+            'phone' : _get_first_not_null('phone'),
+            'probability' : _get_first_not_null('probability'),
+            'planned_revenue' : _get_first_not_null('planned_revenue'),
+            'street' : _get_first_not_null('street'),
+            'street2' : _get_first_not_null('street2'),
+            'zip' : _get_first_not_null('zip'),
+            'state' : 'open',
+            'create_date' : _get_first_not_null('create_date'),
+            'date_action_last': _get_first_not_null('date_action_last'),
+            'date_action_next': _get_first_not_null('date_action_next'),
+            'email_from' : _get_first_not_null('email_from'),
+            'email_cc' : _get_first_not_null('email_cc'),
+            'partner_name' : _get_first_not_null('partner_name'),
+        }
+        return data
+
+    def _merge_find_oldest(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if context.get('convert'):
+            ids = list(set(ids) - set(context.get('lead_ids', False)) )
+
+        #search opportunities order by create date
+        opportunity_ids = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
+        oldest_id = opportunity_ids[0]
+        return self.browse(cr, uid, oldest_id, context=context)
+
+    def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
+        #TOFIX: mail template should be used instead of fix body, subject text
+        details = []
+        merge_message = _('Merged opportunities')
+        subject = [merge_message]
+        for opportunity in opportunities:
+            subject.append(opportunity.name)
+            details.append(_('%s : %s\n  Partner: %s\n  Stage: %s\n  Section: %s\n   Salesman: %s\n   Category: %s\n   Channel: %s\n   Company: %s\n   Contact name: %s\n   Email: %s\n   Phone number: %s\n   Fax: %s\n   Mobile: %s\n   State: %s\n   Description: %s\n   Probability: %s\n   Planned revennue: %s\n   Country: %s\n   City: %s\n   Street: %s\n   Street 2: %s\n   Zip 2: %s')  % (merge_message, opportunity.name, opportunity.partner_id.name or '',
+                        opportunity.stage_id.name or '',
+                        opportunity.section_id.name or '',
+                        opportunity.user_id.name or '',
+                        opportunity.categ_id.name or '',
+                        opportunity.channel_id.name or '',
+                        opportunity.company_id.name or '',
+                        opportunity.contact_name or '',
+                        opportunity.email_from or '',
+                        opportunity.phone or '',
+                        opportunity.fax or '',
+                        opportunity.mobile or '',
+                        opportunity.state_id.name or '',
+                        opportunity.description or '',
+                        opportunity.probability or '',
+                        opportunity.planned_revenue or '',
+                        opportunity.country_id.name or '',
+                        opportunity.city or '',
+                        opportunity.street or '',
+                        opportunity.street2 or '',
+                        opportunity.zip or '',
+                        ))
+        subject = subject[0] + ", ".join(subject[1:])
+        details = "\n\n".join(details)
+        return self.message_append(cr, uid, [opportunity_id], subject, body_text=details, context=context)
+        
+    def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
+        message = self.pool.get('mail.message')
+        for opportunity in opportunities:
+            for history in opportunity.message_ids:
+                message.write(cr, uid, history.id, {
+                        'res_id': opportunity_id, 
+                        'subject' : _("From %s : %s") % (opportunity.name, history.subject) 
+                }, context=context)
+
+        return True
+
+    def _merge_opportunity_attachments(self, cr, uid, opportunity_id, opportunities, context=None):
+        attachment = self.pool.get('ir.attachment')
+
+        # return attachments of opportunity
+        def _get_attachments(opportunity_id):
+            attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', opportunity_id)], context=context)
+            return attachment.browse(cr, uid, attachment_ids, context=context)
+
+        count = 1
+        first_attachments = _get_attachments(opportunity_id)
+        for opportunity in opportunities:
+            attachments = _get_attachments(opportunity.id)
+            for first in first_attachments:
+                for attachment in attachments:
+                    if attachment.name == first.name:
+                        values = dict(
+                            name = "%s (%s)" % (attachment.name, count,),
+                            res_id = opportunity_id,
+                        )
+                        attachment.write(values)
+                        count+=1
+                    
+        return True    
+
+    def merge_opportunity(self, cr, uid, ids, context=None):
+        """
+        To merge opportunities
+            :param ids: list of opportunities ids to merge
+        """
+        if context is None: context = {}
+        
+        #TOCHECK: where pass lead_ids in context?
+        lead_ids = context and context.get('lead_ids', []) or []
+
+        if len(ids) <= 1:
+            raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
+
+        opportunities = self.browse(cr, uid, lead_ids, context=context)
+        opportunities_list = list(set(ids) - set(opportunities))
+        oldest = self._find_oldest_opportunity(cr, uid, ids, context=context)
+        if opportunities :
+            first_opportunity = opportunities[0]
+            tail_opportunities = opportunities_list
+        else:
+            first_opportunity = opportunities_list[0]
+            tail_opportunities = opportunities_list[1:]
+
+        data = self._merge_data(cr, uid, ids, oldest, context=context)
+
+        # merge data into first opportunity
+        self.write(cr, uid, [first_opportunity.id], data, context=context)
+
+        #copy message and attachements into the first opportunity
+        self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
+        self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)        
+        
+        #Notification about loss of information
+        self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
+        #delete tail opportunities
+        self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
+
+        return first_opportunity.id
+
+    def _convert_opportunity_data(self, lead):
+        crm_stage = self.pool.get('crm.case.stage')
+        if lead.section_id:
+            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
+        else:
+            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
+
+        return {
+                'planned_revenue': lead.planned_revenue,
+                'probability': lead.probability,
+                'name': lead.name,
+                'partner_id': customer.id,
+                'user_id': (lead.user_id and lead.user_id.id),
+                'type': 'opportunity',
+                'stage_id': stage_ids and stage_ids[0] or False,
+                'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'partner_address_id': len(customer.address_id) and customer.address_id[0] or False
+        }
+    def _convert_opportunity_notification(self, cr, uid, lead, context=context):
+        success_message = _("Lead '%s' has been converted to an opportunity.") % lead.name
+        self.message_append(cr, uid, [lead.id], success_message, body_text=success_message, context=context)
+        self.log(cr, uid, [lead.id], success_message)
+        self._send_mail_to_salesman(cr, uid, lead, context=context)
+        return True
+
+    def convert_opportunity(self, cr, uid, ids, partner_id, mass_convert=False, merge=False, context=None):
+        partner = self.pool.get('res.partner')
+        mail_message = self.pool.get('mail.message')
+        customer = partner.browse(cr, uid, partner_id, context=context)
+        
+        for lead in self.browse(cr, uid, ids, context=context):
+            vals = self._convert_opportunity_data(lead)
+            self.write(cr, uid, [lead.id], vals, context=context)
+            self._convert_opportunity_notification(cr, uid, lead, context=context)
+            #TOCHECK: why need to change partner details in all messages of lead ?
+            if lead.partner_id:
+                msg_ids = [ x.id for x in lead.message_ids]
+                mail_message.write(cr, uid, msg_ids, {
+                        'partner_id': lead.partner_id.id
+                    }, context=context)
+         return True
+
+    def _lead_create_partner(self, cr, uid, lead, context=None):
+        partner = self.pool.get('res.partner')
+        partner_id = partner.create(cr, uid, {
+                    'name': lead.partner_name or lead.contact_name or lead.name,
+                    'user_id': lead.user_id.id,
+                    'comment': lead.description,
+                    'address': []
+        })
+        return partner_id
+
+    def _lead_assign_partner(self, cr, uid, ids, partner_id, context=None):
+        return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
+
+    def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
+        address = self.pool.get('res.partner.address')
+        return address.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': lead.contact_name,
+                    'phone': lead.phone,
+                    'mobile': lead.mobile,
+                    'email': lead.email_from,
+                    'fax': lead.fax,
+                    'title': lead.title and lead.title.id or False,
+                    'function': lead.function,
+                    'street': lead.street,
+                    'street2': lead.street2,
+                    'zip': lead.zip,
+                    'city': lead.city,
+                    'country_id': lead.country_id and lead.country_id.id or False,
+                    'state_id': lead.state_id and lead.state_id.id or False,
+                })
+
+    def convert_partner(self, cr, uid, ids, action='new', partner_id=False, context=None):
+        """
+        This function convert partner based on action.
+        if action is 'new', create new partner with contact and assign lead to new partner_id.
+        otherwise assign lead to specified partner_id
+        """
+        if context is None:
+            context = {}
+        partner_ids = []
+        for lead in self.browse(cr, uid, ids, context=context):
+            if action == 'create':
+               partner_id = self._lead_create_partner(cr, uid, lead, context=context)
+            self._lead_assign_partner(cr, uid, [lead.id], partner_id, context=context)
+            partner_ids.append(partner_id)
+        return partner_ids
+
+    def _send_mail_to_salesman(self, cr, uid, lead, context=None):
+        """
+        Send mail to salesman with updated Lead details.
+        @ lead: browse record of 'crm.lead' object.
+        """
+        #TOFIX: mail template should be used here instead of fix subject, body text. 
+        message = self.pool.get('mail.message')
+        email_to = lead.user_id and lead.user_id.user_email
+        if not email_to:
+            return False
+        
+        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
+        partner = lead.partner_id and lead.partner_id.name or lead.partner_name
+        subject = "lead %s converted into opportunity" % lead.name
+        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
+        return message.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
+
+
+    def allocate_salesman(self, cr, uid, ids, user_ids, team_id=False, context=None):
+        index = 0
+        for lead_id in ids:
+            value = {}
+            if team_id:
+                value['section_id'] = team_id
+            if index < len(user_ids):
+                value['user_id'] = user_ids[index]
+                index += 1
+            if value:
+                self.write(cr, uid, [lead_id], value, context=context)
+        return True
+
+    def redirect_opportunity_view(self, cr, uid, opportunity_id, context=None):
+        models_data = self.pool.get('ir.model.data')
+
+        # Get Opportunity views
+        opportunity_view_form = models_data._get_id(
+            cr, uid, 'crm', 'crm_case_form_view_oppor')
+        opportunity_view_tree = models_data._get_id(
+            cr, uid, 'crm', 'crm_case_tree_view_oppor')
+        if opportunity_view_form:
+            opportunity_view_form = models_data.browse(
+                cr, uid, opportunity_view_form, context=context).res_id
+        if opportunity_view_tree:
+            opportunity_view_tree = models_data.browse(
+                cr, uid, opportunity_view_tree, context=context).res_id
+
+        return {
+                'name': _('Opportunity'),
+                'view_type': 'form',
+                'view_mode': 'tree, form',
+                'res_model': 'crm.lead',
+                'domain': [('type', '=', 'opportunity')],
+                'res_id': int(opportunity_id),
+                'view_id': False,
+                'views': [(opportunity_view_form, 'form'),
+                          (opportunity_view_tree, 'tree'),
+                          (False, 'calendar'), (False, 'graph')],
+                'type': 'ir.actions.act_window',
+        }
+
+
+    def button_convert_opportunity(self, cr, uid, ids, context=None):
         """ Precomputation for converting lead to opportunity
         """
         if context is None:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 42587eea2b0..2b0b862783c 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -59,7 +59,7 @@
                         widget="selection"
                         domain="[('object_id.model','=','crm.lead')]"/>
                     <button
-                         name="convert_opportunity"
+                         name="button_convert_opportunity"
                          string="Convert to Opportunity"
                          help="Convert to Opportunity" icon="gtk-go-forward"
                          type="object"/>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index cbb05ee3e74..f5c841111fe 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -33,6 +33,29 @@ class res_partner(osv.osv):
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
     }
+
+    def make_opportunity(self, cr, uid, ids, opportunity, planned_revenue=0.0, probability=0.0, partner_id=None. context=None):
+        categ = self.pool.get('crm.case.categ')
+        address = self.address_get(cr, uid, ids)
+        categ_ids = categ.search(cr, uid, [('object_id.model','=','crm.lead')])
+        lead = self.pool.get('crm.lead')
+        opportunity_ids = []    
+        for partner in self.browse(cr, uid, ids, context=context):
+            address = self.address_get(cr, uid, partner.id)
+            if not partner_id:
+                partner_id = partner.id
+            opportunity_id = lead.create(cr, uid, {
+                'name' : opportunity,
+                'planned_revenue' : planned_revenue,
+                'probability' : probability,
+                'partner_id' : partner_id,
+                'partner_address_id' : address['default'],
+                'categ_id' : categ_ids and categ_ids[0] or '',
+                'state' :'draft',
+                'type': 'opportunity'
+            })
+            opportunity_id.add(opportunity_id)
+        return opportunity_ids
 res_partner()
 
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 87ab9229d26..98d061f8520 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -93,65 +93,16 @@ class crm_lead2opportunity_partner(osv.osv_memory):
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
         """
         if context is None:
             context = {}
         lead_obj = self.pool.get('crm.lead')
-
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
         return False
 
-    def _convert(self, cr, uid, ids, lead, partner_id, stage_ids, context=None):
-        leads = self.pool.get('crm.lead')
-        address_id = False
-        if partner_id:
-            address_id = self.pool.get('res.partner.address').search(cr, uid,
-                                                                 [('partner_id', '=', partner_id)],
-                                                                 order='create_date desc',
-                                                                 limit=1)
-        vals = {
-            'planned_revenue': lead.planned_revenue,
-            'probability': lead.probability,
-            'name': lead.name,
-            'partner_id': partner_id,
-            'user_id': (lead.user_id and lead.user_id.id),
-            'type': 'opportunity',
-            'stage_id': stage_ids and stage_ids[0] or False,
-            'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
-        }
-        if partner_id and address_id:
-            vals['partner_address_id'] = address_id[0]
-        else:
-            vals['partner_address_id'] = False
-
-        lead.write(vals, context=context)
-        text = _('Converted to opportunity')
-        leads.message_append(cr, uid, [lead], text, body_text=text, context=context)
-        if lead.partner_id:
-            msg_ids = [ x.id for x in lead.message_ids]
-            self.pool.get('mail.message').write(cr, uid, msg_ids, {
-                        'partner_id': lead.partner_id.id
-                    }, context=context)
-            leads.log(cr, uid, lead.id, _("Lead '%s' has been converted to an opportunity.") % lead.name)
-
-    def send_mail_to_salesman(self, cr, uid, lead):
-        email_to = lead.user_id and lead.user_id.user_email
-        if not email_to:
-            return False
-        message_pool = self.pool.get('mail.message')
-        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.user_email or email_to
-        partner = lead.partner_id and lead.partner_id.name or lead.partner_name
-        subject = "lead %s converted into opportunity" % lead.name
-        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
-        return message_pool.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
-
+    
     def action_apply(self, cr, uid, ids, context=None):
         """
         This converts lead to opportunity and opens Opportunity view
@@ -161,71 +112,20 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         """
         if not context:
             context = {}
-
-        record_id = context and context.get('active_ids') or False
         if not record_id:
             return {'type': 'ir.actions.act_window_close'}
 
-        leads = self.pool.get('crm.lead')
-        models_data = self.pool.get('ir.model.data')
+        partner_ids = self._create_partner(cr, uid, ids, context=context)
+        partner_id = partner_ids and partner_ids[0] or False
+        leads.convert_opportunity(cr, uid, lead_ids, partner_id, context=context) 
+        #If we convert in mass, don't merge if there is no other opportunity but no warning
+        if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
+            merge_obj = self.pool.get('crm.merge.opportunity')
+            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
+            context.update({'lead_ids' : record_id, "convert" : True})
+            return merge_obj.merge(cr, uid, data.opportunity_ids, context=context)
 
-        # Get Opportunity views
-        result = models_data._get_id(
-            cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        opportunity_view_search = models_data.browse(
-            cr, uid, result, context=context).res_id
-        opportunity_view_form = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_form_view_oppor')
-        opportunity_view_tree = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if opportunity_view_form:
-            opportunity_view_form = models_data.browse(
-                cr, uid, opportunity_view_form, context=context).res_id
-        if opportunity_view_tree:
-            opportunity_view_tree = models_data.browse(
-                cr, uid, opportunity_view_tree, context=context).res_id
-
-        for lead in leads.browse(cr, uid, record_id, context=context):
-            if lead.section_id:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
-            else:
-                stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('sequence','>=',1)])
-
-            data = self.browse(cr, uid, ids[0], context=context)
-
-
-            if data.action == 'create':
-                partner_ids = []
-                partner_ids = self._create_partner(cr, uid, ids, context=context)
-                partner_id = partner_ids and partner_ids[0]
-            elif data.action == 'exist':
-                partner_id = data.partner_id and data.partner_id.id
-            else:
-                partner_id = False
-
-            self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
-            self.send_mail_to_salesman(cr, uid, lead)
-            #If we convert in mass, don't merge if there is no other opportunity but no warning
-            if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
-                merge_obj = self.pool.get('crm.merge.opportunity')
-                self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
-                context.update({'lead_ids' : record_id, "convert" : True})
-                return merge_obj.merge(cr, uid, data.opportunity_ids, context=context)
-
-        return {
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.lead',
-            'domain': [('type', '=', 'opportunity')],
-            'res_id': int(lead.id),
-            'view_id': False,
-            'views': [(opportunity_view_form, 'form'),
-                      (opportunity_view_tree, 'tree'),
-                      (False, 'calendar'), (False, 'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': opportunity_view_search
-        }
+        return leads.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
 crm_lead2opportunity_partner()
 
@@ -242,53 +142,21 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
     }
 
     def mass_convert(self, cr, uid, ids, context=None):
-        lead_obj = self.pool.get('crm.lead')
+        lead = self.pool.get('crm.lead')
         if not context:
             context = {}
 
         active_ids = context.get('active_ids')
         data = self.browse(cr, uid, ids, context=context)[0]
 
-        salesteam = data.section_id and data.section_id.id
+        salesteam_id = data.section_id and data.section_id.id or False
+        salesmans = []
         if data.user_ids:
-            salesmans = map(lambda x : x.id, data.user_ids)
-            index = 0
-        else:
-            salesmans = False
-
-        for lead_id in active_ids:
-            value = {}
-            if salesteam:
-                value['section_id'] = salesteam
-            if salesmans:
-                value['user_id'] = salesmans[index]
-                index += 1
-                index = index < len(salesmans) and index or 0
-            if value:
-                lead_obj.write(cr, uid, [lead_id], value, context=context)
-
-            context['active_ids'] = [lead_id]
-            value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
-            value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
-            self.write(cr, uid, ids, value, context=context)
-
-            self.action_apply(cr, uid, ids, context=context)
-
-
-
-        models_data = self.pool.get('ir.model.data')
-        result = models_data._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-        opportunity_view_search = models_data.browse(cr, uid, result, context=context).res_id
-
-        return {
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'crm.lead',
-            'domain': [('type', '=', 'opportunity'), ('id', 'in', active_ids)],
-            'type': 'ir.actions.act_window',
-            'search_view_id': opportunity_view_search,
-        }
-
+            salesmans = [x.id for x in data.user_ids]
+        lead.allocate_salesman(cr, uid, active_ids, salesman, salesteam_id, context=context)
+        value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
+        value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
+        self.write(cr, uid, ids, value, context=context)
+        return self.action_apply(cr, uid, ids, context=context)
 crm_lead2opportunity_mass_convert()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 88ccacffef5..8cc6d3e58cf 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -25,7 +25,6 @@ import re
 
 class crm_lead2partner(osv.osv_memory):
     """ Converts lead to partner """
-
     _name = 'crm.lead2partner'
     _description = 'Lead to Partner'
 
@@ -35,18 +34,10 @@ class crm_lead2partner(osv.osv_memory):
                                     'Action', required=True),
         'partner_id': fields.many2one('res.partner', 'Partner'),
     }
-
     def view_init(self, cr, uid, fields, context=None):
         """
         This function checks for precondition before wizard executes
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
         """
-
         lead_obj = self.pool.get('crm.lead')
         rec_ids = context and context.get('active_ids', [])
         for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
@@ -57,15 +48,7 @@ class crm_lead2partner(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : default values of fields.
         """
-
         lead_obj = self.pool.get('crm.lead')
         partner_obj = self.pool.get('res.partner')
         partner_id = False
@@ -90,8 +73,6 @@ class crm_lead2partner(osv.osv_memory):
                 partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
                 
             partner_id = partner_ids and partner_ids[0] or False
-            
-            
 
             if 'partner_id' in fields:
                 res.update({'partner_id': partner_id})
@@ -105,17 +86,7 @@ class crm_lead2partner(osv.osv_memory):
     def open_create_partner(self, cr, uid, ids, context=None):
         """
         This function Opens form of create partner.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Lead to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for next form.
         """
-        if context is None:
-            context = {}
-
         view_obj = self.pool.get('ir.ui.view')
         view_id = view_obj.search(cr, uid, [('model', '=', 'crm.lead2partner'), \
                                      ('name', '=', 'crm.lead2partner.view')])
@@ -129,80 +100,23 @@ class crm_lead2partner(osv.osv_memory):
             'target': 'new',
             }
 
-
     def _create_partner(self, cr, uid, ids, context=None):
         """
         This function Creates partner based on action.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Lead to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary {}.
         """
         if context is None:
             context = {}
-
-        lead_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        partner_ids = []
-        partner_id = False
-        rec_ids = context and context.get('active_ids', [])
-
+        lead = self.pool.get('crm.lead')
+        lead_ids = context and context.get('active_ids') or []
         for data in self.browse(cr, uid, ids, context=context):
-            for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
-                if data.action == 'create':
-                    partner_id = partner_obj.create(cr, uid, {
-                        'name': lead.partner_name or lead.contact_name or lead.name,
-                        'user_id': lead.user_id.id,
-                        'comment': lead.description,
-                        'address': []
-                    })
-                    contact_obj.create(cr, uid, {
-                        'partner_id': partner_id,
-                        'name': lead.contact_name,
-                        'phone': lead.phone,
-                        'mobile': lead.mobile,
-                        'email': lead.email_from,
-                        'fax': lead.fax,
-                        'title': lead.title and lead.title.id or False,
-                        'function': lead.function,
-                        'street': lead.street,
-                        'street2': lead.street2,
-                        'zip': lead.zip,
-                        'city': lead.city,
-                        'country_id': lead.country_id and lead.country_id.id or False,
-                        'state_id': lead.state_id and lead.state_id.id or False,
-                    })
-
-                else:
-                    if data.partner_id:
-                        partner_id = data.partner_id.id
-                self.assign_partner(cr, uid, lead.id, partner_id)
-                partner_ids.append(partner_id)
+            partner_id = data.partner_id and data.partner_id.id or False
+            partner_ids += lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
         return partner_ids
 
-
-    def assign_partner(self, cr, uid, lead_id, partner_id):
-        self.pool.get("crm.lead").write(cr, uid, [lead_id], {'partner_id' : partner_id})
-
-
     def make_partner(self, cr, uid, ids, context=None):
         """
         This function Makes partner based on action.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Lead to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Partner form.
         """
-        if context is None:
-            context = {}
-
         partner_ids = self._create_partner(cr, uid, ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index f092d6ad0b6..381bb9871ea 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -26,195 +26,16 @@ class crm_merge_opportunity(osv.osv_memory):
     _name = 'crm.merge.opportunity'
     _description = 'Merge two Opportunities'
 
-    def _get_first_not_null_id(self, attr, ops, oldest):
-        if hasattr(oldest, attr) and getattr(oldest, attr):
-            return getattr(oldest, attr).id
-        
-        for op in ops:
-            if hasattr(op, attr) and getattr(op, attr):
-                return getattr(op, attr).id
-        return False
-
-    def _get_first_not_null(self, attr, ops, oldest):
-        if hasattr(oldest, attr) and getattr(oldest, attr):
-            return getattr(oldest, attr)
-        
-        for op in ops:
-            if hasattr(op, attr) and getattr(op, attr):
-                return getattr(op, attr)
-        return False
-
-    def _concat_all(self, attr, ops):
-        return ', '.join([getattr(op, attr) for op in ops if hasattr(op, attr) and getattr(op, attr)])
-
-
-    def get_attachments(self, cr, uid, id, context=None):
-        proxy = self.pool.get('ir.attachment')
-        ids = proxy.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', id)], context=context)
-        return proxy.browse(cr, uid, ids, context=context)
-
-    def find_oldest(self, cr, uid, op_ids, context=None):
-        if not context:
-            context = {}
-        ids = [op_id.id for op_id in op_ids]
-        if context.get('convert'):
-            ids = list(set(ids) - set(context.get('lead_ids', False)) )
-        lead_obj = self.pool.get('crm.lead')
-        op_id = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
-        if not op_id:
-            return False
-        opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
-        return opps[0]
-
-    def _update_data(self, op_ids, oldest_opp):
-        data = {
-                'partner_id': self._get_first_not_null_id('partner_id', op_ids, oldest_opp),  # !!
-                'title': self._get_first_not_null_id('title', op_ids, oldest_opp),
-                'name' : self._get_first_not_null('name', op_ids, oldest_opp),  #not lost
-                'categ_id' : self._get_first_not_null_id('categ_id', op_ids, oldest_opp), # !!
-                'channel_id' : self._get_first_not_null_id('channel_id', op_ids, oldest_opp), # !!
-                'city' : self._get_first_not_null('city', op_ids, oldest_opp),  # !!
-                'company_id' : self._get_first_not_null_id('company_id', op_ids, oldest_opp), #!!
-                'contact_name' : self._get_first_not_null('contact_name', op_ids, oldest_opp), #not lost
-                'country_id' : self._get_first_not_null_id('country_id', op_ids, oldest_opp), #!!
-                'partner_address_id' : self._get_first_not_null_id('partner_address_id', op_ids, oldest_opp), #!!
-                'type_id' : self._get_first_not_null_id('type_id', op_ids, oldest_opp), #!!
-                'user_id' : self._get_first_not_null_id('user_id', op_ids, oldest_opp), #!!
-                'section_id' : self._get_first_not_null_id('section_id', op_ids, oldest_opp), #!!
-                'state_id' : self._get_first_not_null_id('state_id', op_ids, oldest_opp),
-                'description' : self._concat_all('description', op_ids),  #not lost
-                'email' : self._get_first_not_null('email', op_ids, oldest_opp), # !!
-                'fax' : self._get_first_not_null('fax', op_ids, oldest_opp),
-                'mobile' : self._get_first_not_null('mobile', op_ids, oldest_opp),
-                'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
-                'phone' : self._get_first_not_null('phone', op_ids, oldest_opp),
-                'probability' : self._get_first_not_null('probability', op_ids, oldest_opp),
-                'planned_revenue' : self._get_first_not_null('planned_revenue', op_ids, oldest_opp),
-                'street' : self._get_first_not_null('street', op_ids, oldest_opp),
-                'street2' : self._get_first_not_null('street2', op_ids, oldest_opp),
-                'zip' : self._get_first_not_null('zip', op_ids, oldest_opp),
-                'state' : 'open',
-                'create_date' : self._get_first_not_null('create_date', op_ids, oldest_opp),
-                'date_action_last': self._get_first_not_null('date_action_last', op_ids, oldest_opp),
-                'date_action_next': self._get_first_not_null('date_action_next', op_ids, oldest_opp),
-                'email_from' : self._get_first_not_null('email_from', op_ids, oldest_opp),
-                'email_cc' : self._get_first_not_null('email_cc', op_ids, oldest_opp),
-                'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
-        }
-        return data
-
-    def merge(self, cr, uid, op_ids, context=None):
-        """
-            :param opp_ids: list of opportunities ids to merge
-        """
-        opp_obj = self.pool.get('crm.lead')
-        message_obj = self.pool.get('mail.message')
-
-        lead_ids = context and context.get('lead_ids', []) or []
-
-        if len(op_ids) <= 1:
-            raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
-
-        opportunities = opp_obj.browse(cr, uid, lead_ids, context=context)
-        opportunities_list = list(set(op_ids) - set(opportunities))
-        oldest_opp = self.find_oldest(cr, uid, op_ids, context=context)
-        if opportunities :
-            first_opportunity = opportunities[0]
-            tail_opportunities = opportunities_list
-        else:
-            first_opportunity = opportunities_list[0]
-            tail_opportunities = opportunities_list[1:]
-        data = self._update_data(op_ids, oldest_opp)
-
-        #copy message into the first opportunity + merge attachement
-        count = 1
-        first_attachments = self.get_attachments(cr, uid, first_opportunity, context=context)
-        for opp in tail_opportunities:
-            attachments = self.get_attachments(cr, uid, opp, context=context)
-            for first in first_attachments:
-                for attachment in attachments:
-                    if attachment.name == first.name:
-                        values = dict(
-                            name = "%s (%s)" % (attachment.name, count,),
-                            res_id = first_opportunity.id,
-                        )
-                        attachment.write(values)
-                        count+=1
-                    
-            for history in opp.message_ids:
-                message_obj.write(cr, uid, history.id, {'res_id': first_opportunity.id, 'subject' : _("From %s : %s") % (opp.name, history.subject) }, context=context)
-
-        #Notification about loss of information
-        details = []
-        subject = ['Merged opportunities :']
-        for opp in op_ids:
-            subject.append(opp.name)
-            details.append(_('Merged Opportunity: %s\n  Partner: %s\n  Stage: %s\n  Section: %s\n   Salesman: %s\n   Category: %s\n   Channel: %s\n   Company: %s\n   Contact name: %s\n   Email: %s\n   Phone number: %s\n   Fax: %s\n   Mobile: %s\n   State: %s\n   Description: %s\n   Probability: %s\n   Planned revennue: %s\n   Country: %s\n   City: %s\n   Street: %s\n   Street 2: %s\n   Zip 2: %s')  % ( opp.name, opp.partner_id.name or '',
-                        opp.stage_id.name or '',
-                        opp.section_id.name or '',
-                        opp.user_id.name or '',
-                        opp.categ_id.name or '',
-                        opp.channel_id.name or '',
-                        opp.company_id.name or '',
-                        opp.contact_name or '',
-                        opp.email_from or '',
-                        opp.phone or '',
-                        opp.fax or '',
-                        opp.mobile or '',
-                        opp.state_id.name or '',
-                        opp.description or '',
-                        opp.probability or '',
-                        opp.planned_revenue or '',
-                        opp.country_id.name or '',
-                        opp.city or '',
-                        opp.street or '',
-                        opp.street2 or '',
-                        opp.zip or '',
-                        ))
-        subject = subject[0] + ", ".join(subject[1:])
-        details = "\n\n".join(details)
-
-        opp_obj.message_append(cr, uid, [first_opportunity], subject, body_text=details)
-        #data.update({'message_ids' : [(6, 0 ,self._concat_o2m('message_ids', op_ids))]})
-        opp_obj.write(cr, uid, [first_opportunity.id], data, context=context)
-        unlink_ids = map(lambda x: x.id, tail_opportunities)
-        opp_obj.unlink(cr, uid, unlink_ids, context=context)
-
-        models_data = self.pool.get('ir.model.data')
-
-        # Get Opportunity views
-        opportunity_view_form = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_form_view_oppor')
-        opportunity_view_tree = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if opportunity_view_form:
-            opportunity_view_form = models_data.browse(
-                cr, uid, opportunity_view_form, context=context).res_id
-        if opportunity_view_tree:
-            opportunity_view_tree = models_data.browse(
-                cr, uid, opportunity_view_tree, context=context).res_id
-
-        return {
-                'name': _('Opportunity'),
-                'view_type': 'form',
-                'view_mode': 'tree, form',
-                'res_model': 'crm.lead',
-                'domain': [('type', '=', 'opportunity')],
-                'res_id': int(first_opportunity.id),
-                'view_id': False,
-                'views': [(opportunity_view_form, 'form'),
-                          (opportunity_view_tree, 'tree'),
-                          (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
-        }
-
-
     def action_merge(self, cr, uid, ids, context=None):
-        obj_opportunity = self.browse(cr, uid, ids[0], context=context)
-        op_ids = obj_opportunity.opportunity_ids
-        self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [op_ids[0].id])]}, context=context)
-        context['lead_ids'] = [op_ids[0].id]
-        return self.merge(cr, uid, op_ids, context)
+        lead = self.pool.get('crm.lead')
+        record = self.browse(cr, uid, ids[0], context=context)
+        opportunities = record.opportunity_ids
+        #TOFIX: why need to check lead_ids here
+        lead_ids = [opportunities[0].id]
+        self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context)
+        context['lead_ids'] = lead_ids
+        merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context)
+        return lead.redirect_opportunity_view(cr, uid, merge_id, context=context)
 
     _columns = {
         'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
@@ -223,13 +44,6 @@ class crm_merge_opportunity(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current users ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : default values of fields.
         """
         record_ids = context and context.get('active_ids', False) or False
         res = super(crm_merge_opportunity, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 4d24bd5b78f..351fcef3d4f 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -38,13 +38,6 @@ class crm_partner2opportunity(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : default values of fields.
         """
         partner_obj = self.pool.get('res.partner')
         data = context and context.get('active_ids', []) or []
@@ -58,56 +51,17 @@ class crm_partner2opportunity(osv.osv_memory):
         return res
 
     def make_opportunity(self, cr, uid, ids, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        """
-
-        data = context and context.get('active_ids', []) or []
-        make_opportunity = self.pool.get('crm.partner2opportunity')
-        data_obj = self.pool.get('ir.model.data')
-        part_obj = self.pool.get('res.partner')
-        categ_obj = self.pool.get('crm.case.categ')
-        case_obj = self.pool.get('crm.lead')
-        
-        for make_opportunity_obj in make_opportunity.browse(cr, uid, ids, context=context):
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            address = part_obj.address_get(cr, uid, data)
-            categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
-
-            opp_id = case_obj.create(cr, uid, {
-                'name' : make_opportunity_obj.name,
-                'planned_revenue' : make_opportunity_obj.planned_revenue,
-                'probability' : make_opportunity_obj.probability,
-                'partner_id' : make_opportunity_obj.partner_id.id,
-                'partner_address_id' : address['default'],
-                'categ_id' : categ_ids and categ_ids[0] or '',
-                'state' :'draft',
-                'type': 'opportunity'
+        partner_ids = context and context.get('active_ids', []) or []
+        partner = self.pool.get('res.partner')
+        lead = self.pool.get('crm.lead')
+        for data in self.browse(cr, uid, ids, context=context):
+            opportunity_ids = partner.make_opportunity(cr, uid, partner_ids,
+                data.name,
+                data.planned_revenue,
+                data.probability,
             })
-            value = {
-                'name' : _('Opportunity'),
-                'view_type' : 'form',
-                'view_mode' : 'form,tree',
-                'res_model' : 'crm.lead',
-                'res_id' : opp_id,
-                'view_id' : False,
-                'views' : [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
-                'type' : 'ir.actions.act_window',
-                'search_view_id' : res['res_id']
-            }
-            return value
+            opportunity_id = len(opportunity_ids) and opportunity_ids[0] or False
+            return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context)
 
 crm_partner2opportunity()
 

From a3db3dcd09e9776872a93f9f04a8d5f8e41a56e9 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 21 Oct 2011 15:34:43 +0530
Subject: [PATCH 069/132] [IMP] Improved mass_leads2opportunity.yml,
 merge_opportunity.yml, lead2opportunity2win.yml, partner2opportunity.yml

bzr revid: ron@tinyerp.com-20111021100443-my6035x3fem8gc34
---
 addons/crm/__openerp__.py                     |  2 +-
 addons/crm/res_partner.py                     |  2 +-
 .../crm/test/process/lead2opportunity2win.yml | 42 +++++++++++
 .../process/lead2opportunity_win_lost.yml     | 70 -------------------
 .../test/process/mass_leads2opportunity.yml   | 14 +---
 addons/crm/test/process/merge_opportunity.yml | 19 ++---
 .../crm/test/process/partner2opportunity.yml  | 15 +---
 7 files changed, 55 insertions(+), 109 deletions(-)
 create mode 100644 addons/crm/test/process/lead2opportunity2win.yml
 delete mode 100644 addons/crm/test/process/lead2opportunity_win_lost.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index fb2aa8679d4..04c57637dbe 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -120,7 +120,7 @@ Creates a dashboard for CRM that includes:
     ],
     'test': [
             'test/process/draft2open_lead.yml',
-            'test/process/lead2opportunity_win_lost.yml',
+            'test/process/lead2opportunity2win.yml',
             'test/process/merge_opportunity.yml',
             'test/process/partner2opportunity.yml',
             'test/process/cancel_lead.yml',
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index f5c841111fe..0fc6f5dff89 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -34,7 +34,7 @@ class res_partner(osv.osv):
             'Phonecalls'),
     }
 
-    def make_opportunity(self, cr, uid, ids, opportunity, planned_revenue=0.0, probability=0.0, partner_id=None. context=None):
+    def make_opportunity(self, cr, uid, ids, opportunity, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
         categ = self.pool.get('crm.case.categ')
         address = self.address_get(cr, uid, ids)
         categ_ids = categ.search(cr, uid, [('object_id.model','=','crm.lead')])
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
new file mode 100644
index 00000000000..3565ea96d46
--- /dev/null
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -0,0 +1,42 @@
+-
+  Convert opportunity based on exiting partner.
+-
+  !python {model: crm.lead}: |
+    self.convert_opportunity(cr, uid ,[ref("crm_case_qrecorp0")], ref("base.res_partner_agrolait"))
+-
+  After converted in opportunity, i test that lead is converted to opportunity.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
+    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
+-
+  Finally, i won this opportunity, so i close this opportunity.
+-
+  !python {model: crm.lead}: |
+    self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
+-
+  After wininng the opportunity , I test the opportunity.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+    assert lead.state == 'done', 'Opportunity is not in done state!'
+    assert lead.stage_id.name == 'Won', ' Stage of Opportunity is not win!'
+    assert lead.probability == 100.0, 'probability revenue should not  be 100.0!'
+-
+  I add internal note to this opportunity, so i create note.
+-
+  !record {model: crm.add.note, id: crm_add_note_won_opportunity}:
+    body: 'I won this Opportunity'
+-
+  Apply this note to opportunity.
+-
+  !python {model: crm.add.note}: |
+    self.action_add(cr, uid, [ref("crm_add_note_won_opportunity")], {"active_model": "crm.lead","active_ids": [ref("crm_case_qrecorp0")]})
+-
+  I test Internal latest note added on opportunity .
+-
+-  !python {model: crm.lead}: |
+-    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
+-    assert lead.message_ids[0].subject == 'I won this Opportunity', 'Fail to Added interal note on opportunity'
diff --git a/addons/crm/test/process/lead2opportunity_win_lost.yml b/addons/crm/test/process/lead2opportunity_win_lost.yml
deleted file mode 100644
index eacb919c3eb..00000000000
--- a/addons/crm/test/process/lead2opportunity_win_lost.yml
+++ /dev/null
@@ -1,70 +0,0 @@
--
-  I test to convert lead to real business opportunity, so first i create existing partner attached with lead.
--
-  !record {model: crm.lead2opportunity.partner, id: crm_lead2opportunity_partner_create_1}:
-    action: 'exist'
-    partner_id: base.res_partner_agrolait
--
-  Create opportunity based on exiting partner.
--
-  !python {model: crm.lead2opportunity.partner}: |
-    self.action_apply(cr, uid, [ref("crm_lead2opportunity_partner_create_1")], {'active_ids': [ref("crm_case_qrecorp0")], 'active_id': ref("crm_case_qrecorp0")})
--
-  After converted in opportunity, i test to lead is converted to opportunity.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
-    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
-    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
--
-  Finally, i won this opportunity, so i close this opportunity.
--
-  !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
--
-  I check opportunity is close or not.
--
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Opportunity in done state}:
-    - state == "done"
--
-  In order to test stage of opportunity after win, i will test stage of opportunity.
--
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: stage of opportunity is win}:
-    - stage_id.name == "Won"
--
-  I add internal note to this opportunity, so i create note.
--
-  !record {model: crm.add.note, id: crm_add_note_won_opportunity}:
-    body: 'I won this Opportunity'
--
-  Apply this note to opportunity.
--
-  !python {model: crm.add.note}: |
-    self.action_add(cr, uid, [ref("crm_add_note_won_opportunity")], {"active_model": "crm.lead","active_ids": [ref("crm_case_qrecorp0")]})
-
-# TODO: cheked For ordering of history of message
-#-
-#  I test Internal latest note added on opportunity .
-#-
-#  !python {model: crm.lead}: |
-#    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
-#    assert lead.message_ids[0].subject == 'I won this Opportunity', 'Fail to Added interal note on opportunity'
--
-  After winning the opportunity, i test probability is 100.
--
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Probability is equal to 100}:
-    - probability == 100.0
--
-  Suppose i have opportinity in initial stage, i will check after loss my `opportunity` , probability of that opportunity is 0
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_case_rdroundfundingunits0")])
-    self.case_mark_lost(cr, uid, [ref("crm_case_rdroundfundingunits0")])
--
-  I check after loss the opportunity, probability set to 0.0 and lost stage set accordingly.
--
-  !python {model: crm.lead}: |
-    opportunity = self.browse(cr, uid, ref('crm_case_rdroundfundingunits0'))
-    assert opportunity.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
-    assert opportunity.probability == 0.0, 'Probability is wrong!'
diff --git a/addons/crm/test/process/mass_leads2opportunity.yml b/addons/crm/test/process/mass_leads2opportunity.yml
index 4286eac1848..21b7d0a6120 100644
--- a/addons/crm/test/process/mass_leads2opportunity.yml
+++ b/addons/crm/test/process/mass_leads2opportunity.yml
@@ -1,16 +1,8 @@
 -
-  Using mass wizard convert two lead to opportunity ,so first i create mass record for 
-  converting in opportunity.
+  Convert two Leads to two opportunity(Mass conversion).
 -
-  !record {model: crm.lead2opportunity.partner.mass, id: crm_lead2opportunity_partner_mass0}:
-    user_ids:
-      - base.user_root
-    section_id: crm.section_sales_department
--
-  Convert mass Leads to opportunity.
--
-  !python {model: crm.lead2opportunity.partner.mass}: |
-    self.mass_convert(cr, uid, [ref("crm_lead2opportunity_partner_mass0")],{'active_ids': [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], 'active_id': ref("crm_case_qrecorp0")})
+  !python {model: crm.lead}: |
+    self.convert_opportunity(cr, uid, [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], mass_convert=True)
 -
   First lead converted on opportunity.i test it.
 -
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 2028c304276..7f3cccbff0d 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -1,17 +1,8 @@
 -
-  I have two opportunity ,so i merge this two Opportunities.
--
-  !python {model: crm.merge.opportunity}: |
-    op_ids=self.pool.get('crm.lead').browse(cr, uid, [ref('crm_case_bankwealthy2'), ref('crm_case_unifliege')])
-    self.merge(cr, uid, op_ids)
-
--
-  I test which two opportunity has been merged .
+  I have two opportunity ,so i merge this two Opportunities, I test which two opportunity has been merged .
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_bankwealthy2'))
-    merge = 'Merged opportunities' in lead.message_ids[0].subject
-    assert merge,'Fail to create Merge opportunity'
-    assert lead.type == 'opportunity', 'Merged opportunity type not change!'
-    assert lead.partner_id.id == ref("base.res_partner_accent"), 'Partner missmatch!'
-    assert lead.stage_id.id == ref("stage_lead2"), 'Stage of probability is incorrect!'
+    op_list = [ref('crm_case_bankwealthy2'),ref('crm_case_unifliege')]
+    op_ids=self.pool.get('crm.lead').browse(cr,uid,op_list)
+    lead_ids = [ref('crm_case_qrecorp0')]
+    self.merge_opportunity(cr, uid, op_ids, {'lead_ids': lead_ids})
diff --git a/addons/crm/test/process/partner2opportunity.yml b/addons/crm/test/process/partner2opportunity.yml
index 542056f0f9b..b9668a1a0f9 100644
--- a/addons/crm/test/process/partner2opportunity.yml
+++ b/addons/crm/test/process/partner2opportunity.yml
@@ -1,17 +1,8 @@
-- |
-  I will create opportunity by partner.
 -
-  !record {model: crm.partner2opportunity, id: crm_partner2opportunity_id_0}:
-    name: BalmerInc S.A.
-    planned_revenue: 200.0
-    partner_id: base.res_partner_9
-    probability: 150.0
-
+  Convert partner to opportunity, i test to convert opportunity is from partner.
 -
-  Convert partner to opportunity, i will test to convert opportunity is correct.
--
-  !python {model: crm.partner2opportunity}: |
-    opportunity = self.make_opportunity(cr, uid, [ref("crm_partner2opportunity_id_0")])
+  !python {model: res.partner}: |
+    opportunity = self.make_opportunity(cr, uid, [ref("base.res_partner_9")], 'BalmerInc S.A.', 200.0, 150.0)
     opportunity_rec = self.pool.get('crm.lead').browse(cr, uid, opportunity['res_id'])
     assert opportunity_rec.type == 'opportunity', 'Lead is not converted to opportunity!'
     assert opportunity_rec.planned_revenue == 200.0, 'Planned revenue should be 200!'

From 68c6f3c3a06356b0ca0d1eeae2964ad2fd71d5eb Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 21 Oct 2011 15:39:26 +0530
Subject: [PATCH 070/132] [IMP] Improved merge_opportunity.yml

bzr revid: ron@tinyerp.com-20111021100926-bcpv41bsb1bqku6h
---
 addons/crm/test/process/merge_opportunity.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 7f3cccbff0d..2a5b269153f 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -4,5 +4,5 @@
   !python {model: crm.lead}: |
     op_list = [ref('crm_case_bankwealthy2'),ref('crm_case_unifliege')]
     op_ids=self.pool.get('crm.lead').browse(cr,uid,op_list)
-    lead_ids = [ref('crm_case_qrecorp0')]
+    lead_ids = [ref('crm_case_bankwealthy2')]
     self.merge_opportunity(cr, uid, op_ids, {'lead_ids': lead_ids})

From d5239a04f20bcde100bd6f3ddc69aab55d2a6961 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 21 Oct 2011 19:08:56 +0530
Subject: [PATCH 071/132] [IMP,ADD] Improved and add new file with
 comunication_with_customer.yml

bzr revid: ron@tinyerp.com-20111021133856-hdmkvg1j0k9q76dg
---
 .../process/communication_with_customer.yml   | 51 +++++++++++++++++++
 .../crm/test/process/lead2opportunity2win.yml | 20 +-------
 .../test/process/mass_leads2opportunity.yml   |  4 +-
 addons/crm/test/process/meeting.yml           | 12 -----
 .../crm/test/process/phone-call2meeting.yml   |  6 ---
 5 files changed, 55 insertions(+), 38 deletions(-)
 create mode 100644 addons/crm/test/process/communication_with_customer.yml
 delete mode 100644 addons/crm/test/process/meeting.yml
 delete mode 100644 addons/crm/test/process/phone-call2meeting.yml

diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
new file mode 100644
index 00000000000..e5f805a36b2
--- /dev/null
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -0,0 +1,51 @@
+-
+  Communication by mail, Customer Interest with our product and to take functional
+  training with us.
+-
+  !python {model: crm.lead}: |
+    #create message manually to create lead by(Mail) self.message_new(cr, uid, msg, context=None)
+-
+  After getting the mail, I call to customer for more communication.
+-
+  !python {model: crm.lead}: |
+    #schedule phonecall to customer
+    #search lead which came by customer and create function in crm.lead-schedule_phonecall to customer
+-
+  Communication by phonecall with customer, customer want to meet us so I arrage
+  meeting for customer.
+-
+  !python {model: crm.lead}: |
+    #schedule to arrange meeting with customer.
+    #search lead which came by customer and call to action_makeMeeting.
+-
+  Customer do initial discussion with us on meeting, so I check confirm 
+  meeting and after completed, meeting will be close. 
+-
+  !python {model: crm.meeting}: |
+    #open and close the meeting.
+    #search id from lead and open and close this meeting.
+-
+  After communicated by meeting with customer, I send mail to more discussion 
+  with Customer.
+-
+  !python {model: crm.lead}: |
+    #send mail to customer.
+-
+  Also another communication send Fax to customer and maintain communication history.
+-
+  !record {model: crm.add.note, id: crm_add_note_time_schedule}:
+    #create fax history
+    #body: 'Timining Scenario to come office'
+-
+  I give Fax to customer for our detail scenario of functional training timing 
+  schedule. 
+-
+  !python {model: crm.add.note}: |
+    #add this fax history to lead
+    #self.action_add(cr, uid, [ref("crm_add_note_time_schedule")], {"active_model": "crm.lead","active_ids": [ref("crm_case_qrecorp0")]})
+-
+  After Adding Fax scenario, I test it.
+-
+  !python {model: crm.lead}: |
+    #checked Fax history added.
+    #search lead history and compare with record
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 3565ea96d46..9662cd6998f 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -4,7 +4,7 @@
   !python {model: crm.lead}: |
     self.convert_opportunity(cr, uid ,[ref("crm_case_qrecorp0")], ref("base.res_partner_agrolait"))
 -
-  After converted in opportunity, i test that lead is converted to opportunity.
+  After converted in opportunity, I test that lead is converted to opportunity.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
@@ -12,7 +12,7 @@
     assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
 -
-  Finally, i won this opportunity, so i close this opportunity.
+  Finally, i won this opportunity, so I close this opportunity.
 -
   !python {model: crm.lead}: |
     self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
@@ -24,19 +24,3 @@
     assert lead.state == 'done', 'Opportunity is not in done state!'
     assert lead.stage_id.name == 'Won', ' Stage of Opportunity is not win!'
     assert lead.probability == 100.0, 'probability revenue should not  be 100.0!'
--
-  I add internal note to this opportunity, so i create note.
--
-  !record {model: crm.add.note, id: crm_add_note_won_opportunity}:
-    body: 'I won this Opportunity'
--
-  Apply this note to opportunity.
--
-  !python {model: crm.add.note}: |
-    self.action_add(cr, uid, [ref("crm_add_note_won_opportunity")], {"active_model": "crm.lead","active_ids": [ref("crm_case_qrecorp0")]})
--
-  I test Internal latest note added on opportunity .
--
--  !python {model: crm.lead}: |
--    lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
--    assert lead.message_ids[0].subject == 'I won this Opportunity', 'Fail to Added interal note on opportunity'
diff --git a/addons/crm/test/process/mass_leads2opportunity.yml b/addons/crm/test/process/mass_leads2opportunity.yml
index 21b7d0a6120..9258814b68b 100644
--- a/addons/crm/test/process/mass_leads2opportunity.yml
+++ b/addons/crm/test/process/mass_leads2opportunity.yml
@@ -4,7 +4,7 @@
   !python {model: crm.lead}: |
     self.convert_opportunity(cr, uid, [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], mass_convert=True)
 -
-  First lead converted on opportunity.i test it.
+  First lead converted on opportunity, I test it.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_employee0'))
@@ -14,7 +14,7 @@
     assert lead.partner_id.name == "Agrolait", 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -
-  Second lead converted on opportunity.i test it.
+  Second lead converted on opportunity, I test it.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_electonicgoodsdealer0'))
diff --git a/addons/crm/test/process/meeting.yml b/addons/crm/test/process/meeting.yml
deleted file mode 100644
index 063d7e5b6f3..00000000000
--- a/addons/crm/test/process/meeting.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- |
-  Customer want to do initial discussion with us so we will arrage meeting 
-  with them and checked also confirm meeting and after cheked it will be
-  completed. 
--
-  !python {model: crm.meeting}: |
-    self.case_open(cr, uid, [ref('crm_case_initialdiscussion0')])
-    meeting_rec = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
-    assert meeting_rec.state == 'open', "Meeting is not in confirm state"
-    self.case_close(cr, uid, [ref('crm_case_initialdiscussion0')])
-    meeting_rec_close = self.browse(cr, uid, ref("crm_case_initialdiscussion0"))
-    assert meeting_rec_close.state == 'done', "Meeting is not in done state"
diff --git a/addons/crm/test/process/phone-call2meeting.yml b/addons/crm/test/process/phone-call2meeting.yml
deleted file mode 100644
index c0579157494..00000000000
--- a/addons/crm/test/process/phone-call2meeting.yml
+++ /dev/null
@@ -1,6 +0,0 @@
--
-  I test to arrage meeting from Phonecall, so i convert and check phonecall to meeting.
--
-  !python {model: crm.phonecall}: |
-    res = self.action_make_meeting(cr, uid, [ref('crm_case_phone06')])
-    assert res, "No create Meeting from phonecall"

From 340c9c5576df2a17fd5b92b3c6409c63c4950115 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Mon, 24 Oct 2011 19:00:10 +0530
Subject: [PATCH 072/132] [IMP] crm: clean test cases, APIs of crm.lead,
 crm.phonecall

bzr revid: hmo@tinyerp.com-20111024133010-ve55lvg2cie206l9
---
 addons/crm/__openerp__.py                     |   8 +-
 addons/crm/crm_lead.py                        | 109 +++++++++---
 addons/crm/crm_phonecall.py                   | 162 +++++++++++++++---
 addons/crm/crm_phonecall_demo.xml             |   3 -
 addons/crm/res_partner.py                     |  30 +++-
 addons/crm/test/customer_request.eml          |  30 ++++
 addons/crm/test/process/cancel_lead.yml       |  57 +-----
 .../process/communication_with_customer.yml   |  83 ++++-----
 addons/crm/test/process/draft2open_lead.yml   |  10 --
 .../crm/test/process/lead2opportunity2win.yml |  35 +++-
 .../test/process/mass_leads2opportunity.yml   |  25 ---
 addons/crm/test/process/merge_opportunity.yml |  32 +++-
 .../crm/test/process/partner2opportunity.yml  |  11 --
 .../test/process/phone-call2opportunity.yml   |  23 ---
 .../process/schedule_other_phone-call.yml     |  23 ---
 addons/crm/test/ui/lead_form.yml              |  20 +--
 addons/crm/wizard/__init__.py                 |   4 +-
 addons/crm/wizard/crm_lead_to_opportunity.py  |  51 ++++--
 addons/crm/wizard/crm_lead_to_partner.py      |  79 ++++-----
 .../wizard/crm_opportunity_to_phonecall.py    | 113 ++----------
 .../crm_opportunity_to_phonecall_view.xml     |   4 +-
 .../crm/wizard/crm_partner_to_opportunity.py  |  16 +-
 .../wizard/crm_phonecall_to_opportunity.py    |  92 ++--------
 addons/crm/wizard/crm_phonecall_to_partner.py | 142 +--------------
 .../crm/wizard/crm_phonecall_to_phonecall.py  | 117 +++----------
 .../crm_phonecall_to_phonecall_view.xml       |   4 +-
 26 files changed, 535 insertions(+), 748 deletions(-)
 create mode 100644 addons/crm/test/customer_request.eml
 delete mode 100644 addons/crm/test/process/draft2open_lead.yml
 delete mode 100644 addons/crm/test/process/mass_leads2opportunity.yml
 delete mode 100644 addons/crm/test/process/partner2opportunity.yml
 delete mode 100644 addons/crm/test/process/phone-call2opportunity.yml
 delete mode 100644 addons/crm/test/process/schedule_other_phone-call.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 04c57637dbe..8e195bb5d01 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -119,17 +119,11 @@ Creates a dashboard for CRM that includes:
         'crm_phonecall_demo.xml',
     ],
     'test': [
-            'test/process/draft2open_lead.yml',
+            'test/process/communication_with_customer.yml',
             'test/process/lead2opportunity2win.yml',
             'test/process/merge_opportunity.yml',
-            'test/process/partner2opportunity.yml',
             'test/process/cancel_lead.yml',
-            'test/process/meeting.yml',
-            'test/process/mass_leads2opportunity.yml',
             'test/ui/lead_form.yml',
-            'test/process/phone-call2opportunity.yml',
-            'test/process/phone-call2meeting.yml',
-            'test/process/schedule_other_phone-call.yml'
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a281ea66c07..788903ce083 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -27,7 +27,7 @@ from tools.translate import _
 from crm import crm_case
 import binascii
 import tools
-
+from mail.mail_message import to_email
 
 CRM_LEAD_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -351,7 +351,7 @@ class crm_lead(crm_case, osv.osv):
             return res and res.id or False
     
         def _concat_all(attr):
-            return ', '.join([getattr(opportunity, attr) for opportunity in opportunities if hasattr(opportunity, attr)])
+            return ', '.join([getattr(opportunity, attr) or '' for opportunity in opportunities if hasattr(opportunity, attr)])
 
         data = {
             'partner_id': _get_first_not_null_id('partner_id'),  # !!
@@ -392,11 +392,12 @@ class crm_lead(crm_case, osv.osv):
     def _merge_find_oldest(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        #TOCHECK: where pass 'convert' in context ?
         if context.get('convert'):
             ids = list(set(ids) - set(context.get('lead_ids', False)) )
 
         #search opportunities order by create date
-        opportunity_ids = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
+        opportunity_ids = self.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
         oldest_id = opportunity_ids[0]
         return self.browse(cr, uid, oldest_id, context=context)
 
@@ -481,11 +482,12 @@ class crm_lead(crm_case, osv.osv):
         if len(ids) <= 1:
             raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
 
-        opportunities = self.browse(cr, uid, lead_ids, context=context)
-        opportunities_list = list(set(ids) - set(opportunities))
-        oldest = self._find_oldest_opportunity(cr, uid, ids, context=context)
-        if opportunities :
-            first_opportunity = opportunities[0]
+        ctx_opportunities = self.browse(cr, uid, lead_ids, context=context)
+        opportunities = self.browse(cr, uid, ids, context=context)
+        opportunities_list = list(set(opportunities) - set(ctx_opportunities))
+        oldest = self._merge_find_oldest(cr, uid, ids, context=context)
+        if ctx_opportunities :
+            first_opportunity = ctx_opportunities[0]
             tail_opportunities = opportunities_list
         else:
             first_opportunity = opportunities_list[0]
@@ -507,13 +509,16 @@ class crm_lead(crm_case, osv.osv):
 
         return first_opportunity.id
 
-    def _convert_opportunity_data(self, lead):
+    def _convert_opportunity_data(self, cr, uid, lead, customer, section_id=False, context=None):
         crm_stage = self.pool.get('crm.case.stage')
-        if lead.section_id:
-            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
+        contact_id = self.pool.get('res.partner').address_get(cr, uid, [customer.id])['default']
+        if not section_id:
+            section_id = lead.section_id and lead.section_id.id or False
+        if section_id:
+            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1), ('section_ids','=', section_id)])
         else:
-            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
-
+            stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])            
+        stage_id = stage_ids and stage_ids[0] or False
         return {
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
@@ -521,25 +526,32 @@ class crm_lead(crm_case, osv.osv):
                 'partner_id': customer.id,
                 'user_id': (lead.user_id and lead.user_id.id),
                 'type': 'opportunity',
-                'stage_id': stage_ids and stage_ids[0] or False,
+                'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'partner_address_id': len(customer.address_id) and customer.address_id[0] or False
+                'partner_address_id': contact_id
         }
-    def _convert_opportunity_notification(self, cr, uid, lead, context=context):
+    def _convert_opportunity_notification(self, cr, uid, lead, context=None):
         success_message = _("Lead '%s' has been converted to an opportunity.") % lead.name
         self.message_append(cr, uid, [lead.id], success_message, body_text=success_message, context=context)
-        self.log(cr, uid, [lead.id], success_message)
+        self.log(cr, uid, lead.id, success_message)
         self._send_mail_to_salesman(cr, uid, lead, context=context)
         return True
 
-    def convert_opportunity(self, cr, uid, ids, partner_id, mass_convert=False, merge=False, context=None):
+    def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
         partner = self.pool.get('res.partner')
         mail_message = self.pool.get('mail.message')
+        
         customer = partner.browse(cr, uid, partner_id, context=context)
         
         for lead in self.browse(cr, uid, ids, context=context):
-            vals = self._convert_opportunity_data(lead)
+            if lead.state in ('done', 'cancel'):
+                continue
+            if user_ids or section_id:
+                self.allocate_salesman(cr, uid, [lead.id], user_ids, section_id, context=context)
+            
+            vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
+            
             self._convert_opportunity_notification(cr, uid, lead, context=context)
             #TOCHECK: why need to change partner details in all messages of lead ?
             if lead.partner_id:
@@ -547,7 +559,7 @@ class crm_lead(crm_case, osv.osv):
                 mail_message.write(cr, uid, msg_ids, {
                         'partner_id': lead.partner_id.id
                     }, context=context)
-         return True
+        return True
 
     def _lead_create_partner(self, cr, uid, lead, context=None):
         partner = self.pool.get('res.partner')
@@ -560,7 +572,8 @@ class crm_lead(crm_case, osv.osv):
         return partner_id
 
     def _lead_assign_partner(self, cr, uid, ids, partner_id, context=None):
-        return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
+        contact_id = self.pool.get('res.partner').address_get(cr, uid, [partner_id])['default']
+        return self.write(cr, uid, ids, {'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
 
     def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
         address = self.pool.get('res.partner.address')
@@ -569,7 +582,7 @@ class crm_lead(crm_case, osv.osv):
                     'name': lead.contact_name,
                     'phone': lead.phone,
                     'mobile': lead.mobile,
-                    'email': lead.email_from,
+                    'email': to_email(lead.email_from)[0],
                     'fax': lead.fax,
                     'title': lead.title and lead.title.id or False,
                     'function': lead.function,
@@ -581,7 +594,7 @@ class crm_lead(crm_case, osv.osv):
                     'state_id': lead.state_id and lead.state_id.id or False,
                 })
 
-    def convert_partner(self, cr, uid, ids, action='new', partner_id=False, context=None):
+    def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
         """
         This function convert partner based on action.
         if action is 'new', create new partner with contact and assign lead to new partner_id.
@@ -589,12 +602,15 @@ class crm_lead(crm_case, osv.osv):
         """
         if context is None:
             context = {}
-        partner_ids = []
+        partner_ids = {}
         for lead in self.browse(cr, uid, ids, context=context):
-            if action == 'create':
-               partner_id = self._lead_create_partner(cr, uid, lead, context=context)
+            partner_id = lead.partner_id and lead.partner_id.id or False
+            if action == 'create': 
+                if not partner_id:
+                    partner_id = self._lead_create_partner(cr, uid, lead, context=context)
+                self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
             self._lead_assign_partner(cr, uid, [lead.id], partner_id, context=context)
-            partner_ids.append(partner_id)
+            partner_ids[lead.id] = partner_id
         return partner_ids
 
     def _send_mail_to_salesman(self, cr, uid, lead, context=None):
@@ -628,6 +644,45 @@ class crm_lead(crm_case, osv.osv):
                 self.write(cr, uid, [lead_id], value, context=context)
         return True
 
+    def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
+        """
+        action :('schedule','Schedule a call'), ('log','Log a call')
+        """
+        phonecall = self.pool.get('crm.phonecall')
+        model_data = self.pool.get('ir.model.data')
+        phonecall_dict = {}
+        if not categ_id:
+            res_id = model_data._get_id(cr, uid, 'crm', 'categ_phone2')
+            if res_id:
+                categ_id = model_data.browse(cr, uid, res_id, context=context).res_id
+        for lead in self.browse(cr, uid, ids, context=context):
+            if not section_id:
+                section_id = lead.section_id and lead.section_id.id or False
+            if not user_id:
+                user_id = lead.user_id and lead.user_id.id or False
+            vals = {
+                    'name' : call_summary,
+                    'opportunity_id' : lead.id,
+                    'user_id' : user_id or False,
+                    'categ_id' : categ_id or False,
+                    'description' : lead.description or False,
+                    'date' : schedule_time,
+                    'section_id' : section_id or False,
+                    'partner_id': lead.partner_id and lead.partner_id.id or False,
+                    'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False,
+                    'partner_phone' : lead.phone or (lead.partner_address_id and lead.partner_address_id.phone or False),
+                    'partner_mobile' : lead.partner_address_id and lead.partner_address_id.mobile or False,
+                    'priority': lead.priority,
+            }
+            
+            new_id = phonecall.create(cr, uid, vals, context=context)
+            phonecall.case_open(cr, uid, [new_id])
+            if action == 'log':
+                phonecall.case_close(cr, uid, [new_id])
+            phonecall_dict[lead.id] = new_id
+        return phonecall_dict
+
+
     def redirect_opportunity_view(self, cr, uid, opportunity_id, context=None):
         models_data = self.pool.get('ir.model.data')
 
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 748f85ad063..1adf63b9a34 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -102,11 +102,6 @@ class crm_phonecall(crm_base, osv.osv):
 
     def case_close(self, cr, uid, ids, *args):
         """Overrides close for crm_case for setting close date
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
         """
         res = True
         for phone in self.browse(cr, uid, ids):
@@ -121,11 +116,6 @@ class crm_phonecall(crm_base, osv.osv):
 
     def case_reset(self, cr, uid, ids, *args):
         """Resets case as Todo
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case Ids
-        @param *args: Tuple Value for additional Params
         """
         res = super(crm_phonecall, self).case_reset(cr, uid, ids, args, 'crm.phonecall')
         self.write(cr, uid, ids, {'duration': 0.0})
@@ -134,25 +124,155 @@ class crm_phonecall(crm_base, osv.osv):
 
     def case_open(self, cr, uid, ids, *args):
         """Overrides cancel for crm_case for setting Open Date
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
         """
         res = super(crm_phonecall, self).case_open(cr, uid, ids, *args)
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
+    def schedule_another_phonecall(self, cr, uid, ids, schedule_time, call_summary, \
+                    user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
+        """
+        action :('schedule','Schedule a call'), ('log','Log a call')
+        """
+        model_data = self.pool.get('ir.model.data')
+        phonecall_dict = {}
+        if not categ_id:
+            res_id = model_data._get_id(cr, uid, 'crm', 'categ_phone2')
+            if res_id:
+                categ_id = model_data.browse(cr, uid, res_id, context=context).res_id
+        for call in self.browse(cr, uid, ids, context=context):
+            if not section_id:
+                section_id = call.section_id and call.section_id.id or False
+            if not user_id:
+                user_id = call.user_id and call.user_id.id or False
+            vals = {
+                    'name' : call_summary,
+                    'user_id' : user_id or False,
+                    'categ_id' : categ_id or False,
+                    'description' : call.description or False,
+                    'date' : schedule_time,
+                    'section_id' : section_id or False,
+                    'partner_id': call.partner_id and call.partner_id.id or False,
+                    'partner_address_id': call.partner_address_id and call.partner_address_id.id or False,
+                    'partner_phone' : call.partner_phone,
+                    'partner_mobile' : call.partner_mobile,
+                    'priority': call.priority,
+            }
+            
+            new_id = self.create(cr, uid, vals, context=context)
+            self.case_open(cr, uid, [new_id])
+            if action == 'log':
+                self.case_close(cr, uid, [new_id])
+            phonecall_dict[call.id] = new_id
+        return phonecall_dict
+
+    def _call_create_partner(self, cr, uid, phonecall, context=None):
+        partner = self.pool.get('res.partner')
+        partner_id = partner.create(cr, uid, {
+                    'name': phonecall.name,
+                    'user_id': phonecall.user_id.id,
+                    'comment': phonecall.description,
+                    'address': []
+        })
+        return partner_id
+
+    def _call_assign_partner(self, cr, uid, ids, partner_id, context=None):
+        return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
+
+    def _call_create_partner_address(self, cr, uid, phonecall, partner_id, context=None):
+        address = self.pool.get('res.partner.address')
+        return address.create(cr, uid, {
+                    'partner_id': partner_id,
+                    'name': phonecall.name,
+                    'phone': phonecall.partner_phone,
+        })
+
+    def convert_partner(self, cr, uid, ids, action='new', partner_id=False, context=None):
+        """
+        This function convert partner based on action.
+        if action is 'create', create new partner with contact and assign lead to new partner_id.
+        otherwise assign lead to specified partner_id
+        """
+        if context is None:
+            context = {}
+        partner_ids = {}
+        for call in self.browse(cr, uid, ids, context=context):
+            partner_id = call.partner_id and call.partner_id.id or False
+            if action == 'create':
+               if not partner_id:
+                   partner_id = self._call_create_partner(cr, uid, call, context=context)
+               self._call_create_partner_address(cr, uid, call, partner_id, context=context)
+            self._call_assign_partner(cr, uid, [call.id], partner_id, context=context)
+            partner_ids[call.id] = partner_id
+        return partner_ids
+
+
+    def redirect_phonecall_view(self, cr, uid, phonecall_id, context=None):
+        model_data = self.pool.get('ir.model.data')
+        # Select the view
+        id2 = model_data._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
+        id3 = model_data._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
+        if id2:
+            id2 = model_data.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = model_data.browse(cr, uid, id3, context=context).res_id
+
+        result = model_data._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+        res = model_data.read(cr, uid, result, ['res_id'])
+
+        value = {
+                'name': _('Phone Call'),
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'crm.phonecall',
+                'res_id' : int(phonecall_id),
+                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'],
+        }
+        return value
+
+
+    def convert_opportunity(self, cr, uid, ids, opportunity_summary=False, partner_id=False, planned_revenue=0.0, probability=0.0, context=None):
+        partner = self.pool.get('res.partner')
+        address = self.pool.get('res.partner.address')
+        opportunity = self.pool.get('crm.lead')
+        opportunity_dict = {}
+        for call in self.browse(cr, uid, ids, context=context):
+            if not partner_id:
+                partner_id = call.partner_id and call.partner_id.id or False
+            if partner_id:
+                address_id = partner.address_get(cr, uid, [partner_id])['default']
+                if address_id:
+                    default_contact = address.browse(cr, uid, address_id, context=context)
+            opportunity_id = opportunity.create(cr, uid, {
+                            'name': opportunity_summary or call.name,
+                            'planned_revenue': planned_revenue,
+                            'probability': probability,
+                            'partner_id': partner_id or False,
+                            'partner_address_id': default_contact and default_contact.id, 
+                            'phone': default_contact and default_contact.phone,
+                            'mobile': default_contact and default_contact.mobile,
+                            'section_id': call.section_id and call.section_id.id or False,
+                            'description': call.description or False,
+                            'phonecall_id': call.id,
+                            'priority': call.priority,
+                            'type': 'opportunity', 
+                            'phone': call.partner_phone or False,
+                        })
+            vals = {
+                    'partner_id': partner_id,
+                    'opportunity_id' : opportunity_id,
+            }
+            self.write(cr, uid, [call.id], vals)
+            self.case_close(cr, uid, [call.id])
+            opportunity.case_open(cr, uid, [opportunity_id])
+            opportunity_dict[call.id] = opportunity_id
+        return opportunity_dict   
+
     def action_make_meeting(self, cr, uid, ids, context=None):
         """
         This opens Meeting's calendar view to schedule meeting on current Phonecall
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Meeting IDs
-        @param context: A standard dictionary for contextual values
-
         @return : Dictionary value for created Meeting view
         """
         value = {}
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 8f0661ab8be..e80930284f4 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -83,9 +83,6 @@
 			<field eval="2.08" name="duration"/>
 		</record>
 		<record id="crm_case_phone06" model="crm.phonecall">
-			<field name="partner_address_id" ref="base.res_partner_address_1"/>
-			<field eval="1" name="active"/>
-			<field name="partner_id" ref="base.res_partner_9"/>
 			<field eval="&quot;3&quot;" name="priority"/>
 			<field name="user_id" ref="base.user_root"/>
 			<field eval="&quot;Bad time&quot;" name="name"/>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 0fc6f5dff89..a00a25f47a4 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -34,27 +34,45 @@ class res_partner(osv.osv):
             'Phonecalls'),
     }
 
-    def make_opportunity(self, cr, uid, ids, opportunity, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
+    def redirect_partner_form(self, cr, uid, partner_id, context=None):
+        model_data = self.pool.get('ir.model.data')
+        result = model_data._get_id(cr, uid, 'base', 'view_res_partner_filter')
+        res = model_data.read(cr, uid, result, ['res_id'])
+
+        value = {
+            'domain': "[]",
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'res.partner',
+            'res_id': int(partner_id),
+            'view_id': False,
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id']
+        }
+        return value
+
+    def make_opportunity(self, cr, uid, ids, opportunity_summary, planned_revenue=0.0, probability=0.0, partner_id=None, context=None):
         categ = self.pool.get('crm.case.categ')
         address = self.address_get(cr, uid, ids)
         categ_ids = categ.search(cr, uid, [('object_id.model','=','crm.lead')])
         lead = self.pool.get('crm.lead')
-        opportunity_ids = []    
+        opportunity_ids = {}
         for partner in self.browse(cr, uid, ids, context=context):
-            address = self.address_get(cr, uid, partner.id)
+            address = self.address_get(cr, uid, [partner.id])['default']
             if not partner_id:
                 partner_id = partner.id
             opportunity_id = lead.create(cr, uid, {
-                'name' : opportunity,
+                'name' : opportunity_summary,
                 'planned_revenue' : planned_revenue,
                 'probability' : probability,
                 'partner_id' : partner_id,
-                'partner_address_id' : address['default'],
+                'partner_address_id' : address,
                 'categ_id' : categ_ids and categ_ids[0] or '',
                 'state' :'draft',
                 'type': 'opportunity'
             })
-            opportunity_id.add(opportunity_id)
+            opportunity_ids[partner_id] = opportunity_id
         return opportunity_ids
 res_partner()
 
diff --git a/addons/crm/test/customer_request.eml b/addons/crm/test/customer_request.eml
new file mode 100644
index 00000000000..2c6c5e8110d
--- /dev/null
+++ b/addons/crm/test/customer_request.eml
@@ -0,0 +1,30 @@
+Return-Path: <info@customer.com>
+X-Original-To: info@customer.com
+Delivered-To: sales@my.com
+Received: by mail.my.com (Postfix, from userid xxx)
+	id 822ECBFB67; Mon, 24 Oct 2011 07:36:51 +0200 (CEST)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.my.com
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=ham
+	version=3.3.1
+Received: from [192.168.1.146] 
+	(Authenticated sender: info@mail.customer.com)
+	by mail.customer.com (Postfix) with ESMTPSA id 07A30BFAB4
+	for <sales@my.com>; Mon, 24 Oct 2011 07:36:50 +0200 (CEST)
+Message-ID: <4EA4F95D.904@customer.com>
+Date: Mon, 24 Oct 2011 11:06:29 +0530
+From: Mr. John Right <info@customer.com>
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
+MIME-Version: 1.0
+To: sales@my.com
+Subject: Fournir votre devis avec le meilleur prix.
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 8bit
+
+Bonjour l'équipe de vente,
+
+Je veux acheter vos produits et services.
+
+S'il vous plaît fournir votre cotation avec le meilleur prix.
+
+Merci
diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index 75afa71c1d9..0cc13208d03 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -1,76 +1,31 @@
 -
-  Cheking for lead from draft to cancel, I cancel this lead.
+  I cancel unqualified lead.
 -
   !python {model: crm.lead}: |
     self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  I test lead is on cancel state.
+  I check cancelled lead.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
      - state == "cancel"
 -
-  Checking for lead from cancel to reset, I reset this lead.
+  I reset cancelled lead into unqualified lead.
 -
   !python {model: crm.lead}: |
     self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  I test lead is on draft state.
+  I check unqualified lead after reset.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in draft state}:
      - state == "draft"
 -
-  Cheking for lead from reset to pending, I pending this lead.
+  I put unqualified lead into pending.
 -
   !python {model: crm.lead}: |
     self.case_pending(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 -
-  I test lead is on pending state.
+  I check status of pending lead.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in pending state}:
      - state == "pending"
--
-  Cheking for lead from pending to cancel, I cancel this lead.
--
-  !python {model: crm.lead}: |
-    self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
--
-  I test lead is on cancel state.
--
-  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
-     - state == "cancel"
--
-  I create sales executive department that will be work under Sales Department.
--
-  !record {model: crm.case.section, id: section_sales_exe_department}:
-    name: "Sales Executive"
-    parent_id: crm.section_sales_department
 
--
-  Escalate lead from sales executive department to sales department,
-  for that purpose i assign sales executive department on lead, 
-  after i will be process to escalate lead to sales department 
--
-  !record {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0}:
-    section_id: section_sales_exe_department
--
-  Processing on Lead escalate to sales departemnt, i check for lead escalate to sales Department from Executive
-  department or not.
--
-  !python {model: crm.lead}: |
-    self.case_reset(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-    self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
--
-  I test lead escalate from sales department from Executive  department.
--
-  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Escalate lead to on sales team from Executive teame}:
-     - section_id.name == "Sales Department"
--
-  Cheking for lead from escalate to cancel, I cancel this lead.
--
-  !python {model: crm.lead}: |
-    self.case_cancel(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
--
-  I test lead is on cancel state.
--
-  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
-     - state == "cancel"
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index e5f805a36b2..444c7a704d2 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -1,51 +1,54 @@
 -
-  Communication by mail, Customer Interest with our product and to take functional
-  training with us.
+  Customer would like to purchase our product. so He send request by email to our mail server.
+-
+  Mail script will be fetched him request from mail server. so I process that mail after read EML file 
+-
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('crm','test', 'customer_request.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'crm.lead', request_message)
+
+-
+  After getting the mail, I check details of new lead of that customer.
 -
   !python {model: crm.lead}: |
-    #create message manually to create lead by(Mail) self.message_new(cr, uid, msg, context=None)
+    lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    assert lead_ids and len(lead_ids), "Lead is not created after getting request"
+    lead = self.browse(cr, uid, lead_ids[0], context=context)
+    assert not lead.partner_id, "Customer should be a new"
+    assert lead.name == "Fournir votre devis avec le meilleur prix.", "Subject does not match"
 -
-  After getting the mail, I call to customer for more communication.
+  I reply him request with welcome message.
+-
+  !python {model: mail.compose.message}: |
+    lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
+    id = self.create(cr, uid, {'body_text': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci"}, context=context)
+    try:
+        self.send_mail(cr, uid, [id], context=context)
+    except:
+        pass
+
+
+-
+  Now, I convert him into customer and put into regular customer list.
 -
   !python {model: crm.lead}: |
-    #schedule phonecall to customer
-    #search lead which came by customer and create function in crm.lead-schedule_phonecall to customer
+    lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    self.convert_partner(cr, uid, lead_ids, context=context)
+
 -
-  Communication by phonecall with customer, customer want to meet us so I arrage
-  meeting for customer.
+  Now, I search customer in regular customer list.
 -
   !python {model: crm.lead}: |
-    #schedule to arrange meeting with customer.
-    #search lead which came by customer and call to action_makeMeeting.
+    partner_ids = self.message_partner_by_email(cr, uid, 'Mr. John Right <info@customer.com>')
+    assert partner_ids.get('partner_id'), "Customer is not found in regular customer list."
+
 -
-  Customer do initial discussion with us on meeting, so I check confirm 
-  meeting and after completed, meeting will be close. 
+  I convert one phonecall request as a customer and put into regular customer list.
 -
-  !python {model: crm.meeting}: |
-    #open and close the meeting.
-    #search id from lead and open and close this meeting.
--
-  After communicated by meeting with customer, I send mail to more discussion 
-  with Customer.
--
-  !python {model: crm.lead}: |
-    #send mail to customer.
--
-  Also another communication send Fax to customer and maintain communication history.
--
-  !record {model: crm.add.note, id: crm_add_note_time_schedule}:
-    #create fax history
-    #body: 'Timining Scenario to come office'
--
-  I give Fax to customer for our detail scenario of functional training timing 
-  schedule. 
--
-  !python {model: crm.add.note}: |
-    #add this fax history to lead
-    #self.action_add(cr, uid, [ref("crm_add_note_time_schedule")], {"active_model": "crm.lead","active_ids": [ref("crm_case_qrecorp0")]})
--
-  After Adding Fax scenario, I test it.
--
-  !python {model: crm.lead}: |
-    #checked Fax history added.
-    #search lead history and compare with record
+  !python {model: crm.phonecall}: |
+    self.convert_partner(cr, uid, [ref('crm.crm_case_phone06')], context=context)
+
+
diff --git a/addons/crm/test/process/draft2open_lead.yml b/addons/crm/test/process/draft2open_lead.yml
deleted file mode 100644
index 97947b5846b..00000000000
--- a/addons/crm/test/process/draft2open_lead.yml
+++ /dev/null
@@ -1,10 +0,0 @@
--
-  I got lead from Customer, I open this lead.
--
-   !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
-- |
-  In order to test lead, i test lead is in open stage.
--
-  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
-     - state == "open"
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 9662cd6998f..ed33a251b80 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -1,10 +1,21 @@
 -
-  Convert opportunity based on exiting partner.
+  I open customer lead.
+-
+   !python {model: crm.lead}: |
+     self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
+- 
+  I check lead is in open stage.
+-
+  !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
+     - state == "open"
+
+-
+  I convert lead into opportunity for exiting customer.
 -
   !python {model: crm.lead}: |
     self.convert_opportunity(cr, uid ,[ref("crm_case_qrecorp0")], ref("base.res_partner_agrolait"))
 -
-  After converted in opportunity, I test that lead is converted to opportunity.
+  I check details of converted opportunity. 
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
@@ -12,12 +23,28 @@
     assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
 -
-  Finally, i won this opportunity, so I close this opportunity.
+  Now I start Communication by phonecall with customer.
+-
+  !python {model: crm.opportunity2phonecall}: |
+    import time
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_qrecorp0')]})
+    call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
+                'name': "Bonjour M. Jean, Comment êtes-vous? J'ai obtenu votre demande. peut-on parler au sujet de ce pour quelques minutes?"}, context=context)
+    self.action_schedule(cr, uid, [call_id], context=context)
+-
+  After communicated  with customer, I put some notes with Contract details.
+-
+  !python {model: crm.add.note}: |
+    context.update({'active_model': 'crm.lead', 'active_id': ref('crm_case_qrecorp0')})
+    note_id = self.create(cr, uid, {'body': "ces détails envoyés par le client sur ​​le FAX pour la qualité"})
+    self.action_add(cr, uid, [note_id], context=context)
+-
+  Finally, I won this opportunity, so I close this opportunity.
 -
   !python {model: crm.lead}: |
     self.case_mark_won(cr, uid, [ref("crm_case_qrecorp0")])
 -
-  After wininng the opportunity , I test the opportunity.
+  I check details of the opportunity After won the opportunity.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_qrecorp0'))
diff --git a/addons/crm/test/process/mass_leads2opportunity.yml b/addons/crm/test/process/mass_leads2opportunity.yml
deleted file mode 100644
index 9258814b68b..00000000000
--- a/addons/crm/test/process/mass_leads2opportunity.yml
+++ /dev/null
@@ -1,25 +0,0 @@
--
-  Convert two Leads to two opportunity(Mass conversion).
--
-  !python {model: crm.lead}: |
-    self.convert_opportunity(cr, uid, [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], mass_convert=True)
--
-  First lead converted on opportunity, I test it.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_employee0'))
-    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert lead.planned_revenue == 0.0, 'Planned revenue should be 0!'
-    assert lead.probability == 0.0, 'probability revenue should be 0!'
-    assert lead.partner_id.name == "Agrolait", 'Partner missmatch!'
-    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
--
-  Second lead converted on opportunity, I test it.
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_electonicgoodsdealer0'))
-    assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert lead.planned_revenue == 0.0, 'Planned revenue should be 0!'
-    assert lead.probability == 0.0, 'probability revenue should be 0!'
-    assert lead.partner_id.name == "Le Club SARL", 'Partner missmatch!'
-    assert lead.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 2a5b269153f..6d16ca17694 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -1,8 +1,30 @@
 -
-  I have two opportunity ,so i merge this two Opportunities, I test which two opportunity has been merged .
+  I make direct opportunity for Customer.
+-
+  !python {model: crm.partner2opportunity}: |
+    context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_9")]})
+    res_id = self.create(cr, uid, {'name': "enquête pour l'achat de services"}, context=context)
+    self.make_opportunity(cr, uid, [res_id], context=context)
+    
+-
+  I make another opportunity from phonecall for same customer.
+-
+  !python {model: crm.phonecall2opportunity}: |
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")]})
+    res_id = self.create(cr, uid, {'name': "Quoi de prix de votre autre service?", 'partner_id': ref("base.res_partner_9")}, context=context)
+    self.make_opportunity(cr, uid, [res_id], context=context)
+-
+ Now I merge all opportunities of customer.
 -
   !python {model: crm.lead}: |
-    op_list = [ref('crm_case_bankwealthy2'),ref('crm_case_unifliege')]
-    op_ids=self.pool.get('crm.lead').browse(cr,uid,op_list)
-    lead_ids = [ref('crm_case_bankwealthy2')]
-    self.merge_opportunity(cr, uid, op_ids, {'lead_ids': lead_ids})
+    opportunity_ids = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
+    self.merge_opportunity(cr, uid, opportunity_ids, context=context)
+
+-
+  Now I schedule another phonecall to customer after merged.
+-
+  !python {model: crm.phonecall2phonecall}: |
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")]})
+    res_id = self.create(cr, uid, {'name': "vos chances sont fusionnés en un seul"}, context=context)
+    self.action_schedule(cr, uid, [res_id], context=context)
+
diff --git a/addons/crm/test/process/partner2opportunity.yml b/addons/crm/test/process/partner2opportunity.yml
deleted file mode 100644
index b9668a1a0f9..00000000000
--- a/addons/crm/test/process/partner2opportunity.yml
+++ /dev/null
@@ -1,11 +0,0 @@
--
-  Convert partner to opportunity, i test to convert opportunity is from partner.
--
-  !python {model: res.partner}: |
-    opportunity = self.make_opportunity(cr, uid, [ref("base.res_partner_9")], 'BalmerInc S.A.', 200.0, 150.0)
-    opportunity_rec = self.pool.get('crm.lead').browse(cr, uid, opportunity['res_id'])
-    assert opportunity_rec.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert opportunity_rec.planned_revenue == 200.0, 'Planned revenue should be 200!'
-    assert opportunity_rec.probability == 150.0, 'probability revenue should be 150!'
-    assert opportunity_rec.partner_id.id == ref("base.res_partner_9"), 'Partner missmatch!'
-    assert opportunity_rec.state == 'draft', 'Opportunity stage not in draft state'
diff --git a/addons/crm/test/process/phone-call2opportunity.yml b/addons/crm/test/process/phone-call2opportunity.yml
deleted file mode 100644
index 03671d6df3b..00000000000
--- a/addons/crm/test/process/phone-call2opportunity.yml
+++ /dev/null
@@ -1,23 +0,0 @@
--
-  For customer purpose, I called to him/her for discussion about openerp.
-  As the success of phonecall seems to be a real business opportunity, so first i
-  create record of phonecall.
--
-  !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_disc_openerp}:
-    name: Discuss Review Process
-    partner_id: base.res_partner_tinyatwork
--
-  Succeed phonecall, it's convert into on opportunity.
--
-  !python {model: crm.phonecall2opportunity}: |
-    self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_disc_openerp")], {"active_id": ref("crm_case_phone04")})
--
-  I check that the phonecall and the newly created business opportunity is 
-  linked to same  partner and also check with phonecall closed and opportunity
-  is on intial stage or not.
--
-  !python {model: crm.phonecall}: |
-    phonecall = self.browse(cr, uid, ref('crm_case_phone04'))
-    assert phonecall.partner_id.id == phonecall.opportunity_id.partner_id.id, "created business opportunity is not linked to same  partner"
-    assert phonecall.opportunity_id.stage_id.id == ref("stage_lead1"), "Converted opportunity is not in Initial stage"
-    assert phonecall.state == "done", "phonecall is held"
diff --git a/addons/crm/test/process/schedule_other_phone-call.yml b/addons/crm/test/process/schedule_other_phone-call.yml
deleted file mode 100644
index a92496dc265..00000000000
--- a/addons/crm/test/process/schedule_other_phone-call.yml
+++ /dev/null
@@ -1,23 +0,0 @@
--
-  I schedule phonecall to another phonecall, so first i create record of schedule call.
--
-  !record {model: crm.phonecall2phonecall, id: crm_schedule_phonecall}:
-    name: 'Test Discuss Review Process'
-    categ_id: crm.categ_phone1
-    date: !eval time.strftime('%Y-%m-%d') 
--
-  I Convert schedule phonecall.
--
-  !python {model: crm.phonecall2phonecall}: |
-    self.action_apply(cr, uid, [ref('crm_schedule_phonecall')], {'active_id': ref('crm_case_phone04')})
--
-  I check for another schedule call.
--
-  !python {model: crm.phonecall}: |
-    phonecall = self.search(cr, uid, [('name', '=', 'Test Discuss Review Process')])
-    assert phonecall, "Do not create another schedule call"
-    schedule_phonecall = self.browse(cr, uid, phonecall)[0]
-    assert schedule_phonecall.user_id.id == ref("base.user_root"), "Responsible person not assign"
-    assert schedule_phonecall.section_id.id == ref("crm.section_sales_department"), "Do not assign proper section"
-    assert schedule_phonecall.categ_id.id == ref("crm.categ_phone1"), "Category of phonecall is not apply"
-    assert schedule_phonecall.partner_id.id == ref("base.res_partner_tinyatwork"), "Partner missmatch"
\ No newline at end of file
diff --git a/addons/crm/test/ui/lead_form.yml b/addons/crm/test/ui/lead_form.yml
index 8cfc96283b0..7ec86106947 100644
--- a/addons/crm/test/ui/lead_form.yml
+++ b/addons/crm/test/ui/lead_form.yml
@@ -1,24 +1,8 @@
 -
-  In order to check for changes on partner, country and phone number change automatically according to partner,
+  I check onchange event of partner address on lead form.
 -
   !python {model: crm.lead}: |
     action = self.onchange_partner_address_id(cr, uid, ref("crm_case_qrecorp0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
     assert action['value']['country_id'] == 20, "Country name not True"
     assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
--
-  I try to Unlink the lead, so I create new record of lead on cancel stage. 
--
-  !record {model: crm.lead, id: crm_case_new_lead}:
-    name: Openerp Trainning
-    state: cancel
--
-  I test copy and unlink this lead.
--
-  !python {model: crm.lead}: |
-    self.copy(cr, uid, ref("crm_case_new_lead"))
-    sid = self.search(cr, uid, [('name', '=', 'Openerp Trainning')])
-    assert len(sid) == 2, 'Lead is not copied Successfully'
-    try:
-      self.unlink(cr, uid, [ref("crm_case_new_lead")])
-    except:
-      pass
+
diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py
index 3ebdceda437..2fc39c51505 100644
--- a/addons/crm/wizard/__init__.py
+++ b/addons/crm/wizard/__init__.py
@@ -24,11 +24,11 @@ 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_opportunity_to_phonecall
 import crm_phonecall_to_partner
-import crm_phonecall_to_opportunity
 import crm_partner_to_opportunity
+import crm_phonecall_to_opportunity
 
 import crm_merge_opportunities
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 98d061f8520..9b03f7813a1 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -102,7 +102,30 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
         return False
 
-    
+    def _convert_opportunity(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        lead = self.pool.get('crm.lead')
+        partner_ids = self._create_partner(cr, uid, ids, context=context)
+        partner_id = partner_ids and partner_ids[0] or False
+        lead_ids = context.get('active_ids', [])
+        user_ids = context.get('user_ids', False)
+        team_id = context.get('section_id', False)
+        return lead.convert_opportunity(cr, uid, lead_ids, partner_id, user_ids, team_id, context=context) 
+
+    def _merge_opportunity(self, cr, uid, ids, opportunity_ids, action='merge', context=None):
+        #TOFIX: is it usefully ?
+        if context is None:
+            context = {}
+        merge_opportunity = self.pool.get('crm.merge.opportunity')
+        res = False
+        #If we convert in mass, don't merge if there is no other opportunity but no warning
+        if action == 'merge' and (len(opportunity_ids) > 1 or not context.get('mass_convert') ):
+            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [opportunity_ids[0].id])]}, context=context)
+            context.update({'lead_ids' : record_id, "convert" : True})
+            res = merge_opportunity.merge(cr, uid, data.opportunity_ids, context=context)
+        return res
+
     def action_apply(self, cr, uid, ids, context=None):
         """
         This converts lead to opportunity and opens Opportunity view
@@ -112,20 +135,13 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         """
         if not context:
             context = {}
-        if not record_id:
-            return {'type': 'ir.actions.act_window_close'}
+        
+        lead = self.pool.get('crm.lead')
+        data = self.browse(cr, uid, ids, context=context)[0]
+        self._convert_opportunity(cr, uid, ids, context=context)
+        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.action, context=context)
 
-        partner_ids = self._create_partner(cr, uid, ids, context=context)
-        partner_id = partner_ids and partner_ids[0] or False
-        leads.convert_opportunity(cr, uid, lead_ids, partner_id, context=context) 
-        #If we convert in mass, don't merge if there is no other opportunity but no warning
-        if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
-            merge_obj = self.pool.get('crm.merge.opportunity')
-            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
-            context.update({'lead_ids' : record_id, "convert" : True})
-            return merge_obj.merge(cr, uid, data.opportunity_ids, context=context)
-
-        return leads.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
+        return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
 crm_lead2opportunity_partner()
 
@@ -150,13 +166,14 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
         data = self.browse(cr, uid, ids, context=context)[0]
 
         salesteam_id = data.section_id and data.section_id.id or False
-        salesmans = []
+        salesman = []
         if data.user_ids:
-            salesmans = [x.id for x in data.user_ids]
-        lead.allocate_salesman(cr, uid, active_ids, salesman, salesteam_id, context=context)
+            salesman = [x.id for x in data.user_ids]
+        
         value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
         value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
         self.write(cr, uid, ids, value, context=context)
+        context.update({'user_ids': salesman, 'section_id': salesteam_id})
         return self.action_apply(cr, uid, ids, context=context)
 crm_lead2opportunity_mass_convert()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 8cc6d3e58cf..5363264ca37 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -21,7 +21,6 @@
 
 from osv import osv, fields
 from tools.translate import _
-import re
 
 class crm_lead2partner(osv.osv_memory):
     """ Converts lead to partner """
@@ -38,49 +37,47 @@ class crm_lead2partner(osv.osv_memory):
         """
         This function checks for precondition before wizard executes
         """
-        lead_obj = self.pool.get('crm.lead')
+        if context is None:
+            context = {}
+        model = context.get('active_model')
+        model = self.pool.get(model)
         rec_ids = context and context.get('active_ids', [])
-        for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
-            if lead.partner_id:
+        for this in model.browse(cr, uid, rec_ids, context=context):
+            if this.partner_id:
                 raise osv.except_osv(_('Warning !'),
-                        _('A partner is already defined on this lead.'))
+                        _('A partner is already defined.'))
+
+    def _select_partner(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        lead = self.pool.get('crm.lead')
+        partner = self.pool.get('res.partner')
+        lead_ids = list(context and context.get('active_ids', []) or [])
+        if not len(lead_ids):
+            return False
+        this = lead.browse(cr, uid, lead_ids[0], context=context)
+        # Find partner address matches the email_from of the lead
+        res = lead.message_partner_by_email(cr, uid, this.email_from, context=context)
+        partner_id = res.get('partner_id', False)      
+        # Find partner name that matches the name of the lead
+        if not partner_id and this.partner_name:
+            partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
+            if partner_ids and len(partner_ids):
+               partner_id = partner_ids[0]
+        return partner_id
 
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
         """
-        lead_obj = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        partner_id = False
-
-        data = list(context and context.get('active_ids', []) or [])
-        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
-        for lead in lead_obj.browse(cr, uid, data, context=context):
-            partner_ids = []
-            # Find partner address matches the email_from of the lead
-            email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
-            email = map(lambda x: "'" + x + "'", email)
-            if email:
-                cr.execute("""select id from res_partner_address
-                                where
-                                substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
-                address_ids = map(lambda x: x[0], cr.fetchall())
-                if address_ids:
-                    partner_ids = partner_obj.search(cr, uid, [('address', 'in', address_ids)], context=context)
-                    
-            # Find partner name that matches the name of the lead
-            if not partner_ids and lead.partner_name:
-                partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context)
-                
-            partner_id = partner_ids and partner_ids[0] or False
-
-            if 'partner_id' in fields:
-                res.update({'partner_id': partner_id})
-            if 'action' in fields:
-                res.update({'action': partner_id and 'exist' or 'create'})
-            if 'opportunity_ids' in fields:
-                res.update({'opportunity_ids': data})
+        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)        
+        partner_id = self._select_partner(cr, uid, context=context)
 
+        if 'partner_id' in fields:
+            res.update({'partner_id': partner_id})
+        if 'action' in fields:
+            res.update({'action': partner_id and 'exist' or 'create'})
+            
         return res
 
     def open_create_partner(self, cr, uid, ids, context=None):
@@ -88,17 +85,17 @@ class crm_lead2partner(osv.osv_memory):
         This function Opens form of create partner.
         """
         view_obj = self.pool.get('ir.ui.view')
-        view_id = view_obj.search(cr, uid, [('model', '=', 'crm.lead2partner'), \
-                                     ('name', '=', 'crm.lead2partner.view')])
+        view_id = view_obj.search(cr, uid, [('model', '=', self._name), \
+                                     ('name', '=', self._name+'.view')])
         return {
             'view_mode': 'form',
             'view_type': 'form',
             'view_id': view_id or False,
-            'res_model': 'crm.lead2partner',
+            'res_model': self._name,
             'context': context,
             'type': 'ir.actions.act_window',
             'target': 'new',
-            }
+        }
 
     def _create_partner(self, cr, uid, ids, context=None):
         """
@@ -118,7 +115,7 @@ class crm_lead2partner(osv.osv_memory):
         This function Makes partner based on action.
         """
         partner_ids = self._create_partner(cr, uid, ids, context=context)
-        return {'type': 'ir.actions.act_window_close'}
+        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_ids[0], context=context)
 
 crm_lead2partner()
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index 714376766f6..a6383438350 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -28,33 +28,11 @@ import time
 
 class crm_opportunity2phonecall(osv.osv_memory):
     """Converts Opportunity to Phonecall"""
-
+    _inherit = 'crm.phonecall2phonecall'
     _name = 'crm.opportunity2phonecall'
     _description = 'Opportunity to Phonecall'
 
-    _columns = {
-        'name' : fields.char('Call summary', size=64, required=True, select=1),
-        'user_id' : fields.many2one('res.users', "Assign To"),
-        'partner_id' : fields.many2one('res.partner', "Partner"),
-        'date': fields.datetime('Date'),
-        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'categ_id': fields.many2one('crm.case.categ', 'Category',  \
-                        domain="['|',('section_id','=',False),('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]"),
-        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), 
-    }
-
     def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : default values of fields.
-        """
         opp_obj = self.pool.get('crm.lead')
         categ_id = False
         data_obj = self.pool.get('ir.model.data')
@@ -78,83 +56,20 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 res.update({'partner_id': opp.partner_id and opp.partner_id.id or False})
         return res
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        """
-        Closes Opportunity to Phonecall form
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Opportunity to Phonecall's IDs
-        @param context: A standard dictionary for contextual values
-        """
-        return {'type': 'ir.actions.act_window_close'}
-
-    def action_apply(self, cr, uid, ids, context=None):
-        """
-        This converts Opportunity to Phonecall and opens Phonecall view
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user's ID for security checks,
-        @param ids: List of Opportunity to Phonecall IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Opportunity form
-        """
+    def action_schedule(self, cr, uid, ids, context=None):
         value = {}
-        record_ids = context and context.get('active_ids', []) or []
-
-        phonecall_obj = self.pool.get('crm.phonecall')
-        opp_obj = self.pool.get('crm.lead')
-        mod_obj = self.pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-
-        data_obj = self.pool.get('ir.model.data')
-
-        # Select the view
-        id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
-        id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-        for this in self.browse(cr, uid, ids, context=context):
-            for opp in opp_obj.browse(cr, uid, record_ids, context=context):
-                vals = {
-                        'name' : opp.name,
-                        'case_id' : opp.id,
-                        'user_id' : this.user_id and this.user_id.id or False,
-                        'categ_id' : this.categ_id.id,
-                        'description' : opp.description or False,
-                        'date' : this.date,
-                        'section_id' : this.section_id.id or False,
-                        'partner_id': opp.partner_id and opp.partner_id.id or False,
-                        'partner_address_id': opp.partner_address_id and opp.partner_address_id.id or False,
-                        'partner_phone' : opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False),
-                        'partner_mobile' : opp.partner_address_id and opp.partner_address_id.mobile or False,
-                        'priority': opp.priority,
-                        'opportunity_id': opp.id,
-                        'date_open': time.strftime('%Y-%m-%d %H:%M:%S')
-                }
-                
-                new_case = phonecall_obj.create(cr, uid, vals, context=context)
-               
-                if this.action == 'log':
-                    phonecall_obj.case_close(cr, uid, [new_case])
-
-            value = {
-                'name': _('Phone Call'),
-                'domain': "[('user_id','=',%s),('opportunity_id','=',%s)]" % (uid,opp.id),
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'crm.phonecall',
-                'res_id' : new_case,
-                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
-            }
-        return value
+        if context is None:
+            context = {}
+        phonecall = self.pool.get('crm.phonecall')
+        opportunity_ids = context and context.get('active_ids') or []
+        opportunity = self.pool.get('crm.lead')
+        data = self.browse(cr, uid, ids, context=context)[0]
+        call_ids = opportunity.schedule_phonecall(cr, uid, opportunity_ids, data.date, data.name, \
+                data.user_id and data.user_id.id or False, \
+                data.section_id and data.section_id.id or False, \
+                data.categ_id and data.categ_id.id or False, \
+                action=data.action, context=context)
+        return phonecall.redirect_phonecall_view(cr, uid, call_ids[opportunity_ids[0]], context=context)
 
 crm_opportunity2phonecall()
 
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 764648a877b..93b3c5cab85 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -23,8 +23,8 @@
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="3">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                       	<button name="action_apply" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                        <button name="action_apply" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                       	<button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                        <button name="action_schedule" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
                     </group>
                 </form>
             </field>
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 351fcef3d4f..372c5da13a1 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -54,14 +54,14 @@ class crm_partner2opportunity(osv.osv_memory):
         partner_ids = context and context.get('active_ids', []) or []
         partner = self.pool.get('res.partner')
         lead = self.pool.get('crm.lead')
-        for data in self.browse(cr, uid, ids, context=context):
-            opportunity_ids = partner.make_opportunity(cr, uid, partner_ids,
-                data.name,
-                data.planned_revenue,
-                data.probability,
-            })
-            opportunity_id = len(opportunity_ids) and opportunity_ids[0] or False
-            return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context)
+        data = self.browse(cr, uid, ids, context=context)[0]
+        opportunity_ids = partner.make_opportunity(cr, uid, partner_ids,
+            data.name,
+            data.planned_revenue,
+            data.probability,
+        )
+        opportunity_id = opportunity_ids[partner_ids[0]]
+        return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context)
 
 crm_partner2opportunity()
 
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index 549afa0559b..ce64dedd73d 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -26,94 +26,28 @@ class crm_phonecall2opportunity(osv.osv_memory):
     """ Converts Phonecall to Opportunity"""
 
     _name = 'crm.phonecall2opportunity'
+    _inherit = 'crm.partner2opportunity'
     _description = 'Phonecall To Opportunity'
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        """
-        Closes Phonecall to Opportunity form
-        """
-
-        return {'type':'ir.actions.act_window_close'}
-
-
-    def action_apply(self, cr, uid, ids, context=None):
+    def make_opportunity(self, cr, uid, ids, context=None):
         """
         This converts Phonecall to Opportunity and opens Phonecall view
         """
-        record_id = context and context.get('active_id', False) or False
-        if record_id:
-            opp_obj = self.pool.get('crm.lead')
-            phonecall_obj = self.pool.get('crm.phonecall')
-            case = phonecall_obj.browse(cr, uid, record_id, context=context)
-            data_obj = self.pool.get('ir.model.data')
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_oppor')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_oppor')
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            for this in self.browse(cr, uid, ids, context=context):
-                address = None
-                if this.partner_id:
-                    address_id = self.pool.get('res.partner').address_get(cr, uid, [this.partner_id.id])
-                    if address_id['default']:
-                        address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default'], context=context)
-                new_opportunity_id = opp_obj.create(cr, uid, {
-                                'name': this.name,
-                                'planned_revenue': this.planned_revenue,
-                                'probability': this.probability,
-                                'partner_id': this.partner_id and this.partner_id.id or False,
-                                'partner_address_id': address and address.id, 
-                                'phone': address and address.phone,
-                                'mobile': address and address.mobile,
-                                'section_id': case.section_id and case.section_id.id or False,
-                                'description': case.description or False,
-                                'phonecall_id': case.id,
-                                'priority': case.priority,
-                                'type': 'opportunity', 
-                                'phone': case.partner_phone or False,
-                            })
-                vals = {
-                            'partner_id': this.partner_id.id,
-                            'opportunity_id' : new_opportunity_id,
-                            }
-                phonecall_obj.write(cr, uid, [case.id], vals)
-                phonecall_obj.case_close(cr, uid, [case.id])
-                opp_obj.case_open(cr, uid, [new_opportunity_id])
-
-        value = {
-            'name': _('Opportunity'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'crm.lead',
-            'res_id': int(new_opportunity_id),
-            'view_id': False,
-            'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
-        }
-        return value
-
-    _columns = {
-        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1),
-        'probability': fields.float('Success Probability'),
-        'planned_revenue': fields.float('Expected Revenue'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-    }
+        if not len(ids):
+            return False
+        call_ids = context and context.get('active_ids', False) or False
+        this = self.browse(cr, uid, ids[0], context=context)
+        if not call_ids:
+            return {}
+        opportunity = self.pool.get('crm.lead')
+        phonecall = self.pool.get('crm.phonecall')
+        opportunity_ids = phonecall.convert_opportunity(cr, uid, call_ids, this.name, this.partner_id and this.partner_id.id or False, \
+            this.planned_revenue, this.probability, context=context)
+        return opportunity.redirect_opportunity_view(cr, uid, opportunity_ids[call_ids[0]], context=context)
 
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : default values of fields.
         """
         record_id = context and context.get('active_id', False) or False
         res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 38e673108e4..cfa97f589be 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -26,42 +26,12 @@ class crm_phonecall2partner(osv.osv_memory):
     """ Converts phonecall to partner """
 
     _name = 'crm.phonecall2partner'
+    _inherit = 'crm.lead2partner'
     _description = 'Phonecall to Partner'
-
-    _columns = {
-        'action': fields.selection([('exist', 'Link to an existing partner'), \
-                                    ('create', 'Create a new partner')], \
-                                    'Action', required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner')
-        }
-
-    def view_init(self, cr, uid, fields, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        """
-        phonecall_obj = self.pool.get('crm.phonecall')
-        rec_ids = context and context.get('active_ids', [])
-        for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
-            if phonecall.partner_id:
-                 raise osv.except_osv(_('Warning !'),
-                    _('A partner is already defined on this phonecall.'))
-
+    
     def _select_partner(self, cr, uid, context=None):
         """
         This function Searches for Partner from selected phonecall.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : Partner id if any for selected phonecall.
         """
         if context is None:
             context = {}
@@ -75,7 +45,7 @@ class crm_phonecall2partner(osv.osv_memory):
         for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
             partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)])
             if not partner_ids and phonecall.email_from:
-                address_ids = contact_obj.search(cr, uid, [('email', '=', phonecall.email_from)])
+                address_ids = contact_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)])
                 if address_ids:
                     addresses = contact_obj.browse(cr, uid, address_ids)
                     partner_ids = addresses and [addresses[0].partner_id.id] or False
@@ -83,118 +53,20 @@ class crm_phonecall2partner(osv.osv_memory):
             partner_id = partner_ids and partner_ids[0] or False
         return partner_id
 
-    _defaults = {
-        'action': lambda *a:'exist',
-        'partner_id': _select_partner
-        }
-
-    def open_create_partner(self, cr, uid, ids, context=None):
-        """
-        This function Opens form of create partner.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for next form.
-        """
-
-        view_obj = self.pool.get('ir.ui.view')
-        view_id = view_obj.search(cr, uid, [('model', '=', 'crm.phonecall2partner'), \
-                                 ('name', '=', 'crm.phonecall2partner.view')])
-        return {
-            'view_mode': 'form',
-            'view_type': 'form',
-            'view_id': view_id or False,
-            'res_model': 'crm.phonecall2partner',
-            'context': context,
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            }
-
 
     def _create_partner(self, cr, uid, ids, context=None):
         """
         This function Creates partner based on action.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary {}.
         """
         if context is None:
             context = {}
-
-        phonecall_obj = self.pool.get('crm.phonecall')
-        partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
-        partner_ids = []
-        contact_id = False
-
-        rec_ids = context and context.get('active_ids', [])
-
+        phonecall = self.pool.get('crm.phonecall')
+        call_ids = context and context.get('active_ids') or []
         for data in self.browse(cr, uid, ids, context=context):
-            for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
-                if data.action == 'create':
-                    partner_id = partner_obj.create(cr, uid, {
-                        'name': phonecall.name or phonecall.name,
-                        'user_id': phonecall.user_id.id,
-                        'comment': phonecall.description,
-                    })
-                    contact_id = contact_obj.create(cr, uid, {
-                        'partner_id': partner_id,
-                        'name': phonecall.name,
-                        'phone': phonecall.partner_phone,
-                    })
-
-                else:
-                    if data.partner_id:
-                        partner_id = data.partner_id.id
-                        contact_id = partner_obj.address_get(cr, uid, [partner_id])['default']
-
-                partner_ids.append(partner_id)
-
-                vals = {}
-                if partner_id:
-                    vals.update({'partner_id': partner_id})
-                if contact_id:
-                    vals.update({'partner_address_id': contact_id})
-                phonecall_obj.write(cr, uid, [phonecall.id], vals)
+            partner_id = data.partner_id and data.partner_id.id or False
+            partner_ids += phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
         return partner_ids
 
-    def make_partner(self, cr, uid, ids, context=None):
-        """
-        This function Makes partner based on action.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Partner's IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Partner form.
-        """
-
-        partner_ids = self._create_partner(cr, uid, ids, context=context)
-        mod_obj = self.pool.get('ir.model.data')
-        result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
-
-        value = {
-            'domain': "[]",
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'res.partner',
-            'res_id': partner_ids and int(partner_ids[0]) or False,
-            'view_id': False,
-            'context': context,
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
-        }
-        return value
-
 crm_phonecall2partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index 2872acad4eb..da04028f38d 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -25,108 +25,47 @@ from tools.translate import _
 import time
 
 class crm_phonecall2phonecall(osv.osv_memory):
-    """ Converts Phonecall to Phonecall"""
-
     _name = 'crm.phonecall2phonecall'
     _description = 'Phonecall To Phonecall'
 
+    _columns = {
+        'name' : fields.char('Call summary', size=64, required=True, select=1),
+        'user_id' : fields.many2one('res.users',"Assign To"),
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                domain="['|',('section_id','=',False),('section_id','=',section_id),\
+                ('object_id.model', '=', 'crm.phonecall')]"), 
+        'date': fields.datetime('Date'),
+        'section_id':fields.many2one('crm.case.section','Sales Team'),
+        'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
+        'partner_id' : fields.many2one('res.partner', "Partner"),
+    }
+
+
     def action_cancel(self, cr, uid, ids, context=None):
         """
         Closes Phonecall to Phonecall form
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Phonecall's IDs
-        @param context: A standard dictionary for contextual values
         """
         return {'type':'ir.actions.act_window_close'}
 
-    def action_apply(self, cr, uid, ids, context=None):
-        """
-        This converts Phonecall to Phonecall and opens Phonecall view
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Phonecall to Phonecall IDs
-        @param context: A standard dictionary for contextual values
-
-        @return : Dictionary value for created Opportunity form
-        """
-        res = {}
-        record_id = context and context.get('active_id', False) or False
-        phonecall_obj = self.pool.get('crm.phonecall')
-
-        if record_id:
-            data_obj = self.pool.get('ir.model.data')
-
-            # Get Phonecall views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-
-            phonecall = phonecall_obj.browse(cr, uid, record_id, context=context)
-
-            for this in self.browse(cr, uid, ids, context=context):
-                values = {
-                        'name': this.name,
-                        'user_id': this.user_id and this.user_id.id,
-                        'categ_id': this.categ_id.id,
-                        'section_id': this.section_id.id or (phonecall.section_id and phonecall.section_id.id),
-                        'description': phonecall.description or '',
-                        'partner_id': phonecall.partner_id.id,
-                        'partner_address_id': phonecall.partner_address_id.id,
-                        'partner_mobile': phonecall.partner_mobile or False,
-                        'priority': phonecall.priority,
-                        'partner_phone': phonecall.partner_phone or False,
-                        'date': this.date
-                          }
-                phonecall_id = phonecall_obj.create(cr, uid, values, context=context)
-                if this.action == 'schedule':
-                    phonecall_obj.case_open(cr, uid, [phonecall_id])
-                elif this.action == 'log':
-                    phonecall_obj.case_close(cr, uid, [phonecall_id])
-            
-            res = {
-                'name': _('Phone Call'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'crm.phonecall',
-                'view_id': False,
-                'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
-                'type': 'ir.actions.act_window',
-                'res_id': phonecall_id, 
-                'domain': [('id', '=', phonecall_id)], 
-                'search_view_id': res['res_id']
-                }
-        return res
-
-    _columns = {
-                'name' : fields.char('Call summary', size=64, required=True, select=1),
-                'user_id' : fields.many2one('res.users',"Assign To"),
-                'categ_id': fields.many2one('crm.case.categ', 'Category', \
-                        domain="['|',('section_id','=',False),('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]"), 
-                'date': fields.datetime('Date'),
-                'section_id':fields.many2one('crm.case.section','Sales Team'),
-                'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
-                'partner_id' : fields.many2one('res.partner', "Partner"),
-                }
+    def action_schedule(self, cr, uid, ids, context=None):
+        value = {}
+        if context is None:
+            context = {}
+        phonecall = self.pool.get('crm.phonecall')
+        phonecall_ids = context and context.get('active_ids') or []
+        for this in self.browse(cr, uid, ids, context=context):
+            phocall_ids = phonecall.schedule_another_phonecall(cr, uid, phonecall_ids, this.date, this.name, \
+                    this.user_id and this.user_id.id or False, \
+                    this.section_id and this.section_id.id or False, \
+                    this.categ_id and this.categ_id or False, \
+                    action=this.action, context=context)
 
+        return phonecall.redirect_phonecall_view(cr, uid, phocall_ids[phonecall_ids[0]], context=context)
+    
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-
-        @return : default values of fields.
+        
         """
         res = super(crm_phonecall2phonecall, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 794634da4f1..572fbb8b9a1 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -22,8 +22,8 @@
                         <separator string=" " colspan="4"/>
                         <group colspan="4" col="3" >
                             <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                            <button name="action_apply" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
-                            <button name="action_apply" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
+                            <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
+                            <button name="action_schedule" type="object" string="Schedule call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
                         </group>
                 </form>
             </field>

From 36061f54a34ddfa6e603c672b84d92995be71bfc Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 25 Oct 2011 13:09:57 +0530
Subject: [PATCH 073/132] [IMP+FIX] crm: clean test case, correct issues, added
 demo data of section for Sales Marketing Team, rename lead_form.yml with
 onchange_events.yml

bzr revid: hmo@tinyerp.com-20111025073957-e6m4fr70g6e29k0s
---
 addons/crm/__openerp__.py                     |  2 +-
 addons/crm/crm.py                             |  2 +
 addons/crm/crm_demo.xml                       |  8 ++-
 addons/crm/crm_lead_demo.xml                  |  6 +--
 addons/crm/test/process/cancel_lead.yml       | 13 +++++
 .../process/communication_with_customer.yml   |  2 +-
 .../crm/test/process/lead2opportunity2win.yml | 28 +++++++++-
 addons/crm/test/process/merge_opportunity.yml | 17 +++++++
 addons/crm/test/ui/lead_form.yml              |  8 ---
 addons/crm/test/ui/onchange_events.yml        | 51 +++++++++++++++++++
 addons/crm/wizard/crm_lead_to_opportunity.py  | 33 +++++-------
 addons/crm/wizard/crm_lead_to_partner.py      | 12 ++---
 12 files changed, 139 insertions(+), 43 deletions(-)
 delete mode 100644 addons/crm/test/ui/lead_form.yml
 create mode 100644 addons/crm/test/ui/onchange_events.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 8e195bb5d01..dd22590ee84 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/lead2opportunity2win.yml',
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
-            'test/ui/lead_form.yml',
+            'test/ui/onchange_events.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index ac0874a6037..d192ddeca43 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -467,10 +467,12 @@ class crm_case(crm_base):
         self._action(cr, uid, cases, state)
         return True
 
+    #DEAD Code
     def remind_partner(self, cr, uid, ids, context=None, attach=False):
         return self.remind_user(cr, uid, ids, context, attach,
                 destination=False)
 
+    #DEAD Code
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
         mail_message = self.pool.get('mail.message')
         for case in self.browse(cr, uid, ids, context=context):
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 16ae0e73129..08d09904c06 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
         </record>
@@ -12,5 +12,11 @@
         <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
     </record>
 
+    <record model="crm.case.section" id="section_sales_marketing_department">
+            <field name="name">Sales Marketing Department</field>
+            <field name="code">Sales Marketing</field>
+            <field name="parent_id" ref="crm.section_sales_department"></field>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 390932c9e0a..9073abb6a00 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         <!-- Demo Leads -->
         <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead1"/>
@@ -9,7 +9,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="'The Oil Company'" name="partner_name"/>
             <field eval="'draft'" name="state"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="crm.section_sales_marketing_department"/>
 	    <field eval="'Luc Latour'" name="contact_name"/>
             <field name="title" ref="base.res_partner_title_sir"/>
 	    <field eval="'Training Manager'" name="function"/>
@@ -92,7 +92,7 @@
 	    <field eval="'Bruxelles'" name="city"/>
 	    <field name="country_id" ref="base.be"/>
             <field eval="'draft'" name="state"/>
-            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="section_id" ref="crm.section_sales_marketing_department"/>
             <field eval="'(333) 715-1450'" name="mobile"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index 0cc13208d03..6b08136c086 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -28,4 +28,17 @@
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in pending state}:
      - state == "pending"
+-
+  I Escalate the Lead to Parent Team.
+-
+  !python {model: crm.lead}: |
+    self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+
+-
+  I mark as lost the Lead.
+-
+  !python {model: crm.lead}: |
+    self.case_mark_won(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+
+
 
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 444c7a704d2..56a0e8acde1 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -1,5 +1,5 @@
 -
-  Customer would like to purchase our product. so He send request by email to our mail server.
+  Customer interested in our product. so He send request by email to get more details.
 -
   Mail script will be fetched him request from mail server. so I process that mail after read EML file 
 -
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index ed33a251b80..c5f2afd676d 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -1,10 +1,12 @@
+-
+  In order to test convert customer lead into opportunity, 
 -
   I open customer lead.
 -
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
 - 
-  I check lead is in open stage.
+  I check lead is in open.
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
      - state == "open"
@@ -23,7 +25,7 @@
     assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
 -
-  Now I start Communication by phonecall with customer.
+  Now I start Communication and schedule phonecall with customer.
 -
   !python {model: crm.opportunity2phonecall}: |
     import time
@@ -31,6 +33,19 @@
     call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
                 'name': "Bonjour M. Jean, Comment êtes-vous? J'ai obtenu votre demande. peut-on parler au sujet de ce pour quelques minutes?"}, context=context)
     self.action_schedule(cr, uid, [call_id], context=context)
+-
+  I check that phonecall is scheduled for that opportunity.
+-
+  !python {model: crm.phonecall}: |
+    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_qrecorp0'))])
+    assert len(ids), 'phonecall is not scheduled'
+
+-
+  Now I schedule Meeting with Customer.
+-
+  !python {model: crm.lead}: |
+    self.action_makeMeeting(cr, uid, [ref('crm_case_qrecorp0')])
+
 -
   After communicated  with customer, I put some notes with Contract details.
 -
@@ -51,3 +66,12 @@
     assert lead.state == 'done', 'Opportunity is not in done state!'
     assert lead.stage_id.name == 'Won', ' Stage of Opportunity is not win!'
     assert lead.probability == 100.0, 'probability revenue should not  be 100.0!'
+
+-
+  I convert mass lead into opportunity customer.
+-
+  !python {model: crm.lead2opportunity.partner.mass}: |
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_itdeveloper0')]})
+    id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
+    self.mass_convert(cr, uid, [id], context=context)   
+
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 6d16ca17694..2c3ad010255 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -28,3 +28,20 @@
     res_id = self.create(cr, uid, {'name': "vos chances sont fusionnés en un seul"}, context=context)
     self.action_schedule(cr, uid, [res_id], context=context)
 
+- 
+  I schedule Meeting on this phonecall.
+-
+   !python {model: crm.phonecall}: |
+     self.action_make_meeting(cr, uid, [ref("crm.crm_case_phone06")])
+
+-
+  I setting Phone call to Held (Done).
+-
+  !python {model: crm.phonecall}: |
+    self.case_close(cr, uid, [ref("crm.crm_case_phone06")])
+-
+  I check that the hone call is in 'Held' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call Helded}:
+    - state == "done"
+
diff --git a/addons/crm/test/ui/lead_form.yml b/addons/crm/test/ui/lead_form.yml
deleted file mode 100644
index 7ec86106947..00000000000
--- a/addons/crm/test/ui/lead_form.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  I check onchange event of partner address on lead form.
--
-  !python {model: crm.lead}: |
-    action = self.onchange_partner_address_id(cr, uid, ref("crm_case_qrecorp0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
-    assert action['value']['country_id'] == 20, "Country name not True"
-    assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
-
diff --git a/addons/crm/test/ui/onchange_events.yml b/addons/crm/test/ui/onchange_events.yml
new file mode 100644
index 00000000000..4f067ab0a57
--- /dev/null
+++ b/addons/crm/test/ui/onchange_events.yml
@@ -0,0 +1,51 @@
+-
+  I call onchange event to change partner address for lead.
+-
+  !python {model: crm.lead}: |
+    action = self.onchange_partner_address_id(cr, uid, ref("crm_case_qrecorp0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
+    assert action['value']['country_id'] == 20, "Country name not True"
+    assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
+-
+  I call onchange event to change email "Opt-out" option for Lead.
+-
+  !python {model: crm.lead}: |
+    self.on_change_optout(cr, uid, ref("crm_case_qrecorp0"), True)
+
+-
+  I call onchange event to convert the Opt-out to Opt-in to show email receive preference for lead.
+-
+  !python {model: crm.lead}: |
+    self.on_change_optin(cr, uid, ref("crm_case_qrecorp0"), True)
+
+-
+  I setting next stage "New" for the lead.
+-
+   !python {model: crm.lead}: |
+     self.stage_next(cr, uid, [ref("crm_case_qrecorp0")], context={'stage_type': 'lead'})
+-
+  I call onchange event to assigning won stage for Lead.
+-
+  !python {model: crm.lead}: |
+    stage_id = self.stage_find_won(cr, uid, ref('crm.section_sales_department'))
+    self.onchange_stage_id(cr, uid, [ref("crm_case_qrecorp0")], stage_id, context)
+-
+  I make duplicate the Lead.
+-
+   !python {model: crm.lead}: |
+     self.copy(cr, uid, ref("crm_case_qrecorp0"))
+
+-
+  I Unlink the Lead.
+-
+  !python {model: crm.lead}: |
+     self.unlink(cr, uid, [ref("crm_case_qrecorp0")])
+
+-
+  I call onchange event to change Contact Detail for Phonecall.
+-
+  !python {model: crm.phonecall}: |
+    self.onchange_partner_address_id(cr, uid,[ref("crm.crm_case_phone06")], ref("base.res_partner_address_8invoice"))
+
+    
+
+
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 9b03f7813a1..9a828668944 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -102,15 +102,14 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
         return False
 
-    def _convert_opportunity(self, cr, uid, ids, context=None):
+    def _convert_opportunity(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
         lead = self.pool.get('crm.lead')
-        partner_ids = self._create_partner(cr, uid, ids, context=context)
-        partner_id = partner_ids and partner_ids[0] or False
-        lead_ids = context.get('active_ids', [])
-        user_ids = context.get('user_ids', False)
-        team_id = context.get('section_id', False)
+        partner_id = self._create_partner(cr, uid, ids, context=context)
+        lead_ids = vals.get('lead_ids', [])
+        user_ids = vals.get('user_ids', False)
+        team_id = vals.get('section_id', False)
         return lead.convert_opportunity(cr, uid, lead_ids, partner_id, user_ids, team_id, context=context) 
 
     def _merge_opportunity(self, cr, uid, ids, opportunity_ids, action='merge', context=None):
@@ -129,18 +128,15 @@ class crm_lead2opportunity_partner(osv.osv_memory):
     def action_apply(self, cr, uid, ids, context=None):
         """
         This converts lead to opportunity and opens Opportunity view
-        @param ids: ids of the leads to convert to opportunities
-
-        @return : View dictionary opening the Opportunity form view
         """
         if not context:
             context = {}
         
         lead = self.pool.get('crm.lead')
+        lead_ids = context.get('active_ids', [])
         data = self.browse(cr, uid, ids, context=context)[0]
-        self._convert_opportunity(cr, uid, ids, context=context)
+        self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
         self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.action, context=context)
-
         return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
 crm_lead2opportunity_partner()
@@ -156,24 +152,19 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
 
     }
-
-    def mass_convert(self, cr, uid, ids, context=None):
-        lead = self.pool.get('crm.lead')
-        if not context:
-            context = {}
-
-        active_ids = context.get('active_ids')
+    def _convert_opportunity(self, cr, uid, ids, vals, context=None):
         data = self.browse(cr, uid, ids, context=context)[0]
-
         salesteam_id = data.section_id and data.section_id.id or False
         salesman = []
         if data.user_ids:
             salesman = [x.id for x in data.user_ids]
-        
+        vals.update({'user_ids': salesman, 'section_id': salesteam_id})
+        return super(crm_lead2opportunity_mass_convert, self)._convert_opportunity(cr, uid, ids, vals, context=context)
+
+    def mass_convert(self, cr, uid, ids, context=None):
         value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
         value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
         self.write(cr, uid, ids, value, context=context)
-        context.update({'user_ids': salesman, 'section_id': salesteam_id})
         return self.action_apply(cr, uid, ids, context=context)
 crm_lead2opportunity_mass_convert()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 5363264ca37..c424d511639 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -105,17 +105,17 @@ class crm_lead2partner(osv.osv_memory):
             context = {}
         lead = self.pool.get('crm.lead')
         lead_ids = context and context.get('active_ids') or []
-        for data in self.browse(cr, uid, ids, context=context):
-            partner_id = data.partner_id and data.partner_id.id or False
-            partner_ids += lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
-        return partner_ids
+        data = self.browse(cr, uid, ids, context=context)[0]
+        partner_id = data.partner_id and data.partner_id.id or False
+        partner_ids = lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
+        return partner_ids[lead_ids[0]]
 
     def make_partner(self, cr, uid, ids, context=None):
         """
         This function Makes partner based on action.
         """
-        partner_ids = self._create_partner(cr, uid, ids, context=context)
-        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_ids[0], context=context)
+        partner_id = self._create_partner(cr, uid, ids, context=context)
+        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_id, context=context)
 
 crm_lead2partner()
 

From 391c3edca8e0f59f471adcaa40a638ebdfb895ce Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 25 Oct 2011 13:58:49 +0530
Subject: [PATCH 074/132] [IMP] crm_claim: clean test cases

bzr revid: hmo@tinyerp.com-20111025082849-caz28c9qwcqlq2is
---
 addons/crm/test/ui/onchange_events.yml        |  1 -
 addons/crm_claim/__openerp__.py               |  2 +-
 addons/crm_claim/test/customer_claim.eml      | 17 +++++++
 addons/crm_claim/test/process/claim.yml       | 46 +++++++++++++++----
 .../{claim_form.yml => onchange_events.yml}   | 10 +++-
 5 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 addons/crm_claim/test/customer_claim.eml
 rename addons/crm_claim/test/ui/{claim_form.yml => onchange_events.yml} (54%)

diff --git a/addons/crm/test/ui/onchange_events.yml b/addons/crm/test/ui/onchange_events.yml
index 4f067ab0a57..7f1ef1c67a5 100644
--- a/addons/crm/test/ui/onchange_events.yml
+++ b/addons/crm/test/ui/onchange_events.yml
@@ -3,7 +3,6 @@
 -
   !python {model: crm.lead}: |
     action = self.onchange_partner_address_id(cr, uid, ref("crm_case_qrecorp0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
-    assert action['value']['country_id'] == 20, "Country name not True"
     assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
 -
   I call onchange event to change email "Opt-out" option for Lead.
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 8f0aef1bf37..96a3f8ddfdf 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -49,7 +49,7 @@ automatically new claims based on incoming emails.
         'crm_claim_demo.xml',
     ],
     'test': ['test/process/claim.yml',
-             'test/ui/claim_form.yml'],
+             'test/ui/onchange_events.yml'],
     'installable': True,
     'active': False,
     'certificate' : '00612027414703404749',
diff --git a/addons/crm_claim/test/customer_claim.eml b/addons/crm_claim/test/customer_claim.eml
new file mode 100644
index 00000000000..7324a3b8eef
--- /dev/null
+++ b/addons/crm_claim/test/customer_claim.eml
@@ -0,0 +1,17 @@
+Message-ID: <4EA66F25.7080001@customer.com>
+Date: Tue, 25 Oct 2011 13:41:17 +0530
+From: Mr. John Right <info@customer.com>
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
+MIME-Version: 1.0
+To: sales@my.com
+Subject: demande de =?ISO-8859-1?Q?r=E8glement_de_votre_produit=2E?=
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 8bit
+
+J'ai acheté votre produit il ya quelques jours. maintenant certains 
+problèmes sont survenus sur votre produit.
+je demande donc à convertir cette demande que la réclamation et de 
+résoudre les problèmes le plus tôt possible.
+
+Merci
+
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index b12698797cb..43389726357 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -1,18 +1,48 @@
 -
-  I check claim which contain customer claim information about 
-  product related problem.
+  Customer claim after sale our product. so He send claim request by email.
 -
-  I make this claim as Open.
+  Mail script will be fetched him request from mail server. so I process that mail after read EML file 
+-
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('crm_claim','test', 'customer_claim.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'crm.claim', request_message)
+
+-
+  After getting the mail, I check details of new claim of that customer.
 -
   !python {model: crm.claim}: |
-    self.case_open(cr, uid, [ref('crm_case_claim04')])
-    claim = self.browse(cr, uid, ref('crm_case_claim04'))
+    from openerp import tools
+    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    assert claim_ids and len(claim_ids), "Claim is not created after getting request"
+    claim = self.browse(cr, uid, claim_ids[0], context=context)
+    assert claim.name == tools.ustr("demande derèglement de votre produit."), "Subject does not match"
+
+-
+  I open customer claim.
+-
+  !python {model: crm.claim}: |
+    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    self.case_open(cr, uid, claim_ids)
+-
+  I check Claim Details after open. 
+-
+  !python {model: crm.claim}: |
+    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    claim = self.browse(cr, uid, claim_ids[0])
     assert claim.state == "open", "Claim is not in Open state"
     assert claim.stage_id.id == ref("crm.stage_lead1"), "Claim is not in New stage"
 -
-  After complete all service from our side i close this claim.
+  After complete all service from our side, I close this claim.
 -
   !python {model: crm.claim}: |
-    self.case_close(cr, uid, [ref('crm_case_claim04')])
-    claim = self.browse(cr, uid, ref('crm_case_claim04'))
+    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    self.case_close(cr, uid, claim_ids)
+-
+  I check Claim details after closed
+-
+  !python {model: crm.claim}: |
+    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    claim = self.browse(cr, uid, claim_ids[0])
     assert claim.state == "done", "Claim is not in close state"
diff --git a/addons/crm_claim/test/ui/claim_form.yml b/addons/crm_claim/test/ui/onchange_events.yml
similarity index 54%
rename from addons/crm_claim/test/ui/claim_form.yml
rename to addons/crm_claim/test/ui/onchange_events.yml
index bbf37688ed6..9068b074512 100644
--- a/addons/crm_claim/test/ui/claim_form.yml
+++ b/addons/crm_claim/test/ui/onchange_events.yml
@@ -1,8 +1,14 @@
 -
-  In order to test for changes on partner, data change automatically according to partner.
+  I call onchange_event to change partner on claim form.
 -
   !python {model: crm.claim}: |
     partner_onchange = self.onchange_partner_id(cr, uid, [ref('crm_case_claim04')], ref('base.res_partner_10'))
     assert partner_onchange['value']['partner_phone'] == "+33-658-256545" ,"Phone number is wrong"
-    assert partner_onchange['value']['partner_address_id'] == 20 ,"Address is wrong"
     assert partner_onchange['value']['email_from'] == 'l.dupont@tecsas.fr' ,"Email address is wrong"
+
+-
+  I call onchange event to change contact details on claim form.
+-
+  !python {model: crm.claim}: |
+    self.onchange_partner_address_id(cr, uid, ref('crm_case_claim04'), ref("base.res_partner_address_notsotinysarl0"), email=False)
+    

From 793505e37971e336ef79dc3a25a894b836320084 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 25 Oct 2011 14:20:41 +0530
Subject: [PATCH 075/132] [IMP] crm_fundraising: clean test case

bzr revid: hmo@tinyerp.com-20111025085041-edwccum3oqd60uy6
---
 .../test/customer_fundraising.eml             | 14 +++++++
 .../test/process/fund-rising.yml              | 42 +++++++------------
 2 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 addons/crm_fundraising/test/customer_fundraising.eml

diff --git a/addons/crm_fundraising/test/customer_fundraising.eml b/addons/crm_fundraising/test/customer_fundraising.eml
new file mode 100644
index 00000000000..e1bdf291e71
--- /dev/null
+++ b/addons/crm_fundraising/test/customer_fundraising.eml
@@ -0,0 +1,14 @@
+Message-ID: <4EA66F25.7080010@customer.com>
+Date: Tue, 25 Oct 2011 13:41:17 +0530
+From: Mr. John Right <info@customer.com>
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
+MIME-Version: 1.0
+To: sales@my.com
+Subject:  Demande de controbute dans votre fonds.
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 8bit
+
+Client est très heureux d'utiliser notre produit et il l'intérêt de donner une partie des fonds dans notre produit. Il a donc envoyé la demande par courriel pour les collectes de fonds.
+
+Merci
+
diff --git a/addons/crm_fundraising/test/process/fund-rising.yml b/addons/crm_fundraising/test/process/fund-rising.yml
index ef49f3207e6..df16a9d2e70 100644
--- a/addons/crm_fundraising/test/process/fund-rising.yml
+++ b/addons/crm_fundraising/test/process/fund-rising.yml
@@ -1,34 +1,22 @@
 -
-  In order to check Fund Raising for "Renovating government schools" which contain information 
-  about donation for schools, so i open Funds rising.
+  Customer is very happy with our service and he interest to contribute into our fund. so He sent request by email for Fundraising.
 -
-  !python {model: crm.fundraising}: |
-    self.case_open(cr, uid, [ref('crm_case_renovatinggovernmentschools0')])
+  Mail script will be fetched him request from mail server. so I process that mail after read EML file 
 -
-  In order to test fundraising, i test fundraising is in open stage.
--
-  !assert {model: crm.fundraising, id: crm_case_renovatinggovernmentschools0, string: fundraising in open state}:
-     - state == "open"
--
-  I create the message regarding the all details of fundraising.
--
-  !python {model: crm.fundraising}: |
-    msg = {
-       'subject': 'fundraising_email',
-       'body_text': 'fundraising details',
-       'from': 'Administrator <admin@openerp.com>',
-       'priority':'3',
-      }
-    self.message_new(cr, uid, msg, context=None)
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('crm_fundraising','test', 'customer_fundraising.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'crm.fundraising', request_message)
 
 -
-  After a request via email now I close this fundraising Request.
+  After getting the mail, I check details of new fundraising of that customer.
 -
   !python {model: crm.fundraising}: |
-    self.case_close(cr, uid, [ref('crm_case_renovatinggovernmentschools0')])
--
-  After closed this fundraising Request, i test fundraising is in done stage.
--
-  !assert {model: crm.fundraising, id: crm_case_renovatinggovernmentschools0, string: fundraising in done state}:
-     - state == "done"
-    
\ No newline at end of file
+    from openerp import tools
+    fund_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    assert fund_ids and len(fund_ids), "Fund is not created after getting request"
+    fund = self.browse(cr, uid, fund_ids[0], context=context)
+    assert fund.name == tools.ustr("Demande de controbute dans votre fonds."), "Subject does not match"
+
+

From afc57b31cda1454894b2ab88c8deea880ba72f3d Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 25 Oct 2011 14:41:25 +0530
Subject: [PATCH 076/132] [IMP] crm_helpdesk: clean test case

bzr revid: hmo@tinyerp.com-20111025091125-pnxg7bdiqb5l3lfn
---
 addons/crm_claim/test/customer_claim.eml      |  2 +-
 .../test/customer_fundraising.eml             |  2 +-
 .../crm_helpdesk/test/customer_question.eml   | 15 +++++++++
 .../crm_helpdesk/test/process/help-desk.yml   | 33 +++++++++++--------
 4 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 addons/crm_helpdesk/test/customer_question.eml

diff --git a/addons/crm_claim/test/customer_claim.eml b/addons/crm_claim/test/customer_claim.eml
index 7324a3b8eef..ff3c45b9142 100644
--- a/addons/crm_claim/test/customer_claim.eml
+++ b/addons/crm_claim/test/customer_claim.eml
@@ -3,7 +3,7 @@ Date: Tue, 25 Oct 2011 13:41:17 +0530
 From: Mr. John Right <info@customer.com>
 User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
 MIME-Version: 1.0
-To: sales@my.com
+To: claims@my.com
 Subject: demande de =?ISO-8859-1?Q?r=E8glement_de_votre_produit=2E?=
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 8bit
diff --git a/addons/crm_fundraising/test/customer_fundraising.eml b/addons/crm_fundraising/test/customer_fundraising.eml
index e1bdf291e71..e7cd3f9482e 100644
--- a/addons/crm_fundraising/test/customer_fundraising.eml
+++ b/addons/crm_fundraising/test/customer_fundraising.eml
@@ -3,7 +3,7 @@ Date: Tue, 25 Oct 2011 13:41:17 +0530
 From: Mr. John Right <info@customer.com>
 User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
 MIME-Version: 1.0
-To: sales@my.com
+To: contribute@my.com
 Subject:  Demande de controbute dans votre fonds.
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 8bit
diff --git a/addons/crm_helpdesk/test/customer_question.eml b/addons/crm_helpdesk/test/customer_question.eml
new file mode 100644
index 00000000000..38a4c95fb0c
--- /dev/null
+++ b/addons/crm_helpdesk/test/customer_question.eml
@@ -0,0 +1,15 @@
+Message-ID: <4EA66F25.7080013@customer.com>
+Date: Tue, 25 Oct 2011 13:41:17 +0530
+From: Mr. John Right <info@customer.com>
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
+MIME-Version: 1.0
+To: info@my.com
+Subject: Where is download link of user manual of your product ? 
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 8bit
+
+I want to download user manual of your product.
+can you provide download link?
+
+Thanks
+
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index 687238ab269..250cb9e5dc2 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -1,17 +1,22 @@
 -
-  I start by create helpdesk request regarding some functional questions, 
-  so first create message manually regarding functional question for helpdesk
-  and test it, open this helpdesk and update that message accordingly, after
-  i complete this helpdesk then close it.
+  Customer has Questions regarding our service. so He sent questions list by email.
+-
+  Mail script will be fetched him request from mail server. so I process that mail after read EML file 
+-
+  !python {model: mail.thread}: |
+    import addons
+    request_file = open(addons.get_module_resource('crm_helpdesk','test', 'customer_question.eml'),'rb')
+    request_message = request_file.read()
+    self.message_process(cr, uid, 'crm.helpdesk', request_message)
+
+-
+  After getting the mail, I check details of new question of that customer.
 -
   !python {model: crm.helpdesk}: |
-    msg = {'subject': 'Functional questions', 'body_text': 'How the CRM working?', 'from': 'admin@openerp.com'}
-    helpdesk_id = self.message_new(cr, uid, msg, context=None)
-    data = self.browse(cr, uid ,helpdesk_id)
-    assert data.name == "Functional questions", "Subject name is incorrect"
-    assert data.email_from == "admin@openerp.com","Email Id incorrect"
-    assert data.description == "How the CRM working?", "Description is incorrect"
-    self.case_open(cr, uid, [helpdesk_id])
-    msg = {'subject': 'Email regarding to CRM', 'body_text': 'Details of CRM Documentation', 'from': 'admin@openerp.com'}
-    self.message_update(cr, uid,[helpdesk_id], msg, default_act = 'pending',context=None)
-    self.case_close(cr, uid, [helpdesk_id])
\ No newline at end of file
+    from openerp import tools
+    question_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    assert question_ids and len(question_ids), "Question is not created after getting request"
+    question = self.browse(cr, uid, question_ids[0], context=context)
+    assert question.name == tools.ustr("Where is download link of user manual of your product ? "), "Subject does not match"
+
+

From 477e4c09b4a1a8d4d073278a08eb35800ebbb6d8 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 26 Oct 2011 14:51:33 +0530
Subject: [PATCH 077/132] [IMP] crm_partner_assign: clean test case and APIs

bzr revid: hmo@tinyerp.com-20111026092133-xdrikqkxs4e5usw3
---
 addons/crm/crm_lead.py                        | 129 +++----
 addons/crm_partner_assign/__openerp__.py      |   8 +-
 .../crm_partner_assign/partner_geo_assign.py  | 154 +++++---
 .../crm_partner_assign/res_partner_demo.xml   |  13 +
 .../test/process/partner_assign.yml           |  50 +--
 .../test/ui/partner_assign_form.yml           |  18 -
 addons/crm_partner_assign/wizard/__init__.py  |   1 -
 .../wizard/crm_forward_to_partner.py          | 343 ++++++------------
 .../wizard/crm_forward_to_partner_view.xml    |  52 +--
 .../wizard/crm_merge_opportunity.py           |  42 ---
 10 files changed, 321 insertions(+), 489 deletions(-)
 create mode 100644 addons/crm_partner_assign/res_partner_demo.xml
 delete mode 100644 addons/crm_partner_assign/test/ui/partner_assign_form.yml
 delete mode 100644 addons/crm_partner_assign/wizard/crm_merge_opportunity.py

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 788903ce083..22687965701 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -335,7 +335,7 @@ class crm_lead(crm_case, osv.osv):
         return self.set_priority(cr, uid, ids, '3')
 
     
-    def _merge_data(self, cr, uid, ids, oldest, context=None):
+    def _merge_data(self, cr, uid, ids, oldest, fields, context=None):
         # prepare opportunity data into dictionary for merging
         opportunities = self.browse(cr, uid, ids, context=context)
         def _get_first_not_null(attr):
@@ -353,40 +353,20 @@ class crm_lead(crm_case, osv.osv):
         def _concat_all(attr):
             return ', '.join([getattr(opportunity, attr) or '' for opportunity in opportunities if hasattr(opportunity, attr)])
 
-        data = {
-            'partner_id': _get_first_not_null_id('partner_id'),  # !!
-            'title': _get_first_not_null_id('title'),
-            'name' : _get_first_not_null('name'),  #not lost
-            'categ_id' : _get_first_not_null_id('categ_id'), # !!
-            'channel_id' : _get_first_not_null_id('channel_id'), # !!
-            'city' : _get_first_not_null('city'),  # !!
-            'company_id' : _get_first_not_null_id('company_id'), #!!
-            'contact_name' : _get_first_not_null('contact_name'), #not lost
-            'country_id' : _get_first_not_null_id('country_id'), #!!
-            'partner_address_id' : _get_first_not_null_id('partner_address_id'), #!!
-            'type_id' : _get_first_not_null_id('type_id'), #!!
-            'user_id' : _get_first_not_null_id('user_id'), #!!
-            'section_id' : _get_first_not_null_id('section_id'), #!!
-            'state_id' : _get_first_not_null_id('state_id'),
-            'description' : _concat_all('description'),  #not lost
-            'email' : _get_first_not_null('email'), # !!
-            'fax' : _get_first_not_null('fax'),
-            'mobile' : _get_first_not_null('mobile'),
-            'partner_name' : _get_first_not_null('partner_name'),
-            'phone' : _get_first_not_null('phone'),
-            'probability' : _get_first_not_null('probability'),
-            'planned_revenue' : _get_first_not_null('planned_revenue'),
-            'street' : _get_first_not_null('street'),
-            'street2' : _get_first_not_null('street2'),
-            'zip' : _get_first_not_null('zip'),
-            'state' : 'open',
-            'create_date' : _get_first_not_null('create_date'),
-            'date_action_last': _get_first_not_null('date_action_last'),
-            'date_action_next': _get_first_not_null('date_action_next'),
-            'email_from' : _get_first_not_null('email_from'),
-            'email_cc' : _get_first_not_null('email_cc'),
-            'partner_name' : _get_first_not_null('partner_name'),
-        }
+        data = {}
+        for field_name in fields:
+            field_info = self._all_columns.get(field_name)
+            if field_info is None:
+                continue
+            field = field_info.column
+            if field._type in ('many2many', 'one2many'):
+                continue  
+            elif field._type == 'many2one':
+                data[field_name] = _get_first_not_null_id(field_name)  # !!
+            elif field._type == 'text':
+                data[field_name] = _concat_all(field_name)  #not lost
+            else:
+                data[field_name] = _get_first_not_null(field_name)  #not lost
         return data
 
     def _merge_find_oldest(self, cr, uid, ids, context=None):
@@ -401,35 +381,45 @@ class crm_lead(crm_case, osv.osv):
         oldest_id = opportunity_ids[0]
         return self.browse(cr, uid, oldest_id, context=context)
 
+    def _mail_body_text(self, cr, uid, lead, fields, title=False, context=None):
+        body = []
+        if title:
+            body.append("%s\n" % (title))
+        for field_name in fields:
+            field_info = self._all_columns.get(field_name)
+            if field_info is None:
+                continue
+            field = field_info.column
+            value = None
+
+            if field._type == 'selection':
+                if hasattr(field.selection, '__call__'):
+                    key = field.selection(self, cr, uid, context=context)
+                else:
+                    key = field.selection
+                value = dict(key).get(lead[field_name], lead[field_name])
+            elif field._type == 'many2one':
+                if lead[field_name]:
+                    value = lead[field_name].name_get()[0][1]
+            else:
+                value = lead[field_name]
+
+            body.append("%s: %s\n" % (field.string, value or ''))
+        return "\n".join(body + ['---'])
+
     def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
         #TOFIX: mail template should be used instead of fix body, subject text
         details = []
         merge_message = _('Merged opportunities')
         subject = [merge_message]
+        fields = ['name', 'partner_id', 'stage_id', 'section_id', 'user_id', 'categ_id', 'channel_id', 'company_id', 'contact_name',
+                  'email_from', 'phone', 'fax', 'mobile', 'state_id', 'description', 'probability', 'planned_revenue',
+                  'country_id', 'city', 'street', 'street2', 'zip']
         for opportunity in opportunities:
             subject.append(opportunity.name)
-            details.append(_('%s : %s\n  Partner: %s\n  Stage: %s\n  Section: %s\n   Salesman: %s\n   Category: %s\n   Channel: %s\n   Company: %s\n   Contact name: %s\n   Email: %s\n   Phone number: %s\n   Fax: %s\n   Mobile: %s\n   State: %s\n   Description: %s\n   Probability: %s\n   Planned revennue: %s\n   Country: %s\n   City: %s\n   Street: %s\n   Street 2: %s\n   Zip 2: %s')  % (merge_message, opportunity.name, opportunity.partner_id.name or '',
-                        opportunity.stage_id.name or '',
-                        opportunity.section_id.name or '',
-                        opportunity.user_id.name or '',
-                        opportunity.categ_id.name or '',
-                        opportunity.channel_id.name or '',
-                        opportunity.company_id.name or '',
-                        opportunity.contact_name or '',
-                        opportunity.email_from or '',
-                        opportunity.phone or '',
-                        opportunity.fax or '',
-                        opportunity.mobile or '',
-                        opportunity.state_id.name or '',
-                        opportunity.description or '',
-                        opportunity.probability or '',
-                        opportunity.planned_revenue or '',
-                        opportunity.country_id.name or '',
-                        opportunity.city or '',
-                        opportunity.street or '',
-                        opportunity.street2 or '',
-                        opportunity.zip or '',
-                        ))
+            title = "%s : %s" % (merge_message, opportunity.name)
+            details.append(self._mail_body_text(cr, uid, opportunity, fields, title=title, context=context))
+            
         subject = subject[0] + ", ".join(subject[1:])
         details = "\n\n".join(details)
         return self.message_append(cr, uid, [opportunity_id], subject, body_text=details, context=context)
@@ -493,7 +483,12 @@ class crm_lead(crm_case, osv.osv):
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
 
-        data = self._merge_data(cr, uid, ids, oldest, context=context)
+        fields = ['partner_id', 'title', 'name', 'categ_id', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id', 
+            'partner_address_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
+            'partner_name', 'phone', 'probability', 'planned_revenue', 'street', 'street2', 'zip', 'create_date', 'date_action_last',
+            'date_action_next', 'email_from', 'email_cc', 'partner_name']
+        
+        data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
 
         # merge data into first opportunity
         self.write(cr, uid, [first_opportunity.id], data, context=context)
@@ -507,6 +502,8 @@ class crm_lead(crm_case, osv.osv):
         #delete tail opportunities
         self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
 
+        #open first opportunity
+        self.case_open(cr, uid, [first_opportunity.id])
         return first_opportunity.id
 
     def _convert_opportunity_data(self, cr, uid, lead, customer, section_id=False, context=None):
@@ -571,9 +568,17 @@ class crm_lead(crm_case, osv.osv):
         })
         return partner_id
 
-    def _lead_assign_partner(self, cr, uid, ids, partner_id, context=None):
-        contact_id = self.pool.get('res.partner').address_get(cr, uid, [partner_id])['default']
-        return self.write(cr, uid, ids, {'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
+    def assign_partner(self, cr, uid, ids, partner_id=None, context=None):
+        res = False
+        res_partner = self.pool.get('res.partner')
+        if partner_id:
+            contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
+            res = self.write(cr, uid, ids, {'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
+            partner = res_partner.browse(cr, uid, partner_id, context=context)
+            if partner.user_id:
+                for lead_id in ids:
+                    self.allocate_salesman(cr, uid, [lead_id], [partner.user_id.id], context=context)
+        return res
 
     def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
         address = self.pool.get('res.partner.address')
@@ -609,7 +614,7 @@ class crm_lead(crm_case, osv.osv):
                 if not partner_id:
                     partner_id = self._lead_create_partner(cr, uid, lead, context=context)
                 self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
-            self._lead_assign_partner(cr, uid, [lead.id], partner_id, context=context)
+            self.assign_partner(cr, uid, [lead.id], partner_id, context=context)
             partner_ids[lead.id] = partner_id
         return partner_ids
 
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 0b9e14c29bf..1752c52f839 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -38,6 +38,9 @@ You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
     'depends': ['crm'],
+    'demo_xml': [
+        'res_partner_demo.xml',
+    ],
     'update_xml': [
         'security/ir.model.access.csv',
         'res_partner_view.xml',
@@ -46,8 +49,9 @@ You can also use the geolocalization without using the GPS coordinates.
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
     ],
-    'test': ['test/process/partner_assign.yml',
-             'test/ui/partner_assign_form.yml'],
+    'test': [
+        'test/process/partner_assign.yml',
+    ],
     'installable': True,
     'active': False,
     'certificate': '00503409558942442061',
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 2b67f80c066..1e7168f1427 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -24,22 +24,25 @@ from osv import fields
 import urllib,re
 import random, time
 from tools.translate import _
+import tools
 
 def geo_find(addr):
+    addr = addr.encode('utf8')
+    regex = '<coordinates>([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)</coordinates>'
+    url = 'http://maps.google.com/maps/geo?q=' + urllib.quote(addr) + '&output=xml&oe=utf8&sensor=false'
     try:
-        regex = '<coordinates>([+-]?[0-9\.]+),([+-]?[0-9\.]+),([+-]?[0-9\.]+)</coordinates>'
-        url = 'http://maps.google.com/maps/geo?q=' + urllib.quote(addr) + '&output=xml&oe=utf8&sensor=false'
         xml = urllib.urlopen(url).read()
-        if '<error>' in xml:
-            return None
-        result = re.search(regex, xml, re.M|re.I)
-        if not result:
-            return None
-        return float(result.group(2)),float(result.group(1))
     except Exception, e:
         raise osv.except_osv(_('Network error'),
                              _('Could not contact geolocation servers, please make sure you have a working internet connection (%s)') % e)
 
+    if '<error>' in xml:
+        return None
+    result = re.search(regex, xml, re.M|re.I)
+    if not result:
+        return None
+    return float(result.group(2)),float(result.group(1))
+    
 
 class res_partner_grade(osv.osv):
     _order = 'sequence'
@@ -74,9 +77,13 @@ class res_partner(osv.osv):
         for partner in self.browse(cr, uid, ids, context=context):
             if not partner.address:
                 continue
-            part = partner.address[0]
-            addr = ', '.join(filter(None, [part.street, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
-            result = geo_find(addr.encode('utf8'))
+            contact = partner.address[0] #TOFIX: should be get latitude and longitude for default contact?
+            addr = ', '.join(filter(None, [
+                    contact.street, 
+                    "%s %s" % (contact.zip , contact.city), 
+                    contact.state_id and contact.state_id.name, 
+                    contact.country_id and contact.country_id.name]))
+            result = geo_find(tools.ustr(addr))
             if result:
                 self.write(cr, uid, [partner.id], {
                     'partner_latitude': result[0],
@@ -94,14 +101,13 @@ class crm_lead(osv.osv):
         'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True),
         'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
     }
+    def _merge_data(self, cr, uid, ids, oldest, fields, context=None):
+        fields += ['partner_latitude', 'partner_longitude', 'partner_assigned_id', 'date_assign']
+        return super(crm_lead, self)._merge_data(cr, uid, ids, oldest, fields, context=context)
+
     def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context=None):
         """This function updates the "assignation date" automatically, when manually assign a partner in the geo assign tab
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of stage’s IDs
-            @stage_id: change state id on run time """
-
+        """
         if not partner_assigned_id:
             return {'value':{'date_assign': False}}
         else:
@@ -112,72 +118,102 @@ class crm_lead(osv.osv):
                          'user_id' : user_id}
                    }
 
-    def assign_partner(self, cr, uid, ids, context=None):
-        ok = False
-        for part in self.browse(cr, uid, ids, context=context):
-            if not part.country_id:
-                continue
-            addr = ', '.join(filter(None, [part.street, (part.zip or '')+' '+(part.city or ''), part.state_id and part.state_id.name, part.country_id and part.country_id.name]))
-            result = geo_find(addr.encode('utf8'))
-            if result:
-                self.write(cr, uid, [part.id], {
-                    'partner_latitude': result[0],
-                    'partner_longitude': result[1]
-                }, context=context)
+    def assign_partner(self, cr, uid, ids, partner_id=None, context=None):
+        partner_ids = {}
+        res = False
+        if partner_id is None:
+            partner_ids = self.search_geo_partner(cr, uid, ids, context=context)
+        for lead in self.browse(cr, uid, ids, context=context):
+            if not partner_id:
+                partner_id = partner_ids.get(lead.id, False)
+            res = super(crm_lead, self).assign_partner(cr, uid, [lead.id], partner_id, context=context)
+            self.write(cr, uid, [lead.id], {'date_assign': time.strftime('%Y-%m-%d'), 'partner_assigned_id': partner_id}, context=context)
+        return res
+        
 
+    def assign_geo_localize(self, cr, uid, ids, latitude=False, longitude=False, context=None):
+        for lead in self.browse(cr, uid, ids, context=context):
+            if not lead.country_id:
+                continue
+            addr = ', '.join(filter(None, [
+                    lead.street, 
+                    "%s %s" % (lead.zip, lead.city), 
+                    lead.state_id and lead.state_id.name or '', 
+                    lead.country_id and lead.country_id.name or ''
+            ]))
+            result = geo_find(tools.ustr(addr))
+            if not latitude and result:
+                latitude = result[0]
+            if not longitude and result:
+                longitude = result[1]
+            self.write(cr, uid, [lead.id], {
+                'partner_latitude': latitude,
+                'partner_longitude': longitude
+            }, context=context)
+        return True
+        
+    def search_geo_partner(self, cr, uid, ids, context=None):
+        res_partner = self.pool.get('res.partner')
+        res_partner_ids = {}
+        self.assign_geo_localize(cr, uid, ids, context=context)
+        for lead in self.browse(cr, uid, ids, context=context):
+            partner_ids = []
+            if not lead.country_id:
+                continue
+            latitude = lead.partner_latitude
+            longitude = lead.partner_longitude
+            if latitude and longitude:
                 # 1. first way: in the same country, small area
-                part_ids = self.pool.get('res.partner').search(cr, uid, [
-                    ('partner_weight','>',0),
-                    ('partner_latitude','>',result[0]-2), ('partner_latitude','<',result[0]+2),
-                    ('partner_longitude','>',result[1]-1.5), ('partner_longitude','<',result[1]+1.5),
-                    ('country', '=', part.country_id.id),
+                partner_ids = res_partner.search(cr, uid, [
+                    ('partner_weight', '>', 0),
+                    ('partner_latitude', '>', latitude - 2), ('partner_latitude', '<', latitude + 2),
+                    ('partner_longitude', '>', longitude - 1.5), ('partner_longitude', '<', longitude + 1.5),
+                    ('country', '=', lead.country_id.id),
                 ], context=context)
 
                 # 2. second way: in the same country, big area
-                if not part_ids:
-                    part_ids = self.pool.get('res.partner').search(cr, uid, [
-                        ('partner_weight','>',0),
-                        ('partner_latitude','>',result[0]-4), ('partner_latitude','<',result[0]+4),
-                        ('partner_longitude','>',result[1]-3), ('partner_longitude','<',result[1]+3),
-                        ('country', '=', part.country_id.id),
+                if not partner_ids:
+                    partner_ids = res_partner.search(cr, uid, [
+                        ('partner_weight', '>', 0),
+                        ('partner_latitude', '>', latitude - 4), ('partner_latitude', '<', latitude + 4),
+                        ('partner_longitude', '>', longitude - 3), ('partner_longitude', '<' , longitude + 3),
+                        ('country', '=', lead.country_id.id),
                     ], context=context)
 
 
                 # 5. fifth way: anywhere in same country
-                if not part_ids:
+                if not partner_ids:
                     # still haven't found any, let's take all partners in the country!
-                    part_ids = self.pool.get('res.partner').search(cr, uid, [
-                        ('partner_weight','>',0),
-                        ('country', '=', part.country_id.id),
+                    partner_ids = partner.search(cr, uid, [
+                        ('partner_weight', '>', 0),
+                        ('country', '=', lead.country_id.id),
                     ], context=context)
 
                 # 6. sixth way: closest partner whatsoever, just to have at least one result
-                if not part_ids:
+                if not partner_ids:
                     # warning: point() type takes (longitude, latitude) as parameters in this order!
                     cr.execute("""SELECT id, distance
                                   FROM  (select id, (point(partner_longitude, partner_latitude) <-> point(%s,%s)) AS distance FROM res_partner
                                   WHERE partner_longitude is not null
                                         AND partner_latitude is not null
                                         AND partner_weight > 0) AS d
-                                  ORDER BY distance LIMIT 1""", (result[1],result[0]))
+                                  ORDER BY distance LIMIT 1""", (longitude, latitude))
                     res = cr.dictfetchone()
                     if res:
-                        part_ids.append(res['id'])
+                        partner_ids.append(res['id'])
 
-                total = 0
+                total_weight = 0
                 toassign = []
-                for part2 in self.pool.get('res.partner').browse(cr, uid, part_ids, context=context):
-                    total += part2.partner_weight
-                    toassign.append( (part2.id, total) )
+                for partner in res_partner.browse(cr, uid, partner_ids, context=context):
+                    total_weight += partner.partner_weight
+                    toassign.append( (partner.id, total_weight) )
+
                 random.shuffle(toassign) # avoid always giving the leads to the first ones in db natural order!
-                mypartner = random.randint(0,total)
-                for t in toassign:
-                    if mypartner<=t[1]:
-                        vals = self.onchange_assign_id(cr,uid, ids, t[0], context=context)['value']
-                        vals.update({'partner_assigned_id': t[0], 'date_assign': time.strftime('%Y-%m-%d')})
-                        self.write(cr, uid, [part.id], vals, context=context)
+                nearest_weight = random.randint(0, total_weight)
+                for partner_id, weight in toassign:
+                    if nearest_weight <= weight:
+                        res_partner_ids[lead.id] = partner_id
                         break
-            ok = True
-        return ok
+        return res_partner_ids
 crm_lead()
 
diff --git a/addons/crm_partner_assign/res_partner_demo.xml b/addons/crm_partner_assign/res_partner_demo.xml
new file mode 100644
index 00000000000..66ee1fbd5e7
--- /dev/null
+++ b/addons/crm_partner_assign/res_partner_demo.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="res_partner_grade_first" model="res.partner.grade">
+            <field name="name">First</field>
+            <field name="sequence">1</field>
+        </record>
+        <record id="base.res_partner_ericdubois0" model="res.partner">
+            <field name="grade_id" ref="res_partner_grade_first"/>
+            <field name="partner_weight">10</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/crm_partner_assign/test/process/partner_assign.yml b/addons/crm_partner_assign/test/process/partner_assign.yml
index 43c413fb588..01d771f9ad5 100644
--- a/addons/crm_partner_assign/test/process/partner_assign.yml
+++ b/addons/crm_partner_assign/test/process/partner_assign.yml
@@ -1,58 +1,38 @@
 -
   In order to test find nearest Partner functionality and assign to opportunity ,
-  so First i create a grade 'First' for partner.
 -
-  !record {model: res.partner.grade, id: res_partner_grade_first}:
-    name: First
-    sequence: 1
--
-  I assign grade 'First' to the partner 'Eric' and give more probability to assign a lead to this partner.
--
-  !record {model: res.partner, id: base.res_partner_ericdubois0}:
-    grade_id: res_partner_grade_first
-    partner_weight: 10
--
-  Set Lattitude and Longitude according to partner address.
+  I Set Geo Lattitude and Longitude according to partner address.
 -
   !python {model: res.partner}: |
     self.geo_localize(cr, uid, [ref('base.res_partner_ericdubois0')], context)
+-
+ I check Geo Lattitude and Longitude of partner after set
+-
+  !python {model: res.partner}: |
     partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
     assert partner.partner_latitude == 50.4530495 , "Lattitude is wrong"
     assert partner.partner_longitude == 3.9693885 , "Longitude is wrong"
 -
-  I would like to change the assign partner on opportunity, so find nearest partner assign to this opportunity.
+  I assign nearest partner to opportunity.
 -
   !python {model: crm.lead}: |
-    res = self.onchange_assign_id(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], ref('base.res_partner_ericdubois0'), context)
-    assert res['value']['user_id'] == ref('base.user_demo'), "User not correct"
-    self.assign_partner(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], context)
+    self.assign_partner(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], context=context)
 -
-  In order to assigned partner to opportunity, so i test latitude and longitude of partner of opportunity
-  and opportuniy assign to assigned partner.
+  I check assigned partner of opportunity who is nearest Geo Lattitude and Longitude of opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, [ref('crm.crm_case_abcfuelcounits0')])[0]
+    lead = self.browse(cr, uid, ref('crm.crm_case_abcfuelcounits0'))
+    assert lead.partner_assigned_id.id == ref('base.res_partner_ericdubois0') , "Opportuniy is not assigned nearest partner"
     assert lead.partner_latitude == 50.8495239 , "Lattitude is wrong"
     assert lead.partner_longitude == 4.3667002 , "Longitude is wrong"
-    assert lead.partner_assigned_id.id == ref('base.res_partner_ericdubois0') , "Opportuniy not assign partner"
+    
 -
-  Oppportuniry forword to its nearest partner, so first i create record of forword mail
--
-  !record {model: crm.lead.forward.to.partner, id: crm_lead_forward_to_partner_rec}:
-    send_to: email
-    email_from: 'admin@openerp.com'
-    email_to: 'admin@tinyerp.com'
-    subject: 'Openerp lead forward'
-    history: latest 
--
-  I forword this opportunity to its nearest partner.
+  I forward this opportunity to its nearest partner.
 -
   !python {model: crm.lead.forward.to.partner}: |
-    from tools import config
-    host = config.get('smtp_user', '127.0.0.1')
-    assert config.get(host, True), 'SMTP not configured !'
+    context.update({'active_model': 'crm.lead', 'active_id': ref('crm.crm_case_abcfuelcounits0'), 'active_ids': [ref('crm.crm_case_abcfuelcounits0')]})
+    forward_id = self.create(cr, uid, {'send_to': 'partner'}, context=context)
     try:
-      self.action_forward(cr, uid, ref("crm_lead_forward_to_partner_rec"), context={'active_id': ref('crm.crm_case_abcfuelcounits0'),
-      'active_ids': [ref('crm.crm_case_abcfuelcounits0')], 'active_model': 'crm.lead'})
+      self.action_forward(cr, uid, ref("crm_lead_forward_to_partner_rec"), context=context)
     except:
       pass
diff --git a/addons/crm_partner_assign/test/ui/partner_assign_form.yml b/addons/crm_partner_assign/test/ui/partner_assign_form.yml
deleted file mode 100644
index 747297a833c..00000000000
--- a/addons/crm_partner_assign/test/ui/partner_assign_form.yml
+++ /dev/null
@@ -1,18 +0,0 @@
--
-  For onchange on partner , i assign an email address to Administrator user.
--
-  !record {model: res.users, id: base.user_root}:
-    user_email: admin@openerp.com
-
--
-  I check onchange on email, partner, history and test the data accordingly change.
--
-  !python {model: crm.lead.forward.to.partner}: |
-    context.update({'history': 'latest', 'active_id': ref('crm.crm_case_abcfuelcounits0')})
-    email = self.on_change_email(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], ref('base.user_root'))
-    assert email['value']['email_to'] == "Administrator <admin@openerp.com>", "Email is not correct"
-    partner = self.on_change_partner(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], ref('base.res_partner_desertic_hispafuentes'))
-    assert partner['value']['address_id'] == ref('base.res_partner_desertic_hispafuentes'), "Address invalid"
-    assert partner['value']['email_to'] == 'info@axelor.com', "Email id incorrect"
-    history = self.on_change_history(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], context.get('history'), context)
-    assert history, "History is blank"
\ No newline at end of file
diff --git a/addons/crm_partner_assign/wizard/__init__.py b/addons/crm_partner_assign/wizard/__init__.py
index be6c1533722..9224173145b 100644
--- a/addons/crm_partner_assign/wizard/__init__.py
+++ b/addons/crm_partner_assign/wizard/__init__.py
@@ -20,4 +20,3 @@
 ##############################################################################
 
 import crm_forward_to_partner
-import crm_merge_opportunity
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index cdaf8f19b12..29a60ba71ba 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -24,6 +24,7 @@ import time
 import re
 from osv import osv, fields
 from tools.translate import _
+from mail.mail_message import to_email
 
 class crm_lead_forward_to_partner(osv.osv_memory):
     """Forwards lead history"""
@@ -46,48 +47,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
     }
 
 
-    def get_whole_history(self, cr, uid, ids, context=None):
-        """This function gets whole communication history and returns as top posting style
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of history IDs
-        @param context: A standard dictionary for contextual values
-        """
-        whole = []
-        for hist_id in ids:
-            whole.append(self.get_latest_history(cr, uid, hist_id, context=context))
-        whole = '\n\n'.join(whole)
-        return whole or ''
-
-    def get_latest_history(self, cr, uid, hist_id, context=None):
-        """This function gets latest communication and returns as top posting style
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param hist_id: Id of latest history
-        @param context: A standard dictionary for contextual values
-        """
-        log_pool = self.pool.get('mail.message')
-        hist = log_pool.browse(cr, uid, hist_id, context=context)
-        header = '-------- Original Message --------'
-        sender = 'From: %s' %(hist.email_from or '')
-        to = 'To: %s' % (hist.email_to or '')
-        sentdate = 'Date: %s' % (hist.date or '')
-        desc = '\n%s'%(hist.body_text)
-        original = [header, sender, to, sentdate, desc]
-        original = '\n'.join(original)
-        return original
-
+    
     def on_change_email(self, cr, uid, ids, user):
-        """This function fills email information based on user selected
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Mail’s IDs
-        @param user: Changed User id
-        @param partner: Changed Partner id
-        """
         if not user:
             return {'value': {'email_to': False}}
         email = self.pool.get('res.users')._get_email_from(cr, uid, [user])[user]
@@ -98,54 +59,19 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             * info: Forward the case information
             * whole: Send the whole history
             * latest: Send the latest histoy
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of history IDs
-        @param context: A standard dictionary for contextual values
         """
         #TODO: ids and context are not comming
-        res = False
+        res = {}
         res_id = context.get('active_id')
-        msg_val = self._get_case_history(cr, uid, history_type, res_id, context=context)
+        model = context.get('active_model')
+        body_text = self._get_body_text(cr, uid, model, res_id, history_type, context=context)
+        context['mail.compose.message.body'] = history_type
         if msg_val:
-            res = {'value': {'body_text' : '\n\n' + msg_val}}
+            res = {'value': {'body_text' : body_text}}
         return res
-
-    def _get_case_history(self, cr, uid, history_type, res_id, context=None):
-        if not res_id:
-            return
-
-        msg_val = ''
-        case_info = self.get_lead_details(cr, uid, res_id, context=context)
-        model_pool = self.pool.get('crm.lead')
-
-        if history_type == 'info':
-            msg_val = case_info
-
-        elif history_type == 'whole':
-            log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
-            log_ids = map(lambda x: x.id, filter(lambda x: x.email_from, log_ids))
-            msg_val = case_info + '\n\n' + self.get_whole_history(cr, uid, log_ids, context=context)
-
-        elif history_type == 'latest':
-            log_ids = model_pool.browse(cr, uid, res_id, context=context).message_ids
-            log_ids = filter(lambda x: x.email_from and x.id, log_ids)
-            if not log_ids:
-                msg_val = case_info
-            else:
-                msg_val = case_info + '\n\n' + self.get_latest_history(cr, uid, log_ids[0].id, context=context)
-
-        return msg_val
-
+    
     def on_change_partner(self, cr, uid, ids, partner_id):
         """This function fills address information based on partner/user selected
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Mail’s IDs
-        @param user: Changed User id
-        @param partner: Changed Partner id
         """
         if not partner_id:
             return {'value' : {'email_to' : False, 'address_id': False}}
@@ -158,11 +84,11 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         partner = partner_obj.browse(cr, uid, [partner_id])
         user_id = partner and partner[0].user_id or False
         email = user_id and user_id.user_email or ''
-        data.update({'email_cc' : email})
+        data.update({'email_cc' : email, 'user_id': user_id and user_id.id or False})
         return {
             'value' : data,
             'domain' : {'address_id' : partner_id and "[('partner_id', '=', partner_id)]" or "[]"}
-            }
+        }
 
     def on_change_address(self, cr, uid, ids, address_id):
         email = ''
@@ -170,155 +96,126 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             email = self.pool.get('res.partner.address').browse(cr, uid, address_id).email
         return {'value': {'email_to' : email}}
 
-    def send_mail(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        super(crm_lead_forward_to_partner, self).send_mail(cr, uid, ids, context=context)
-        self.action_forward(cr, uid, ids, context)
-        return {'type': 'ir.actions.act_window_close'}
-
     def action_forward(self, cr, uid, ids, context=None):
         """
         Forward the lead to a partner
         """
         if context is None:
             context = {}
+        res = {'type': 'ir.actions.act_window_close'}
+        model = context.get('active_model')
+        if model not in ('crm.lead'):
+            return res
+
         this = self.browse(cr, uid, ids[0], context=context)
-        case_pool = self.pool.get(context.get('active_model'))
-        res_id = context and context.get('active_id', False) or False
-        case = case_pool.browse(cr, uid, res_id, context=context)
-        context.update({'mail': 'forward'})
-
-        to_write = {'date_assign': time.strftime('%Y-%m-%d')}
-        if (this.send_to == 'partner' and this.partner_id):
-            to_write['partner_assigned_id'] = this.partner_id.id
-
-        if this.send_to == 'user':
-            to_write.update({'user_id' : this.user_id.id})
-        email_re = r'([^ ,<@]+@[^> ,]+)'
-        email_cc = re.findall(email_re, case.email_cc or '')
-        new_cc = []
-        if case.email_cc:
-            new_cc.append(case.email_cc)
-        for to in this.email_to.split(','):
-            email_to = re.findall(email_re, to)
-            email_to = email_to and email_to[0] or ''
-            if email_to not in email_cc:
-                new_cc.append(to)
-        to_write.update({'email_cc' : ', '.join(new_cc) })
-        case_pool.write(cr, uid, case.id, to_write, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-    def get_lead_details(self, cr, uid, lead_id, context=None):
-        body = []
-        lead_proxy = self.pool.get('crm.lead')
-        lead = lead_proxy.browse(cr, uid, lead_id, context=context)
-        if not lead.type or lead.type == 'lead' or not lead.partner_address_id:
-                field_names = [
-                    'partner_name', 'title', 'function', 'street', 'street2',
-                    'zip', 'city', 'country_id', 'state_id', 'email_from',
-                    'phone', 'fax', 'mobile', 'categ_id', 'description',
-                ]
-
-                for field_name in field_names:
-                    field_definition = lead_proxy._columns[field_name]
-                    value = None
-
-                    if field_definition._type == 'selection':
-                        if hasattr(field_definition.selection, '__call__'):
-                            key = field_definition.selection(lead_proxy, cr, uid, context=context)
-                        else:
-                            key = field_definition.selection
-                        value = dict(key).get(lead[field_name], lead[field_name])
-                    elif field_definition._type == 'many2one':
-                        if lead[field_name]:
-                            value = lead[field_name].name_get()[0][1]
-                    else:
-                        value = lead[field_name]
-
-                    body.append("%s: %s" % (field_definition.string, value or ''))
-        elif lead.type == 'opportunity':
-            pa = lead.partner_address_id
-            body += [
-                "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]),
-                "Contact: %s" % (pa.name or ''),
-                "Title: %s" % (pa.title or ''),
-                "Function: %s" % (pa.function or ''),
-                "Street: %s" % (pa.street or ''),
-                "Street2: %s" % (pa.street2 or ''),
-                "Zip: %s" % (pa.zip or ''),
-                "City: %s" % (pa.city or ''),
-                "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''),
-                "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''),
-                "Email: %s" % (pa.email or ''),
-                "Phone: %s" % (pa.phone or ''),
-                "Fax: %s" % (pa.fax or ''),
-                "Mobile: %s" % (pa.mobile or ''),
-                "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''),
-                "Details: %s" % (lead.description or ''),
-            ]
-        return "\n".join(body + ['---'])
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-
-        if context is None:
-            context = {}
-
-        defaults = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
-        active_id = context.get('active_id')
-        if not active_id:
-            return defaults
-
-        lead_proxy = self.pool.get('crm.lead')
-        partner_obj = self.pool.get('res.partner')
-        lead = lead_proxy.browse(cr, uid, active_id, context=context)
-
-        email_cc = ''
-        email = ''
-        if lead.partner_assigned_id:
-            partner = partner_obj.browse(cr, uid, [lead.partner_assigned_id.id])
-            user_id = partner and partner[0].user_id or False
-            email_cc = user_id and user_id.user_email or ''
-
-            addr = partner_obj.address_get(cr, uid, [partner[0].id], ['contact'])
-            email = self.pool.get('res.partner.address').browse(cr, uid, addr['contact']).email
-
-        body = self._get_case_history(cr, uid, defaults.get('history', 'latest'), lead.id, context=context)
-        defaults.update({
-            'subject' : '%s: %s - %s' % (_('Fwd'), 'Openerp lead forward', lead.name),
-            'body_text' : body,
-            'email_cc' : email_cc,
-            'email_to' : email or 'dummy@dummy.ly'
-        })
-        return defaults
-
-class crm_lead_mass_forward_to_partner(osv.osv_memory):
-    _name = 'crm.lead.mass.forward.to.partner'
-    _inherit = 'crm.lead.forward.to.partner'
-
-    def action_mass_forward(self, cr, uid, ids, context=None):
-        if not context:
-            context = {}
-
-        active_ids = context.get('active_ids')
-        case_obj = self.pool.get('crm.lead')
-        for case in case_obj.browse(cr, uid, active_ids, context=context):
-            if not case.partner_assigned_id:
-                case_obj.assign_partner(cr,uid, [case.id], context=context)
-                case = case_obj.browse(cr, uid, case.id, context=context)
-
-            if not case.partner_assigned_id:
-                continue
-
-            context.update({'active_id' : case.id})
+        lead = self.pool.get(model)
+        lead_id = context and context.get('active_id', False) or False
+        lead_ids = lead_id and [lead_id] or []
+        mode = context.get('mail.compose.message.mode')
+        if mode == 'mass_mail':
+            lead_ids = context and context.get('active_ids', []) or []
             value = self.default_get(cr, uid, ['body_text', 'email_to', 'email_cc', 'subject', 'history'], context=context)
             self.write(cr, uid, ids, value, context=context)
-            self.action_forward(cr,uid, ids, context=context)
+            context['mail.compose.message.mode'] = mode
 
-        return {'type': 'ir.actions.act_window_close'}
+        self.send_mail(cr, uid, ids, context=context)
+        for case in lead.browse(cr, uid, lead_ids, context=context):
+            if (this.send_to == 'partner' and this.partner_id):
+                lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
 
+            if this.send_to == 'user':
+                lead.assign_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
 
+            email_cc = to_email(case.email_cc)
+            email_cc = email_to and email_cc[0] or ''
+            new_cc = []
+            if email_cc:
+                new_cc.append(email_cc)
+            for to in this.email_to.split(','):
+                email_to = to_email(to)
+                email_to = email_to and email_to[0] or ''
+                if email_to not in new_cc:
+                    new_cc.append(to)
+            update_vals = {'email_cc' : ', '.join(new_cc) }
+            lead.write(cr, uid, case.id, update_vals, context=context)
+        return res
+
+    def _get_info_body_text(self, cr, uid, lead, context=None):
+        field_names = []
+        proxy = self.pool.get(lead._name)
+        if lead.type == 'opportunity':
+            field_names += ['partner_id']
+        field_names += [
+           'partner_name' , 'title', 'function', 'street', 'street2',
+            'zip', 'city', 'country_id', 'state_id', 'email_from',
+            'phone', 'fax', 'mobile', 'categ_id', 'description',
+        ]
+        return proxy._mail_body_text(cr, uid, lead, field_names, context=context)
+
+    def _get_message_body_text(self, cr, uid, lead, mode='whole', context=None):
+        """This function gets whole communication history and returns as top posting style
+        """
+        mail_message = self.pool.get('mail.message')
+        message_ids = []
+        body = self._get_info_body_text(cr, uid, lead, context=context)
+        if mode in ('whole', 'latest'):
+            message_ids = lead.message_ids
+            message_ids = map(lambda x: x.id, filter(lambda x: x.email_from, message_ids))
+            if mode == 'latest' and len(message_ids):
+                message_ids = [message_ids[0]]
+            for message in mail_message.browse(cr, uid, message_ids, context=context):
+                header = '-------- Original Message --------'
+                sender = 'From: %s' %(message.email_from or '')
+                to = 'To: %s' % (message.email_to or '')
+                sentdate = 'Date: %s' % (message.date or '')
+                desc = '\n%s'%(message.body_text)
+                original = [header, sender, to, sentdate, desc]
+                original = '\n'.join(original)
+                body += original
+        return body or ''
+
+    def get_value(self, cr, uid, model, res_id, context=None):
+        if context is None:
+            context = {}
+        res = super(crm_lead_forward_to_partner, self).get_value(cr, uid,  model, res_id, context=context)
+        if model not in ("crm.lead"):
+            return res
+        proxy = self.pool.get(model)
+        partner = self.pool.get('res.partner')
+        lead = proxy.browse(cr, uid, res_id, context=context)
+        mode = context.get('mail.compose.message.mode')
+        if mode == "forward":
+            body_type = context.get('mail.compose.message.body')
+            email_cc = res.get('email_cc', "")
+            email = res.get('email_to', "")
+            subject = '%s: %s - %s' % (_('Fwd'), 'Lead forward', lead.name)
+            body = self._get_message_body_text(cr, uid, lead, body_type, context=context)
+            partner_assigned_id = lead.partner_assigned_id and lead.partner_assigned_id.id or False
+            user_id = False
+            if not partner_assigned_id:
+                partner_assigned_id = lead.search_geo_partner(cr, uid, [lead.id], context=None).get(lead.id, False)
+            if partner_assigned_id:
+                assigned_partner = partner.browse(cr, uid, partner_assigned_id, context=context)
+                user_id = assigned_partner.user_id and assigned_partner.user_id.id or False
+                email_cc = assigned_partner.user_id and assigned_partner.user_id.user_email or ''
+                email = assigned_partner.email
+            
+            
+            res.update({
+                'subject' : subject,
+                'body_text' : body,
+                'email_cc' : email_cc,
+                'email_to' : email,
+                'partner_assigned_id': partner_assigned_id,
+                'user_id': user_id,
+            })
+        return res
+        
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        context['mail.compose.message.mode'] = 'forward'
+        context['mail.compose.message.body'] = 'info'
+        return super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index aa2c45ea1c9..645c729b164 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -45,7 +45,7 @@
                     <group col="4" colspan="4">
                         <label string="" colspan="1"/>
                         <button icon="gtk-close" special="cancel" string="Close"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
+                        <button name="action_forward" string="Send" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -61,56 +61,14 @@
         </record>
 
 
-        <record model="ir.ui.view" id="crm_forward_mass_mail_view">
-            <field name="name">crm.new.mass.forward.mail.form</field>
-            <field name="model">crm.lead.mass.forward.to.partner</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send Mail" col="4">
-                    <group colspan="4" col="2">
-                    <separator string="Forward to Partner" colspan="4" />
-
-                    <field name="history" colspan="2" on_change="on_change_history(history, context)" invisible="1"/>
-                    <field name="email_from"/>
-                    <field name="reply_to"/>
-                    <field name="email_to" invisible="1" />
-                    <field name="email_cc" invisible="1" />
-                    <field name="subject"  invisible="1" />
-                    <field name="html"/>
-                    </group>
-                    <notebook colspan="6" >
-                        <page string="Message" >
-                            <field name="body_text" nolabel="1" colspan="4" default_focus="1" readonly="1"/>
-                        </page>
-                        <page string="Attachments" >
-                            <field name="attachment_ids" colspan="4" nolabel="1">
-                                <form string="Attachment">
-                                    <field name="binary" filename="name" />
-                                    <field name="name" />
-                                </form>
-                                <tree string="Attachments">
-                                    <field name="name" />
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                    <separator string="" colspan="6"/>
-                    <group colspan="6" col="4" >
-                        <field name="state" />
-                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_mass_forward" type="object" string="_Mass forward" icon="gtk-go-forward" />
-                    </group>
-                </form>
-            </field>
-        </record>
-
+        
         <act_window id="action_crm_send_mass_forward"
             multi="True"
             key2="client_action_multi" name="Mass forward to partner"
-            res_model="crm.lead.mass.forward.to.partner" src_model="crm.lead"
+            res_model="crm.lead.forward.to.partner" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
-            context="{'mass_forward' : True}"
-            view_id="crm_forward_mass_mail_view"
+            context="{'mail.compose.message.mode' : 'mass_mail'}"
+            view_id="crm_lead_forward_to_partner_form"
         />
 
 
diff --git a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py b/addons/crm_partner_assign/wizard/crm_merge_opportunity.py
deleted file mode 100644
index 3993a5df066..00000000000
--- a/addons/crm_partner_assign/wizard/crm_merge_opportunity.py
+++ /dev/null
@@ -1,42 +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
-from tools.translate import _
-
-
-class crm_merge_opportunity_assign_partner(osv.osv_memory):
-    """Merge two Opportunities"""
-
-    _inherit = 'crm.merge.opportunity'
-    
-    def _update_data(self, op_ids, oldest_opp):
-		data = super(crm_merge_opportunity_assign_partner, self)._update_data(op_ids, oldest_opp)
-			
-		new_data = {
-			'partner_latitude': self._get_first_not_null('partner_latitude', op_ids, oldest_opp),
-			'partner_longitude': self._get_first_not_null('partner_longitude', op_ids, oldest_opp),
-			'partner_assigned_id': self._get_first_not_null_id('partner_assigned_id', op_ids, oldest_opp), 
-			'date_assign' : self._get_first_not_null('date_assign', op_ids, oldest_opp),
-		}
-		data.update(new_data)
-		return data
-
-crm_merge_opportunity_assign_partner()

From 8e325979de7f96ef2210e0f77857db54f0b96b06 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 26 Oct 2011 19:31:33 +0530
Subject: [PATCH 078/132] [IMP] crm, crm_profile: move segmentation.yml from
 crm_profile to crm module and add demo data of segmentation in crm module

bzr revid: hmo@tinyerp.com-20111026140133-43p1zdo9sqrzs9te
---
 addons/crm/__openerp__.py                          |  1 +
 addons/crm/crm_demo.xml                            |  5 +++++
 addons/crm/test/process/segmentation.yml           |  9 +++++++++
 addons/crm_profiling/__openerp__.py                |  5 +++--
 addons/crm_profiling/crm_profiling_demo.xml        |  8 ++++----
 addons/crm_profiling/test/process/segmentation.yml | 14 --------------
 6 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 addons/crm/test/process/segmentation.yml
 delete mode 100644 addons/crm_profiling/test/process/segmentation.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index dd22590ee84..e04a9513849 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,6 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/lead2opportunity2win.yml',
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
+            'test/process/segmentation.yml',
             'test/ui/onchange_events.yml',
              ],
     'installable': True,
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 08d09904c06..e30ce11cf00 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -18,5 +18,10 @@
             <field name="parent_id" ref="crm.section_sales_department"></field>
     </record>
 
+    <record model="crm.segmentation" id="crm_segmentation0">
+		<field name="name">OpenERP partners</field>
+		<field name="categ_id" ref="base.res_partner_category_2"/>
+	</record>
+
     </data>
 </openerp>
diff --git a/addons/crm/test/process/segmentation.yml b/addons/crm/test/process/segmentation.yml
new file mode 100644
index 00000000000..ea2998c1870
--- /dev/null
+++ b/addons/crm/test/process/segmentation.yml
@@ -0,0 +1,9 @@
+- 
+  In order to test segmentation process which create specific partner categories criteria,
+- 
+  I start the process.
+-
+  !python {model: crm.segmentation}: |
+    self.process_start(cr, uid, [ref("crm_segmentation0")],context)
+    #Todo: Need to check after segmentation started
+
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 85421301380..1d8f9f7ee79 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -41,8 +41,9 @@ It also has been merged with the earlier CRM & SRM segmentation tool because the
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'crm_profiling_view.xml'],
     'demo_xml': ['crm_profiling_demo.xml'],
-    'test': [#'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
-             'test/process/segmentation.yml',],
+    'test': [
+        #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
+    ],
     'installable': True,
     'active': False,
     'certificate': '0033984979005',
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index e541c116265..6a0ca130ec3 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -102,7 +102,7 @@
 	Profiles / crm.segmentation
 	-->
 
-	<record model="crm.segmentation" id="crm_segmentation0">
+	<record model="crm.segmentation" id="crm.crm_segmentation0">
 		<field name="name">OpenERP partners</field>
 		<field name="answer_yes" eval="[(6,0,[partner_tiny1])]" />
 		<field name="categ_id" ref="base.res_partner_category_2"/>
@@ -111,21 +111,21 @@
 	<record model="crm.segmentation" id="crm_segmentation1">
 		<field name="name">Bronze partners</field>
 		<field name="answer_yes" eval="[(6,0,[partner_quality1])]" />
-		<field name="parent_id" ref="crm_segmentation0"/>
+		<field name="parent_id" ref="crm.crm_segmentation0"/>
 		<field name="categ_id" ref="base.res_partner_category_3"/>
 		<field name="profiling_active">True</field>
 	</record>
 	<record model="crm.segmentation" id="crm_segmentation2">
 		<field name="name">Silver partners</field>
 		<field name="answer_yes" eval="[(6,0,[partner_quality2])]" />
-		<field name="parent_id" ref="crm_segmentation0"/>
+		<field name="parent_id" ref="crm.crm_segmentation0"/>
 		<field name="categ_id" ref="base.res_partner_category_4"/>
 		<field name="profiling_active">True</field>
 	</record>
 	<record model="crm.segmentation" id="crm_segmentation3">
 		<field name="name">Gold partners</field>
 		<field name="answer_yes" eval="[(6,0,[partner_quality3])]" />
-		<field name="parent_id" ref="crm_segmentation0"/>
+		<field name="parent_id" ref="crm.crm_segmentation0"/>
 		<field name="categ_id" ref="base.res_partner_category_5"/>
 		<field name="exclusif">True</field>
 		<field name="profiling_active">True</field>
diff --git a/addons/crm_profiling/test/process/segmentation.yml b/addons/crm_profiling/test/process/segmentation.yml
deleted file mode 100644
index 136bdf5e872..00000000000
--- a/addons/crm_profiling/test/process/segmentation.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- 
-  In order to test segmentation process which create specific partner categories criteria.so i start
-  the process.
--
-  !python {model: crm.segmentation}: |
-    self.process_start(cr, uid, [ref("crm_segmentation3")],context)
-    #Todo: Need to check after segmentation started
--
-  I continue the segmentation process.
--
-  !python {model: crm.segmentation}: |
-    context.update({'start': True})
-    self.process_continue(cr, uid, [ref("crm_segmentation3")], context)
-    #Todo: Need to check After segmentation process completed
\ No newline at end of file

From 8e36eb8163cc5dd88644d960263a9d9187cc073e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 26 Oct 2011 21:57:27 +0530
Subject: [PATCH 079/132] [FIX] crm, crm_partner_assign: rename assign_partner
 with _lead_set_partner in crm.lead method to avoid confilts process of set
 customer and assign partner and remove button_convert_oppotunity, use action
 of crm.action_crm_lead2opportunity_partner into lead view

bzr revid: hmo@tinyerp.com-20111026162727-3znzbz8wg375w8k5
---
 addons/crm/crm_lead.py                        | 44 +++----------------
 addons/crm/crm_lead_view.xml                  |  4 +-
 .../crm_partner_assign/partner_geo_assign.py  | 10 +++--
 3 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 22687965701..5f843f492d3 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -568,16 +568,13 @@ class crm_lead(crm_case, osv.osv):
         })
         return partner_id
 
-    def assign_partner(self, cr, uid, ids, partner_id=None, context=None):
+    def _lead_set_partner(self, cr, uid, lead, partner_id, context=None):
         res = False
         res_partner = self.pool.get('res.partner')
         if partner_id:
             contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
-            res = self.write(cr, uid, ids, {'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
-            partner = res_partner.browse(cr, uid, partner_id, context=context)
-            if partner.user_id:
-                for lead_id in ids:
-                    self.allocate_salesman(cr, uid, [lead_id], [partner.user_id.id], context=context)
+            res = lead.write({'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
+            
         return res
 
     def _lead_create_partner_address(self, cr, uid, lead, partner_id, context=None):
@@ -602,7 +599,7 @@ class crm_lead(crm_case, osv.osv):
     def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
         """
         This function convert partner based on action.
-        if action is 'new', create new partner with contact and assign lead to new partner_id.
+        if action is 'create', create new partner with contact and assign lead to new partner_id.
         otherwise assign lead to specified partner_id
         """
         if context is None:
@@ -614,7 +611,7 @@ class crm_lead(crm_case, osv.osv):
                 if not partner_id:
                     partner_id = self._lead_create_partner(cr, uid, lead, context=context)
                 self._lead_create_partner_address(cr, uid, lead, partner_id, context=context)
-            self.assign_partner(cr, uid, [lead.id], partner_id, context=context)
+            self._lead_set_partner(cr, uid, lead, partner_id, context=context)
             partner_ids[lead.id] = partner_id
         return partner_ids
 
@@ -718,37 +715,6 @@ class crm_lead(crm_case, osv.osv):
         }
 
 
-    def button_convert_opportunity(self, cr, uid, ids, context=None):
-        """ Precomputation for converting lead to opportunity
-        """
-        if context is None:
-            context = {}
-        context.update({'active_ids': ids})
-
-        data_obj = self.pool.get('ir.model.data')
-        value = {}
-
-
-        for case in self.browse(cr, uid, ids, context=context):
-            context.update({'active_id': case.id})
-            data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_partner')
-            view_id1 = False
-            if data_id:
-                view_id1 = data_obj.browse(cr, uid, data_id, context=context).res_id
-            value = {
-                    'name': _('Create Partner'),
-                    'view_type': 'form',
-                    'view_mode': 'form,tree',
-                    'res_model': 'crm.lead2opportunity.partner',
-                    'view_id': False,
-                    'context': context,
-                    'views': [(view_id1, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                    'nodestroy': True
-            }
-        return value
-
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
         """Automatically calls when new email message arrives"""
         res_id = super(crm_lead, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2b0b862783c..0e2b5dfd3a1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -59,10 +59,10 @@
                         widget="selection"
                         domain="[('object_id.model','=','crm.lead')]"/>
                     <button
-                         name="button_convert_opportunity"
+                         name="%(crm.action_crm_lead2opportunity_partner)d"
                          string="Convert to Opportunity"
                          help="Convert to Opportunity" icon="gtk-go-forward"
-                         type="object"/>
+                         />
                     <newline />
                     <field name="user_id" />
                     <field name="section_id" widget="selection" />
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 1e7168f1427..14e15959a3d 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -118,15 +118,19 @@ class crm_lead(osv.osv):
                          'user_id' : user_id}
                    }
 
-    def assign_partner(self, cr, uid, ids, partner_id=None, context=None):
+    def assign_partner(self, cr, uid, ids, partner_id=False, context=None):
         partner_ids = {}
         res = False
-        if partner_id is None:
+        res_partner = self.pool.get('res.partner')
+        if not partner_id:
             partner_ids = self.search_geo_partner(cr, uid, ids, context=context)
         for lead in self.browse(cr, uid, ids, context=context):
             if not partner_id:
                 partner_id = partner_ids.get(lead.id, False)
-            res = super(crm_lead, self).assign_partner(cr, uid, [lead.id], partner_id, context=context)
+            partner = res_partner.browse(cr, uid, partner_id, context=context)
+            if partner.user_id:
+                for lead_id in ids:
+                    self.allocate_salesman(cr, uid, [lead_id], [partner.user_id.id], context=context)
             self.write(cr, uid, [lead.id], {'date_assign': time.strftime('%Y-%m-%d'), 'partner_assigned_id': partner_id}, context=context)
         return res
         

From b4cf6c4d89f7e3e0282bc7a21614ba036851f6d1 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 26 Oct 2011 21:58:06 +0530
Subject: [PATCH 080/132] [FIX] crm: typo in test case

bzr revid: hmo@tinyerp.com-20111026162806-yasdnpzyn3n9kbss
---
 addons/crm/test/process/cancel_lead.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index 6b08136c086..ad7bc7ba841 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -38,7 +38,7 @@
   I mark as lost the Lead.
 -
   !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
+    self.case_mark_lost(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
 
 
 

From 24cbb648a526c0dcbeb5acaa9b70c16350dd901f Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 26 Oct 2011 21:59:01 +0530
Subject: [PATCH 081/132] [IMP] crm: add new action
 action_crm_lead2opportunity_partner

bzr revid: hmo@tinyerp.com-20111026162901-2gkhsyjk6646utyt
---
 addons/crm/wizard/crm_lead_to_opportunity.py       | 2 ++
 addons/crm/wizard/crm_lead_to_opportunity_view.xml | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 9a828668944..52a79e4514c 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -54,6 +54,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         email = False
         for lead in lead_obj.browse(cr, uid, opportunities, context=context):
             partner_id = lead.partner_id and lead.partner_id.id or False
+
+            #TOFIX: use mail.mail_message.to_mail
             email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '')
             email = map(lambda x: "'" + x + "'", email)
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 833c04c3575..5f8453768c0 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -65,6 +65,15 @@
 	              </form>
 	          </field>
 	       </record>
+
+        <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
+            <field name="name">Create a Partner</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">crm.lead2opportunity.partner</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_crm_lead2opportunity_partner"/>
+            <field name="target">new</field>
+        </record>
 	       
 	      <act_window id="action_crm_send_mass_convert"
             multi="True"

From 09d1829b92594e7e0ab1d416b9290d5481786700 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 26 Oct 2011 22:00:04 +0530
Subject: [PATCH 082/132] [IMP] crm.crm_phocall: rename _call_assign_partner
 with _call_set_partner

bzr revid: hmo@tinyerp.com-20111026163004-mm77es0tr8hy16jt
---
 addons/crm/crm_phonecall.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 1adf63b9a34..a0c85268f27 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -176,7 +176,7 @@ class crm_phonecall(crm_base, osv.osv):
         })
         return partner_id
 
-    def _call_assign_partner(self, cr, uid, ids, partner_id, context=None):
+    def _call_set_partner(self, cr, uid, ids, partner_id, context=None):
         return self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
 
     def _call_create_partner_address(self, cr, uid, phonecall, partner_id, context=None):
@@ -187,7 +187,7 @@ class crm_phonecall(crm_base, osv.osv):
                     'phone': phonecall.partner_phone,
         })
 
-    def convert_partner(self, cr, uid, ids, action='new', partner_id=False, context=None):
+    def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
         """
         This function convert partner based on action.
         if action is 'create', create new partner with contact and assign lead to new partner_id.
@@ -202,7 +202,7 @@ class crm_phonecall(crm_base, osv.osv):
                if not partner_id:
                    partner_id = self._call_create_partner(cr, uid, call, context=context)
                self._call_create_partner_address(cr, uid, call, partner_id, context=context)
-            self._call_assign_partner(cr, uid, [call.id], partner_id, context=context)
+            self._call_set_partner(cr, uid, [call.id], partner_id, context=context)
             partner_ids[call.id] = partner_id
         return partner_ids
 

From 000f4f033fc040c6690d053e9d43562895857227 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 1 Nov 2011 18:03:31 +0530
Subject: [PATCH 083/132] [FIX] crm : Fixed traceback while converting lead to
 partner(link with existing partner or create new partner)

bzr revid: ron@tinyerp.com-20111101123331-u4154mr7r6nh4p1v
---
 addons/crm/crm_lead.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 5f843f492d3..8f2541e3047 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -584,7 +584,7 @@ class crm_lead(crm_case, osv.osv):
                     'name': lead.contact_name,
                     'phone': lead.phone,
                     'mobile': lead.mobile,
-                    'email': to_email(lead.email_from)[0],
+                    'email': lead.email_from and to_email(lead.email_from)[0],
                     'fax': lead.fax,
                     'title': lead.title and lead.title.id or False,
                     'function': lead.function,
@@ -606,7 +606,6 @@ class crm_lead(crm_case, osv.osv):
             context = {}
         partner_ids = {}
         for lead in self.browse(cr, uid, ids, context=context):
-            partner_id = lead.partner_id and lead.partner_id.id or False
             if action == 'create': 
                 if not partner_id:
                     partner_id = self._lead_create_partner(cr, uid, lead, context=context)

From d1743014643808875d557b4b11184adf1c96d1fb Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 1 Nov 2011 18:30:12 +0530
Subject: [PATCH 084/132] [FIX] crm : Fixed Tracback for  schedule another
 phonecall from wizard

bzr revid: ron@tinyerp.com-20111101130012-c2a7hkittfc6pwvq
---
 addons/crm/crm_phonecall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index a0c85268f27..8763324566c 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -148,7 +148,7 @@ class crm_phonecall(crm_base, osv.osv):
             vals = {
                     'name' : call_summary,
                     'user_id' : user_id or False,
-                    'categ_id' : categ_id or False,
+                    'categ_id' : categ_id.id or False,
                     'description' : call.description or False,
                     'date' : schedule_time,
                     'section_id' : section_id or False,

From 1627d5e2c1130453cf4de973f39fa03bb66acee4 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 1 Nov 2011 18:44:21 +0530
Subject: [PATCH 085/132] [FIX] crm : Fixed while converting opportunity from
 phonecall wizard

bzr revid: ron@tinyerp.com-20111101131421-2cb2x5oc9yufuc3q
---
 addons/crm/crm_phonecall.py                             | 1 +
 addons/crm/wizard/crm_phonecall_to_opportunity_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 8763324566c..2443bd71943 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -238,6 +238,7 @@ class crm_phonecall(crm_base, osv.osv):
         address = self.pool.get('res.partner.address')
         opportunity = self.pool.get('crm.lead')
         opportunity_dict = {}
+        default_contact = False
         for call in self.browse(cr, uid, ids, context=context):
             if not partner_id:
                 partner_id = call.partner_id and call.partner_id.id or False
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index ea024831b54..d3c59f89433 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -19,7 +19,7 @@
                     <group colspan="4" col="3" >
                     	<label string=" " />
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
-                        <button name="action_apply" type="object" string="_Convert" icon="gtk-convert" />
+                        <button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" />
                     </group>
                 </form>
             </field>

From 948fd652d7583b2ba45c06134e6731f785175d1b Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 1 Nov 2011 18:52:53 +0530
Subject: [PATCH 086/132] [FIX] crm : Put type=action on button wizard which
 convert opportunity from lead

bzr revid: ron@tinyerp.com-20111101132253-xzxchp48foo3it3d
---
 addons/crm/crm_lead_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0e2b5dfd3a1..25d081c23cc 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -62,6 +62,7 @@
                          name="%(crm.action_crm_lead2opportunity_partner)d"
                          string="Convert to Opportunity"
                          help="Convert to Opportunity" icon="gtk-go-forward"
+                         type="action"
                          />
                     <newline />
                     <field name="user_id" />

From 9feccaa1938f07db44ea48d703030f5ebd0b2a49 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 2 Nov 2011 11:00:58 +0530
Subject: [PATCH 087/132] [IMP] crm : Improved revison-5419 for  schedule
 another phonecall from wizard

bzr revid: ron@tinyerp.com-20111102053058-80m1gdkrdyskzmj6
---
 addons/crm/crm_phonecall.py                     | 2 +-
 addons/crm/wizard/crm_phonecall_to_phonecall.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 2443bd71943..af590235de3 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -148,7 +148,7 @@ class crm_phonecall(crm_base, osv.osv):
             vals = {
                     'name' : call_summary,
                     'user_id' : user_id or False,
-                    'categ_id' : categ_id.id or False,
+                    'categ_id' : categ_id or False,
                     'description' : call.description or False,
                     'date' : schedule_time,
                     'section_id' : section_id or False,
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index da04028f38d..5b505b3d852 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -57,7 +57,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
             phocall_ids = phonecall.schedule_another_phonecall(cr, uid, phonecall_ids, this.date, this.name, \
                     this.user_id and this.user_id.id or False, \
                     this.section_id and this.section_id.id or False, \
-                    this.categ_id and this.categ_id or False, \
+                    this.categ_id and this.categ_id.id or False, \
                     action=this.action, context=context)
 
         return phonecall.redirect_phonecall_view(cr, uid, phocall_ids[phonecall_ids[0]], context=context)

From 1e1b32833e53ebb62d49b7bf5041362702f637e8 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 2 Nov 2011 12:23:28 +0530
Subject: [PATCH 088/132] [IMP] crm: Put assert checking on cancel_lead.yml

bzr revid: ron@tinyerp.com-20111102065328-f2slcokzkap9pldn
---
 addons/crm/test/process/cancel_lead.yml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index ad7bc7ba841..a5f85a14058 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -7,7 +7,7 @@
   I check cancelled lead.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in cancel state}:
-     - state == "cancel"
+    - state == "cancel"
 -
   I reset cancelled lead into unqualified lead.
 -
@@ -17,7 +17,7 @@
   I check unqualified lead after reset.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in draft state}:
-     - state == "draft"
+    - state == "draft"
 -
   I put unqualified lead into pending.
 -
@@ -27,18 +27,27 @@
   I check status of pending lead.
 -
   !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Lead is in pending state}:
-     - state == "pending"
+    - state == "pending"
 -
   I Escalate the Lead to Parent Team.
 -
   !python {model: crm.lead}: |
     self.case_escalate(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-
 -
-  I mark as lost the Lead.
+  I check lead escalate to Parent Team.
+-
+  !assert {model: crm.lead, id: crm.crm_case_itisatelesalescampaign0, string: Escalate lead to parent team}:
+    - section_id.name == "Sales Department"
+-
+  I mark as lost the opportunity.
 -
   !python {model: crm.lead}: |
     self.case_mark_lost(cr, uid, [ref("crm_case_itisatelesalescampaign0")])
-
-
-
+-
+  I check opportunity after lost.
+-
+  !python {model: crm.lead}: |
+    lead = self.browse(cr, uid, ref('crm_case_itisatelesalescampaign0'))
+    assert lead.state == 'done', "lead is not done state"
+    assert lead.stage_id.id == ref('crm.stage_lead6'), 'Stage is not changed!'
+    assert lead.probability == 0.0, 'Probability is wrong!'

From f9550c9f2c1ea3eb3210866e5ad26190ee947156 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 2 Nov 2011 12:57:21 +0530
Subject: [PATCH 089/132] [FIX, REF] crm : Fixed Tracback for  converting
 phonecall to partner from wizard and donot need to loop for create partner so
 removed it

bzr revid: ron@tinyerp.com-20111102072721-xeq9ofkve0n8lk79
---
 addons/crm/crm_phonecall.py                   | 1 -
 addons/crm/wizard/crm_phonecall_to_partner.py | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index af590235de3..99027a5259a 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -197,7 +197,6 @@ class crm_phonecall(crm_base, osv.osv):
             context = {}
         partner_ids = {}
         for call in self.browse(cr, uid, ids, context=context):
-            partner_id = call.partner_id and call.partner_id.id or False
             if action == 'create':
                if not partner_id:
                    partner_id = self._call_create_partner(cr, uid, call, context=context)
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index cfa97f589be..0fa077bbf42 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -61,11 +61,12 @@ class crm_phonecall2partner(osv.osv_memory):
         if context is None:
             context = {}
         phonecall = self.pool.get('crm.phonecall')
+
+        data = self.browse(cr, uid, ids, context=context)[0]
         call_ids = context and context.get('active_ids') or []
-        for data in self.browse(cr, uid, ids, context=context):
-            partner_id = data.partner_id and data.partner_id.id or False
-            partner_ids += phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
-        return partner_ids
+        partner_id = data.partner_id and data.partner_id.id or False
+        partner_ids = phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
+        return partner_ids[call_ids[0]]
 
 crm_phonecall2partner()
 

From 865e144c4c17ccc7e7d2188cc7c824b188b27e95 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 2 Nov 2011 15:07:39 +0530
Subject: [PATCH 090/132] [IMP] crm: Put assert checking on
 communication_with_customer.yml for converted phonecall to partner

bzr revid: ron@tinyerp.com-20111102093739-tdc0014h20cdnqii
---
 .../test/process/communication_with_customer.yml    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 56a0e8acde1..9403f04902a 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -29,26 +29,31 @@
         self.send_mail(cr, uid, [id], context=context)
     except:
         pass
-
-
 -
   Now, I convert him into customer and put into regular customer list.
 -
   !python {model: crm.lead}: |
     lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     self.convert_partner(cr, uid, lead_ids, context=context)
-
 -
   Now, I search customer in regular customer list.
 -
   !python {model: crm.lead}: |
     partner_ids = self.message_partner_by_email(cr, uid, 'Mr. John Right <info@customer.com>')
     assert partner_ids.get('partner_id'), "Customer is not found in regular customer list."
-
 -
   I convert one phonecall request as a customer and put into regular customer list.
 -
   !python {model: crm.phonecall}: |
     self.convert_partner(cr, uid, [ref('crm.crm_case_phone06')], context=context)
+-
+  I check coverted phonecall to partner.
+-
+  !python {model: res.partner}: |
+    partner_id = self.search(cr, uid, [('phonecall_ids', '=', ref('crm.crm_case_phone06'))])
+    assert partner_id, "Customer is not found in regular customer list."
+    data = self.browse(cr, uid, partner_id, context=context)[0]
+    assert data.user_id.id == ref("base.user_root"), "User not assign properly"
+    assert data.name == "Bad time", "User not assign properly"
 
 

From 5c1632a9a2ef3dff98eb37f3f8883a14912693b5 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 2 Nov 2011 17:14:54 +0530
Subject: [PATCH 091/132] [IMP] crm: Put assert checking on
 lead2opportunity2win.yml for mass_convert opportunity

bzr revid: ron@tinyerp.com-20111102114454-x3vb5xd8m9youchm
---
 .../crm/test/process/lead2opportunity2win.yml | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index c5f2afd676d..583fb1e7f08 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -10,7 +10,6 @@
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
      - state == "open"
-
 -
   I convert lead into opportunity for exiting customer.
 -
@@ -39,7 +38,6 @@
   !python {model: crm.phonecall}: |
     ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_qrecorp0'))])
     assert len(ids), 'phonecall is not scheduled'
-
 -
   Now I schedule Meeting with Customer.
 -
@@ -66,12 +64,27 @@
     assert lead.state == 'done', 'Opportunity is not in done state!'
     assert lead.stage_id.name == 'Won', ' Stage of Opportunity is not win!'
     assert lead.probability == 100.0, 'probability revenue should not  be 100.0!'
-
 -
   I convert mass lead into opportunity customer.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_itdeveloper0')]})
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_employee0"), ref("crm_case_electonicgoodsdealer0")], 'active_id': ref("crm_case_qrecorp0")}) 
     id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
-    self.mass_convert(cr, uid, [id], context=context)   
-
+    self.mass_convert(cr, uid, [id], context=context)
+-
+  Now i check First lead converted on opportunity.
+-
+  !python {model: crm.lead}: |
+    opp = self.browse(cr, uid, ref('crm_case_employee0'))
+    assert opp.name == "Need Info about Onsite Intervention", "Opportunity name not correct"
+    assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert opp.partner_id.name == "Agrolait", 'Partner missmatch!'
+    assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
+-
+  Then check for Second lead converted on opportunity.
+-
+  !python {model: crm.lead}: |
+    opp = self.browse(cr, uid, ref('crm_case_electonicgoodsdealer0'))
+    assert opp.name == "Interest in Your New Product", "Opportunity name not correct"
+    assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
+    assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
\ No newline at end of file

From e9149c52fff3c3637cf72d4a035aed7ec5a98d4e Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 2 Nov 2011 18:21:11 +0530
Subject: [PATCH 092/132] [IMP] crm: Put assert checking on
 merge_opportunity.yml for merge opportunity

bzr revid: ron@tinyerp.com-20111102125111-b70gnc5fezjby964
---
 addons/crm/test/process/merge_opportunity.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 2c3ad010255..b7d86f00c47 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -19,7 +19,15 @@
   !python {model: crm.lead}: |
     opportunity_ids = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
     self.merge_opportunity(cr, uid, opportunity_ids, context=context)
-
+-
+  I check for merged opportunities for customer.
+-
+  !python {model: crm.lead}: |
+    merge_id = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
+    assert merge_id, 'Fail to create Merge opportunity'
+    merge_data = self.browse(cr, uid, merge_id)[0]
+    assert merge_data.type == 'opportunity', 'Merged opportunity type not change!'
+    assert merge_data.partner_id.id == ref("base.res_partner_9"), 'Partner missmatch!'
 -
   Now I schedule another phonecall to customer after merged.
 -
@@ -27,13 +35,11 @@
     context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_case_phone06")]})
     res_id = self.create(cr, uid, {'name': "vos chances sont fusionnés en un seul"}, context=context)
     self.action_schedule(cr, uid, [res_id], context=context)
-
 - 
   I schedule Meeting on this phonecall.
 -
    !python {model: crm.phonecall}: |
      self.action_make_meeting(cr, uid, [ref("crm.crm_case_phone06")])
-
 -
   I setting Phone call to Held (Done).
 -

From b62ace082d2706e652ac3c2fb32034c700f516ed Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 2 Nov 2011 18:51:55 +0530
Subject: [PATCH 093/132] [IMP] crm: Fixed, Traceback generated when converting
 to phonecall to opportunity and opportunity to phonecall

bzr revid: ron@tinyerp.com-20111102132155-vsx88zcemuqjbucs
---
 addons/crm/wizard/crm_opportunity_to_phonecall.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index a6383438350..969a9c78644 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -41,7 +41,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
             categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
 
         record_ids = context and context.get('active_ids', []) or []
-        res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context)
+        res = {}
         res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for opp in opp_obj.browse(cr, uid, record_ids, context=context):
             if 'name' in fields:

From 7b9390159a9a8b005f256b07b2c88b9f9d540bef Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 3 Nov 2011 10:58:03 +0530
Subject: [PATCH 094/132] [REM] crm, crm_helpdesk, crm_claim, crm_fundraising:
 Removed Unwanted spaces

bzr revid: ron@tinyerp.com-20111103052803-eamc7z5xb8kf5usj
---
 addons/crm/test/process/communication_with_customer.yml | 3 ---
 addons/crm/test/process/merge_opportunity.yml           | 6 ++----
 addons/crm_claim/test/process/claim.yml                 | 2 --
 addons/crm_fundraising/test/process/fund-rising.yml     | 3 ---
 addons/crm_helpdesk/test/process/help-desk.yml          | 1 -
 5 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 9403f04902a..a0a2da1016d 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -8,7 +8,6 @@
     request_file = open(addons.get_module_resource('crm','test', 'customer_request.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.lead', request_message)
-
 -
   After getting the mail, I check details of new lead of that customer.
 -
@@ -55,5 +54,3 @@
     data = self.browse(cr, uid, partner_id, context=context)[0]
     assert data.user_id.id == ref("base.user_root"), "User not assign properly"
     assert data.name == "Bad time", "User not assign properly"
-
-
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index b7d86f00c47..e27610fd671 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -5,7 +5,6 @@
     context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_9")]})
     res_id = self.create(cr, uid, {'name': "enquête pour l'achat de services"}, context=context)
     self.make_opportunity(cr, uid, [res_id], context=context)
-    
 -
   I make another opportunity from phonecall for same customer.
 -
@@ -38,8 +37,8 @@
 - 
   I schedule Meeting on this phonecall.
 -
-   !python {model: crm.phonecall}: |
-     self.action_make_meeting(cr, uid, [ref("crm.crm_case_phone06")])
+  !python {model: crm.phonecall}: |
+    self.action_make_meeting(cr, uid, [ref("crm.crm_case_phone06")])
 -
   I setting Phone call to Held (Done).
 -
@@ -50,4 +49,3 @@
 -
   !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call Helded}:
     - state == "done"
-
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index 43389726357..f82a70f6988 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -8,7 +8,6 @@
     request_file = open(addons.get_module_resource('crm_claim','test', 'customer_claim.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.claim', request_message)
-
 -
   After getting the mail, I check details of new claim of that customer.
 -
@@ -18,7 +17,6 @@
     assert claim_ids and len(claim_ids), "Claim is not created after getting request"
     claim = self.browse(cr, uid, claim_ids[0], context=context)
     assert claim.name == tools.ustr("demande derèglement de votre produit."), "Subject does not match"
-
 -
   I open customer claim.
 -
diff --git a/addons/crm_fundraising/test/process/fund-rising.yml b/addons/crm_fundraising/test/process/fund-rising.yml
index df16a9d2e70..b49f1f5c1bd 100644
--- a/addons/crm_fundraising/test/process/fund-rising.yml
+++ b/addons/crm_fundraising/test/process/fund-rising.yml
@@ -8,7 +8,6 @@
     request_file = open(addons.get_module_resource('crm_fundraising','test', 'customer_fundraising.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.fundraising', request_message)
-
 -
   After getting the mail, I check details of new fundraising of that customer.
 -
@@ -18,5 +17,3 @@
     assert fund_ids and len(fund_ids), "Fund is not created after getting request"
     fund = self.browse(cr, uid, fund_ids[0], context=context)
     assert fund.name == tools.ustr("Demande de controbute dans votre fonds."), "Subject does not match"
-
-
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index 250cb9e5dc2..353dbd6aad2 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -8,7 +8,6 @@
     request_file = open(addons.get_module_resource('crm_helpdesk','test', 'customer_question.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.helpdesk', request_message)
-
 -
   After getting the mail, I check details of new question of that customer.
 -

From f7591afdbe29e87b62fc0b9858dbd46b1b850c5f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 3 Nov 2011 11:44:32 +0530
Subject: [PATCH 095/132] [REF, IMP]: crm: Improved the quality of code, * Used
 get_object_reference instead of _get_id from ir.model.data object when
 redirect_phonecall_view, redirect_partner_form, redirect_opportunity_view, *
 Changed variable names

bzr revid: ron@tinyerp.com-20111103061432-3jubdl6rpvq0oz3b
---
 addons/crm/crm_lead.py      | 17 ++++-------------
 addons/crm/crm_phonecall.py | 17 +++++------------
 addons/crm/res_partner.py   |  7 ++-----
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 8f2541e3047..a1252046a81 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -688,17 +688,8 @@ class crm_lead(crm_case, osv.osv):
         models_data = self.pool.get('ir.model.data')
 
         # Get Opportunity views
-        opportunity_view_form = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_form_view_oppor')
-        opportunity_view_tree = models_data._get_id(
-            cr, uid, 'crm', 'crm_case_tree_view_oppor')
-        if opportunity_view_form:
-            opportunity_view_form = models_data.browse(
-                cr, uid, opportunity_view_form, context=context).res_id
-        if opportunity_view_tree:
-            opportunity_view_tree = models_data.browse(
-                cr, uid, opportunity_view_tree, context=context).res_id
-
+        form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+        tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
         return {
                 'name': _('Opportunity'),
                 'view_type': 'form',
@@ -707,8 +698,8 @@ class crm_lead(crm_case, osv.osv):
                 'domain': [('type', '=', 'opportunity')],
                 'res_id': int(opportunity_id),
                 'view_id': False,
-                'views': [(opportunity_view_form, 'form'),
-                          (opportunity_view_tree, 'tree'),
+                'views': [(form_view and form_view[1] or False, 'form'),
+                          (tree_view and tree_view[1] or False, 'tree'),
                           (False, 'calendar'), (False, 'graph')],
                 'type': 'ir.actions.act_window',
         }
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 99027a5259a..9fab592fd20 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -209,25 +209,18 @@ class crm_phonecall(crm_base, osv.osv):
     def redirect_phonecall_view(self, cr, uid, phonecall_id, context=None):
         model_data = self.pool.get('ir.model.data')
         # Select the view
-        id2 = model_data._get_id(cr, uid, 'crm', 'crm_case_phone_tree_view')
-        id3 = model_data._get_id(cr, uid, 'crm', 'crm_case_phone_form_view')
-        if id2:
-            id2 = model_data.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = model_data.browse(cr, uid, id3, context=context).res_id
-
-        result = model_data._get_id(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-        res = model_data.read(cr, uid, result, ['res_id'])
-
+        tree_view = model_data.get_object_reference(cr, uid, 'crm', 'crm_case_phone_tree_view')
+        form_view = model_data.get_object_reference(cr, uid, 'crm', 'crm_case_phone_form_view')
+        search_view = model_data.get_object_reference(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
         value = {
                 'name': _('Phone Call'),
                 'view_type': 'form',
                 'view_mode': 'tree,form',
                 'res_model': 'crm.phonecall',
                 'res_id' : int(phonecall_id),
-                'views': [(id3, 'form'), (id2, 'tree'), (False, 'calendar')],
+                'views': [(form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree'), (False, 'calendar')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
+                'search_view_id': search_view and search_view[1] or False,
         }
         return value
 
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index a00a25f47a4..e2016f6d8aa 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -35,10 +35,7 @@ class res_partner(osv.osv):
     }
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
-        model_data = self.pool.get('ir.model.data')
-        result = model_data._get_id(cr, uid, 'base', 'view_res_partner_filter')
-        res = model_data.read(cr, uid, result, ['res_id'])
-
+        search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
         value = {
             'domain': "[]",
             'view_type': 'form',
@@ -48,7 +45,7 @@ class res_partner(osv.osv):
             'view_id': False,
             'context': context,
             'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id']
+            'search_view_id': search_view and search_view[1] or False
         }
         return value
 

From 9702726bcef39f08784c1ad5de0ca174d0834b24 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 3 Nov 2011 12:50:58 +0530
Subject: [PATCH 096/132] [REF, IMP]: crm: * Used get_object_reference instead
 of _get_id from ir.model.data on action_makeMeeting, * Changed variable names

bzr revid: ron@tinyerp.com-20111103072058-6ys2chw1pjm412hb
---
 addons/crm/crm_lead.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index a1252046a81..f6e28a3283a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -768,17 +768,10 @@ class crm_lead(crm_case, osv.osv):
             data_obj = self.pool.get('ir.model.data')
 
             # Get meeting views
-            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
-            res = data_obj.read(cr, uid, result, ['res_id'])
-            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
-            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
-            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
-            if id1:
-                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-            if id2:
-                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            if id3:
-                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+            tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_meet')
+            calander_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_meetings_filter')
 
             context = {
                 'default_opportunity_id': opp.id,
@@ -796,9 +789,9 @@ class crm_lead(crm_case, osv.osv):
                 'view_mode': 'calendar,form,tree',
                 'res_model': 'crm.meeting',
                 'view_id': False,
-                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'views': [(calander_view and calander_view[1] or False, 'calendar'), (form_view and form_view[1] or False, 'form'), (tree_view and tree_view[1] or False, 'tree')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id'],
+                'search_view_id': search_view and search_view[1] or False,
                 'nodestroy': True
             }
         return value

From 58ca719722886eae8d04ce655517ff7a7b13e29c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 3 Nov 2011 18:39:51 +0530
Subject: [PATCH 097/132] [IMP] crm: Improved demo data and add step to
 segmantion line record

bzr revid: ron@tinyerp.com-20111103130951-zk0a514mdnj5bmq7
---
 addons/crm/crm_demo.xml                  | 1 +
 addons/crm/test/process/segmentation.yml | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index e30ce11cf00..f345d86d030 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -20,6 +20,7 @@
 
     <record model="crm.segmentation" id="crm_segmentation0">
 		<field name="name">OpenERP partners</field>
+		<field name="exclusif">True</field>
 		<field name="categ_id" ref="base.res_partner_category_2"/>
 	</record>
 
diff --git a/addons/crm/test/process/segmentation.yml b/addons/crm/test/process/segmentation.yml
index ea2998c1870..74500049290 100644
--- a/addons/crm/test/process/segmentation.yml
+++ b/addons/crm/test/process/segmentation.yml
@@ -7,3 +7,10 @@
     self.process_start(cr, uid, [ref("crm_segmentation0")],context)
     #Todo: Need to check after segmentation started
 
+-
+  I create rule Segmentation line record for partner .
+-
+  !python {model: crm.segmentation.line}: |
+    id = self.create(cr, uid, {'name': "OpenERP partners",'expr_value': 25})
+    self.test(cr, uid, [id],partner_id=0)
+    #Todo: Need to test segmantation line record
\ No newline at end of file

From 52281da87a7517c4225f8dc57aeeab1517a76922 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 4 Nov 2011 11:17:32 +0530
Subject: [PATCH 098/132] [IMP] crm_claim: Added case for update message for
 claim record

bzr revid: ron@tinyerp.com-20111104054732-c1okit7rzs5p4y1i
---
 addons/crm_claim/test/ui/onchange_events.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/crm_claim/test/ui/onchange_events.yml b/addons/crm_claim/test/ui/onchange_events.yml
index 9068b074512..18cc136f47b 100644
--- a/addons/crm_claim/test/ui/onchange_events.yml
+++ b/addons/crm_claim/test/ui/onchange_events.yml
@@ -11,4 +11,12 @@
 -
   !python {model: crm.claim}: |
     self.onchange_partner_address_id(cr, uid, ref('crm_case_claim04'), ref("base.res_partner_address_notsotinysarl0"), email=False)
-    
+-
+  I Update the message for claim.
+-
+  !python {model: crm.claim}: |
+    try:
+      self.message_update(cr, uid,[ref('crm_case_claim04')], {'subject': 'Claim Update record','body_text': 'first training session completed',})
+    except:
+      pass
+  
\ No newline at end of file

From ad9fb2b6cb2581de281a477a528bfab71f473d0e Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 4 Nov 2011 11:36:42 +0530
Subject: [PATCH 099/132] [IMP] crm_helpdesk: Added case for update message for
 helpdesk record

bzr revid: ron@tinyerp.com-20111104060642-hnckj64pz42y9w2m
---
 addons/crm_helpdesk/test/process/help-desk.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index 353dbd6aad2..320bd61c2af 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -17,5 +17,14 @@
     assert question_ids and len(question_ids), "Question is not created after getting request"
     question = self.browse(cr, uid, question_ids[0], context=context)
     assert question.name == tools.ustr("Where is download link of user manual of your product ? "), "Subject does not match"
+-
+  Now I Update message according to provide services.
+-
+  !python {model: crm.helpdesk}: |
+    question_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
+    try:
+      self.message_update(cr, uid, question_ids, {'subject': 'Link of product', 'body_text': 'www.openerp.com'})
+    except:
+      pass
 
 

From 2964c7a54b9b9cea121fee9335e52969c15e6a4b Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 4 Nov 2011 13:00:13 +0530
Subject: [PATCH 100/132] [ADD, IMP] crm_partner_assign: Added
 onchange_events.yml and improved action_forword funtion in process yml

bzr revid: ron@tinyerp.com-20111104073013-wkd61npv1vq2cv5z
---
 addons/crm_partner_assign/__openerp__.py                  | 1 +
 addons/crm_partner_assign/test/process/partner_assign.yml | 2 +-
 addons/crm_partner_assign/test/ui/onchange_events.yml     | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 addons/crm_partner_assign/test/ui/onchange_events.yml

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 1752c52f839..070cef377f0 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -51,6 +51,7 @@ You can also use the geolocalization without using the GPS coordinates.
     ],
     'test': [
         'test/process/partner_assign.yml',
+        'test/ui/onchange_events.yml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/crm_partner_assign/test/process/partner_assign.yml b/addons/crm_partner_assign/test/process/partner_assign.yml
index 01d771f9ad5..ddccd92167e 100644
--- a/addons/crm_partner_assign/test/process/partner_assign.yml
+++ b/addons/crm_partner_assign/test/process/partner_assign.yml
@@ -33,6 +33,6 @@
     context.update({'active_model': 'crm.lead', 'active_id': ref('crm.crm_case_abcfuelcounits0'), 'active_ids': [ref('crm.crm_case_abcfuelcounits0')]})
     forward_id = self.create(cr, uid, {'send_to': 'partner'}, context=context)
     try:
-      self.action_forward(cr, uid, ref("crm_lead_forward_to_partner_rec"), context=context)
+      self.action_forward(cr, uid, [forward_id], context=context)
     except:
       pass
diff --git a/addons/crm_partner_assign/test/ui/onchange_events.yml b/addons/crm_partner_assign/test/ui/onchange_events.yml
new file mode 100644
index 00000000000..a178e767eb2
--- /dev/null
+++ b/addons/crm_partner_assign/test/ui/onchange_events.yml
@@ -0,0 +1,7 @@
+-
+  I call onchange event to change partner address and Email.
+-
+  !python {model: crm.lead.forward.to.partner}: |
+    action = self.on_change_partner(cr, uid, ref("crm.crm_case_qrecorp0"), ref("base.res_partner_9"))
+    assert action['value']['email_to'] == 'info@balmerinc.be', "Email is wrong"
+    self.on_change_email(cr, uid, [ref('crm.crm_case_qrecorp0')], ref('base.user_root'))

From fee0a8a8f5993d65266f9f55275169b58632ee0c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 21 Nov 2011 15:16:35 +0530
Subject: [PATCH 101/132] [REF] crm: Organized view of crm.phonecall and add
 remain fields on sedule onether call(contact_name, phone, note)

bzr revid: ron@tinyerp.com-20111121094635-7z9rrig0xfcup7uj
---
 addons/crm/wizard/crm_opportunity_to_phonecall_view.xml | 3 ++-
 addons/crm/wizard/crm_phonecall_to_phonecall.py         | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 338f35810fd..5527e82c2e9 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -26,8 +26,9 @@
                         <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
                         <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
                     </group>
+                    <separator string="Notes" colspan="4"/>
                     <group colspan="4">
-                        <field name="note"/>
+                        <field name="note" colspan="4" nolabel="1"/>
                     </group>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="3">
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index 5b505b3d852..d68591ab0b7 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -31,6 +31,8 @@ class crm_phonecall2phonecall(osv.osv_memory):
     _columns = {
         'name' : fields.char('Call summary', size=64, required=True, select=1),
         'user_id' : fields.many2one('res.users',"Assign To"),
+        'contact_name':fields.char('Contact', size=64),
+        'phone':fields.char('Phone', size=64),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                 domain="['|',('section_id','=',False),('section_id','=',section_id),\
                 ('object_id.model', '=', 'crm.phonecall')]"), 
@@ -38,6 +40,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
         'section_id':fields.many2one('crm.case.section','Sales Team'),
         'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True),
         'partner_id' : fields.many2one('res.partner', "Partner"),
+        'note':fields.text('Note')
     }
 
 

From 44164a38b85228e11be719bd60a64613329f5892 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 22 Nov 2011 12:11:59 +0530
Subject: [PATCH 102/132] [ADD, REF]: crm: * added files
 crm/test/ui/delete_lead.yml and test/ui/delete_lead.yml, * renamed file
 crm/test/ui/onchange_events.yml => crm/test/ui/demo_data.yml, *
 Differentiated process of duplicate and unlink lead and created record for
 onchange event

bzr revid: ron@tinyerp.com-20111122064159-ao94c52img0ulry0
---
 addons/crm/__openerp__.py              |  4 ++-
 addons/crm/test/ui/delete_lead.yml     |  5 +++
 addons/crm/test/ui/demo_data.yml       | 29 +++++++++++++++
 addons/crm/test/ui/duplicate_lead.yml  |  5 +++
 addons/crm/test/ui/onchange_events.yml | 50 --------------------------
 5 files changed, 42 insertions(+), 51 deletions(-)
 create mode 100644 addons/crm/test/ui/delete_lead.yml
 create mode 100644 addons/crm/test/ui/demo_data.yml
 create mode 100644 addons/crm/test/ui/duplicate_lead.yml
 delete mode 100644 addons/crm/test/ui/onchange_events.yml

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 1fde08ddd6e..ba073060456 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,9 @@ Creates a dashboard for CRM that includes:
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/segmentation.yml',
-            'test/ui/onchange_events.yml',
+            'test/ui/demo_data.yml',
+            'test/ui/duplicate_lead.yml',
+            'test/ui/delete_lead.yml'
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/test/ui/delete_lead.yml b/addons/crm/test/ui/delete_lead.yml
new file mode 100644
index 00000000000..472b22d0d2d
--- /dev/null
+++ b/addons/crm/test/ui/delete_lead.yml
@@ -0,0 +1,5 @@
+-
+  I Unlink the Lead.
+-
+  !python {model: crm.lead}: |
+     self.unlink(cr, uid, [ref("crm_case_qrecorp0")])
diff --git a/addons/crm/test/ui/demo_data.yml b/addons/crm/test/ui/demo_data.yml
new file mode 100644
index 00000000000..5ef40838466
--- /dev/null
+++ b/addons/crm/test/ui/demo_data.yml
@@ -0,0 +1,29 @@
+-
+  I create lead record to call of partner onchange, stage onchange and Mailing opt-in onchange method.
+-
+  !record {model: crm.lead, id: crm_case_shelvehouse}:
+    name: 'Need more info about your pc2'
+    partner_id: base.res_partner_theshelvehouse0
+    type: opportunity
+    stage_id: crm.stage_lead1
+    state: draft
+    optin: True
+-
+  I create lead record to call Mailing opt-out onchange method.
+-
+  !record {model: crm.lead, id: crm_case_mediapoleunits0}:
+    name: 'Need 20 Days of Consultancy'
+    type: opportunity
+    state: draft
+    optout: True
+-
+  I create phonecall record to call partner onchange method.
+-
+  !record {model: crm.phonecall, id: crm_case_phone05}:
+    name: 'Bad time'
+    partner_id: base.res_partner_5
+-
+  I setting next stage "New" for the lead.
+-
+  !python {model: crm.lead}: |
+    self.stage_next(cr, uid, [ref("crm_case_qrecorp0")], context={'stage_type': 'lead'})
diff --git a/addons/crm/test/ui/duplicate_lead.yml b/addons/crm/test/ui/duplicate_lead.yml
new file mode 100644
index 00000000000..6b349ca350c
--- /dev/null
+++ b/addons/crm/test/ui/duplicate_lead.yml
@@ -0,0 +1,5 @@
+-
+  I make duplicate the Lead.
+-
+  !python {model: crm.lead}: |
+    self.copy(cr, uid, ref("crm_case_qrecorp0"))
diff --git a/addons/crm/test/ui/onchange_events.yml b/addons/crm/test/ui/onchange_events.yml
deleted file mode 100644
index 7f1ef1c67a5..00000000000
--- a/addons/crm/test/ui/onchange_events.yml
+++ /dev/null
@@ -1,50 +0,0 @@
--
-  I call onchange event to change partner address for lead.
--
-  !python {model: crm.lead}: |
-    action = self.onchange_partner_address_id(cr, uid, ref("crm_case_qrecorp0"), ref("base.res_partner_address_notsotinysarl0"), email=False)
-    assert action['value']['phone'] == '(+32).81.81.37.00', "phone number is wrong"
--
-  I call onchange event to change email "Opt-out" option for Lead.
--
-  !python {model: crm.lead}: |
-    self.on_change_optout(cr, uid, ref("crm_case_qrecorp0"), True)
-
--
-  I call onchange event to convert the Opt-out to Opt-in to show email receive preference for lead.
--
-  !python {model: crm.lead}: |
-    self.on_change_optin(cr, uid, ref("crm_case_qrecorp0"), True)
-
--
-  I setting next stage "New" for the lead.
--
-   !python {model: crm.lead}: |
-     self.stage_next(cr, uid, [ref("crm_case_qrecorp0")], context={'stage_type': 'lead'})
--
-  I call onchange event to assigning won stage for Lead.
--
-  !python {model: crm.lead}: |
-    stage_id = self.stage_find_won(cr, uid, ref('crm.section_sales_department'))
-    self.onchange_stage_id(cr, uid, [ref("crm_case_qrecorp0")], stage_id, context)
--
-  I make duplicate the Lead.
--
-   !python {model: crm.lead}: |
-     self.copy(cr, uid, ref("crm_case_qrecorp0"))
-
--
-  I Unlink the Lead.
--
-  !python {model: crm.lead}: |
-     self.unlink(cr, uid, [ref("crm_case_qrecorp0")])
-
--
-  I call onchange event to change Contact Detail for Phonecall.
--
-  !python {model: crm.phonecall}: |
-    self.onchange_partner_address_id(cr, uid,[ref("crm.crm_case_phone06")], ref("base.res_partner_address_8invoice"))
-
-    
-
-

From 6712591a511e7b8cdc238aa94144cca5b1bc0237 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 22 Nov 2011 18:15:45 +0530
Subject: [PATCH 103/132] [FIX] crm: After installing crm_partner_assign,
 Traceback generated when opening opporutnity menu because parent_id field
 removed from latest addons and another view depend on this field

bzr revid: ron@tinyerp.com-20111122124545-geqjeymbsj60i0n9
---
 addons/crm/crm_lead_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0b004fb7d8e..0822b054cc1 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -690,6 +690,7 @@
                     domain="[('state','=','pending')]"/>
                 <separator orientation="vertical"/>
                 <field name="name" string="Opportunity / Customer" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                <field name="partner_id" string="Customer / Email" filter_domain="['|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]"/>
                 <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"

From c565752d0000b6c9f9c8ae74719207a6d52c163a Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 22 Nov 2011 18:57:15 +0530
Subject: [PATCH 104/132] [FIX] crm: Clicked on forword button for lead forward
 to its partner, Its gave traceback

bzr revid: ron@tinyerp.com-20111122132715-hiqd32vdckfxdqg1
---
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 29a60ba71ba..c49115078cd 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -64,9 +64,10 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         res = {}
         res_id = context.get('active_id')
         model = context.get('active_model')
-        body_text = self._get_body_text(cr, uid, model, res_id, history_type, context=context)
+        lead = self.pool.get(model).browse(cr, uid, res_id, context)
+        body_text = self._get_info_body_text(cr, uid, lead, context=context)
         context['mail.compose.message.body'] = history_type
-        if msg_val:
+        if body_text:
             res = {'value': {'body_text' : body_text}}
         return res
     

From e2c80d7ca8bf0611fb5ea8c27e17f8d6a37dc6b0 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 11:13:47 +0530
Subject: [PATCH 105/132] [FIX] crm: Click on Ge Assing button Traceback
 generate , put comments created demo data of crm_lead for onchange event

bzr revid: ron@tinyerp.com-20111123054347-0mo8pkly1857beff
---
 addons/crm/__openerp__.py                       | 2 +-
 addons/crm_partner_assign/crm_lead_view.xml     | 2 +-
 addons/crm_partner_assign/partner_geo_assign.py | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ba073060456..f7d56ce373b 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/segmentation.yml',
-            'test/ui/demo_data.yml',
+            #'test/ui/demo_data.yml', TODO : After installing crm_partner_assign view error  
             'test/ui/duplicate_lead.yml',
             'test/ui/delete_lead.yml'
              ],
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 2ec3c85353b..7cf47b95939 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -27,7 +27,7 @@
                                 <field name="partner_latitude"/>
                                 <field name="partner_longitude"/>
                                 <group colspan="1" col="1">
-                                    <button string="Geo Assign" name="assign_partner" type="object" colspan="1"
+                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
                                         icon="gtk-apply"/>
                                 </group>
                             </group>
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 14e15959a3d..89f04c3216b 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -118,6 +118,9 @@ class crm_lead(osv.osv):
                          'user_id' : user_id}
                    }
 
+    def action_assign_partner(self, cr, uid, ids, context=None):
+        return self.assign_partner(cr, uid, ids, partner_id=False, context=context)
+
     def assign_partner(self, cr, uid, ids, partner_id=False, context=None):
         partner_ids = {}
         res = False
@@ -127,6 +130,9 @@ class crm_lead(osv.osv):
         for lead in self.browse(cr, uid, ids, context=context):
             if not partner_id:
                 partner_id = partner_ids.get(lead.id, False)
+            if not partner_id:
+                continue
+            self.assign_geo_localize(cr, uid, [lead.id], lead.partner_latitude, lead.partner_longitude, context=context)
             partner = res_partner.browse(cr, uid, partner_id, context=context)
             if partner.user_id:
                 for lead_id in ids:
@@ -188,7 +194,7 @@ class crm_lead(osv.osv):
                 # 5. fifth way: anywhere in same country
                 if not partner_ids:
                     # still haven't found any, let's take all partners in the country!
-                    partner_ids = partner.search(cr, uid, [
+                    partner_ids = res_partner.search(cr, uid, [
                         ('partner_weight', '>', 0),
                         ('country', '=', lead.country_id.id),
                     ], context=context)

From 5146498497df000b683d07d611d3e46bf05ea977 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 11:33:38 +0530
Subject: [PATCH 106/132] [FIX] crm_claim: Removed fields partner_mobile,
 active ,date_open field because thats not in object model

bzr revid: ron@tinyerp.com-20111123060338-eekz5u4nnu1xa0ox
---
 addons/crm_claim/crm_claim.py       |  2 --
 addons/crm_claim/crm_claim_demo.xml | 14 --------------
 2 files changed, 16 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index b5cd2009698..5262c6ae7b8 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -129,8 +129,6 @@ class crm_claim(crm.crm_case, osv.osv):
             if l.state == 'draft':
                 message = _("The claim '%s' has been opened.") % l.name
                 self.log(cr, uid, l.id, message)
-                value = {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')}
-                self.write(cr, uid, [l.id], value)
                 stage_id = self.stage_find(cr, uid, l.section_id.id or False, [('sequence','>',0)])
                 if stage_id:
                     self.stage_set(cr, uid, [l.id], stage_id)
diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml
index 0f8488628b5..8279e04eb6f 100644
--- a/addons/crm_claim/crm_claim_demo.xml
+++ b/addons/crm_claim/crm_claim_demo.xml
@@ -15,8 +15,6 @@
             <field eval="&quot;Problem with the delivery of goods&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;(726) 782-0636&quot;" name="partner_mobile"/>
-            <field eval="1" name="active"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim1"/>
             <field eval="&quot;(769) 703-274&quot;" name="partner_phone"/>
@@ -31,8 +29,6 @@
             <field eval="&quot;Damaged Products&quot;" name="name"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;(392) 895-7917&quot;" name="partner_mobile"/>
-            <field eval="1" name="active"/>
             <field name="categ_id" ref="crm_claim.categ_claim2"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
             <field eval="&quot;(956) 293-2595&quot;" name="partner_phone"/>
@@ -47,8 +43,6 @@
             <field eval="&quot;Document related problems&quot;" name="name"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;(820) 167-3208&quot;" name="partner_mobile"/>
-            <field eval="1" name="active"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim2"/>
             <field eval="&quot;(079) 681-2139&quot;" name="partner_phone"/>
@@ -63,8 +57,6 @@
             <field eval="&quot;Product quality not maintained&quot;" name="name"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;(077) 582-4035&quot;" name="partner_mobile"/>
-            <field eval="1" name="active"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
             <field eval="&quot;(514) 698-4118&quot;" name="partner_phone"/>
@@ -79,8 +71,6 @@
             <field eval="&quot;Some products missing&quot;" name="name"/>
             <field eval="&quot;pending&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;(333) 715-1450&quot;" name="partner_mobile"/>
-            <field eval="1" name="active"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim3"/>
             <field eval="&quot;(855) 924-4364&quot;" name="partner_phone"/>
@@ -88,14 +78,12 @@
         
         <record id="crm_case_claim06" model="crm.claim">
             <field name="partner_address_id" ref="base.res_partner_address_1"/>
-            <field eval="1" name="active"/>
             <field name="partner_id" ref="base.res_partner_9"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Problem with the delivery of assignments&quot;" name="name"/>
             <field eval="&quot;cancel&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;(468) 017-2684&quot;" name="partner_mobile"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm_claim.categ_claim1"/>
             <field name="stage_id" ref="crm_claim.stage_claim5"/>
@@ -104,14 +92,12 @@
         </record>
         
         <record id="crm_case_claims07" model="crm.claim">
-            <field eval="1" name="active"/>
             <field name="partner_id" ref="base.res_partner_seagate"/>
             <field eval="&quot;3&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Documents unclear&quot;" name="name"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field eval="&quot;    (463) 014-1208&quot;" name="partner_mobile"/>
             <field eval="time.strftime('%Y-%m-19 13:01:05')" name="date"/>
             <field name="categ_id" ref="crm_claim.categ_claim3"/>
             <field name="stage_id" ref="crm_claim.stage_claim2"/>

From 932c96a6c12ad54337e203acb1225a86406b2482 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 11:58:13 +0530
Subject: [PATCH 107/132] [FIX] crm_claim: Convert into Opportunities from
 phonecall , we gave phonecall_id to lead, but model havenot phonecall_id

bzr revid: ron@tinyerp.com-20111123062813-a7y1emyl6oi1b7gt
---
 addons/crm/crm_phonecall.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index c49945edcd8..b9bb6d359b1 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -248,7 +248,6 @@ class crm_phonecall(crm_base, osv.osv):
                             'mobile': default_contact and default_contact.mobile,
                             'section_id': call.section_id and call.section_id.id or False,
                             'description': call.description or False,
-                            'phonecall_id': call.id,
                             'priority': call.priority,
                             'type': 'opportunity', 
                             'phone': call.partner_phone or False,

From 3debb307be506952caf14b9936608ea4d812132f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 12:12:38 +0530
Subject: [PATCH 108/132] [IMP] crm: Create partner form lead section_id not
 set in partner

bzr revid: ron@tinyerp.com-20111123064238-c1m2xl7nluthnpdn
---
 addons/crm/crm_lead.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b45c8508dd0..6aa0667a5f3 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -579,6 +579,7 @@ class crm_lead(crm_case, osv.osv):
                     'name': lead.partner_name or lead.contact_name or lead.name,
                     'user_id': lead.user_id.id,
                     'comment': lead.description,
+                    'section_id': lead.section_id.id or False,
                     'address': []
         })
         return partner_id
@@ -587,6 +588,7 @@ class crm_lead(crm_case, osv.osv):
         res = False
         res_partner = self.pool.get('res.partner')
         if partner_id:
+            res_partner.write(cr, uid, partner_id, {'section_id': lead.section_id.id or False})
             contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
             res = lead.write({'partner_id' : partner_id, 'partner_address_id': contact_id}, context=context)
             

From 1098a57e134481dba46e198001618b88aa809303 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 12:25:01 +0530
Subject: [PATCH 109/132] [FIX] crm: Put action_cancel method for closing
 wizard of schedule call to opportunity

bzr revid: ron@tinyerp.com-20111123065501-l6pj4oymx21qx7f2
---
 addons/crm/wizard/crm_partner_to_opportunity.py       | 6 ++++++
 addons/crm/wizard/crm_partner_to_opportunity_view.xml | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 372c5da13a1..6322d0341c1 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -35,6 +35,12 @@ class crm_partner2opportunity(osv.osv_memory):
         'partner_id': fields.many2one('res.partner', 'Partner'),
     }
 
+    def action_cancel(self, cr, uid, ids, context=None):
+        """
+        Closes Partner 2 Opportunity
+        """
+        return {'type':'ir.actions.act_window_close'}
+
     def default_get(self, cr, uid, fields, context=None):
         """
         This function gets default values
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 1111bbbbc50..f75f3d5b90e 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -16,7 +16,7 @@
             <field name="probability"/>
                 <separator string="" colspan="4" />
                   <group col="4" colspan="4">
-                      <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                      <button special="cancel" string="Cancel" icon="gtk-cancel"/>
                       <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
                   </group>
               </form>

From 4228eff228d0785712d60ab81beb28493e6ff1b7 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 12:50:20 +0530
Subject: [PATCH 110/132] [FIX] crm: When converting lead to opportunity , with
 No link to partner Its generate traceback

bzr revid: ron@tinyerp.com-20111123072020-8esmtpmwkdtdmasa
---
 addons/crm/crm_lead.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 6aa0667a5f3..10e9a2a6d97 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -523,7 +523,9 @@ class crm_lead(crm_case, osv.osv):
 
     def _convert_opportunity_data(self, cr, uid, lead, customer, section_id=False, context=None):
         crm_stage = self.pool.get('crm.case.stage')
-        contact_id = self.pool.get('res.partner').address_get(cr, uid, [customer.id])['default']
+        contact_id = False
+        if customer:
+            contact_id = self.pool.get('res.partner').address_get(cr, uid, [customer.id])['default']
         if not section_id:
             section_id = lead.section_id and lead.section_id.id or False
         if section_id:
@@ -535,7 +537,7 @@ class crm_lead(crm_case, osv.osv):
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
                 'name': lead.name,
-                'partner_id': customer.id,
+                'partner_id': customer and customer.id or False,
                 'user_id': (lead.user_id and lead.user_id.id),
                 'type': 'opportunity',
                 'stage_id': stage_id or False,
@@ -552,9 +554,9 @@ class crm_lead(crm_case, osv.osv):
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
         partner = self.pool.get('res.partner')
         mail_message = self.pool.get('mail.message')
-        
-        customer = partner.browse(cr, uid, partner_id, context=context)
-        
+        customer = False
+        if partner_id:
+            customer = partner.browse(cr, uid, partner_id, context=context)
         for lead in self.browse(cr, uid, ids, context=context):
             if lead.state in ('done', 'cancel'):
                 continue

From 9bca7fa4d7e82beca48466bba293e0832c3b2c8e Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 14:43:14 +0530
Subject: [PATCH 111/132] [FIX] crm: Traceback generated when converting
 opportunity from Scheduled Calls

bzr revid: ron@tinyerp.com-20111123091314-9remtt8bw59iki98
---
 addons/crm/wizard/crm_phonecall_to_opportunity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py
index ce64dedd73d..a6ddc2494ab 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity.py
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py
@@ -50,7 +50,7 @@ class crm_phonecall2opportunity(osv.osv_memory):
         This function gets default values
         """
         record_id = context and context.get('active_id', False) or False
-        res = super(crm_phonecall2opportunity, self).default_get(cr, uid, fields, context=context)
+        res = {}
 
         if record_id:
             phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context)

From 2b01f2b5017d10623ae7fa82e4c1af979e893700 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 15:03:08 +0530
Subject: [PATCH 112/132] [REN] crm: Renamed demo_data to crm_demo.yml

bzr revid: ron@tinyerp.com-20111123093308-w1j5lq0t7qy9w9cl
---
 addons/crm/__openerp__.py                          | 2 +-
 addons/crm/test/ui/{demo_data.yml => crm_demo.yml} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename addons/crm/test/ui/{demo_data.yml => crm_demo.yml} (100%)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index f7d56ce373b..557dbab8d3e 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/segmentation.yml',
-            #'test/ui/demo_data.yml', TODO : After installing crm_partner_assign view error  
+            #'test/ui/crm_demo.yml', TODO : After installing crm_partner_assign view error  
             'test/ui/duplicate_lead.yml',
             'test/ui/delete_lead.yml'
              ],
diff --git a/addons/crm/test/ui/demo_data.yml b/addons/crm/test/ui/crm_demo.yml
similarity index 100%
rename from addons/crm/test/ui/demo_data.yml
rename to addons/crm/test/ui/crm_demo.yml

From 45c6d1382e388bcef88772ba27e28742d677e3fa Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 15:24:16 +0530
Subject: [PATCH 113/132] [IMP] crm_claim: Created record on yml instead of
 calling onchange_event manually and renamed onchange_event.yml to
 claim_demo.yml

bzr revid: ron@tinyerp.com-20111123095416-2655ypsaymzqbr61
---
 addons/crm_claim/__openerp__.py              |  2 +-
 addons/crm_claim/test/ui/claim_demo.yml      | 15 +++++++++++++
 addons/crm_claim/test/ui/onchange_events.yml | 22 --------------------
 3 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 addons/crm_claim/test/ui/claim_demo.yml
 delete mode 100644 addons/crm_claim/test/ui/onchange_events.yml

diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 96a3f8ddfdf..613322ae804 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -49,7 +49,7 @@ automatically new claims based on incoming emails.
         'crm_claim_demo.xml',
     ],
     'test': ['test/process/claim.yml',
-             'test/ui/onchange_events.yml'],
+             'test/ui/claim_demo.yml'],
     'installable': True,
     'active': False,
     'certificate' : '00612027414703404749',
diff --git a/addons/crm_claim/test/ui/claim_demo.yml b/addons/crm_claim/test/ui/claim_demo.yml
new file mode 100644
index 00000000000..520434fcd90
--- /dev/null
+++ b/addons/crm_claim/test/ui/claim_demo.yml
@@ -0,0 +1,15 @@
+-
+  I create claim record to call of partner onchange method.
+-
+  !record {model: crm.claim, id: crm_case_claim04}:
+    name: 'Damaged Product'
+    partner_id: base.res_partner_6
+-
+  I Update the message for claim.
+-
+  !python {model: crm.claim}: |
+    try:
+      self.message_update(cr, uid,[ref('crm_case_claim04')], {'subject': 'Claim Update record','body_text': 'first training session completed',})
+    except:
+      pass
+  
\ No newline at end of file
diff --git a/addons/crm_claim/test/ui/onchange_events.yml b/addons/crm_claim/test/ui/onchange_events.yml
deleted file mode 100644
index 18cc136f47b..00000000000
--- a/addons/crm_claim/test/ui/onchange_events.yml
+++ /dev/null
@@ -1,22 +0,0 @@
--
-  I call onchange_event to change partner on claim form.
--
-  !python {model: crm.claim}: |
-    partner_onchange = self.onchange_partner_id(cr, uid, [ref('crm_case_claim04')], ref('base.res_partner_10'))
-    assert partner_onchange['value']['partner_phone'] == "+33-658-256545" ,"Phone number is wrong"
-    assert partner_onchange['value']['email_from'] == 'l.dupont@tecsas.fr' ,"Email address is wrong"
-
--
-  I call onchange event to change contact details on claim form.
--
-  !python {model: crm.claim}: |
-    self.onchange_partner_address_id(cr, uid, ref('crm_case_claim04'), ref("base.res_partner_address_notsotinysarl0"), email=False)
--
-  I Update the message for claim.
--
-  !python {model: crm.claim}: |
-    try:
-      self.message_update(cr, uid,[ref('crm_case_claim04')], {'subject': 'Claim Update record','body_text': 'first training session completed',})
-    except:
-      pass
-  
\ No newline at end of file

From 0735538c902586340b32709c305d1c915e492cbb Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 15:31:32 +0530
Subject: [PATCH 114/132] [IMP] crm_partner_assign: Renamed file
 onchange_event.yml to partner_assign_demo.yml

bzr revid: ron@tinyerp.com-20111123100132-czrxhsx7sfzy5pcj
---
 .../test/ui/{onchange_events.yml => partner_assign_demo.yml}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename addons/crm_partner_assign/test/ui/{onchange_events.yml => partner_assign_demo.yml} (100%)

diff --git a/addons/crm_partner_assign/test/ui/onchange_events.yml b/addons/crm_partner_assign/test/ui/partner_assign_demo.yml
similarity index 100%
rename from addons/crm_partner_assign/test/ui/onchange_events.yml
rename to addons/crm_partner_assign/test/ui/partner_assign_demo.yml

From 20acb2c2e1a36027fab1fcc7192d7a57dd5fa1e4 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 15:38:13 +0530
Subject: [PATCH 115/132] [IMP] crm, crm_claim: Put #comment created data for
 onchange event because its need to check when installed crm_partner_assign

bzr revid: ron@tinyerp.com-20111123100813-mjeu1dian4cob0bc
---
 addons/crm/__openerp__.py       | 2 +-
 addons/crm_claim/__openerp__.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 557dbab8d3e..acba8d3c510 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/segmentation.yml',
-            #'test/ui/crm_demo.yml', TODO : After installing crm_partner_assign view error  
+            'test/ui/crm_demo.yml', #TODO : After installing crm_partner_assign view error  
             'test/ui/duplicate_lead.yml',
             'test/ui/delete_lead.yml'
              ],
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 613322ae804..217bec232c1 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -49,7 +49,8 @@ automatically new claims based on incoming emails.
         'crm_claim_demo.xml',
     ],
     'test': ['test/process/claim.yml',
-             'test/ui/claim_demo.yml'],
+             'test/ui/claim_demo.yml'#TODO : After installing crm_partner_assign view error
+             ],
     'installable': True,
     'active': False,
     'certificate' : '00612027414703404749',

From f26ae9272c3ce6530c268e208321a06bde88d156 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 16:16:42 +0530
Subject: [PATCH 116/132] [IMP] crm_partner_assign: put file on __openerp.py

bzr revid: ron@tinyerp.com-20111123104642-ch2kkvb6hq86scwc
---
 addons/crm_partner_assign/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 070cef377f0..65f5ae19123 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -51,7 +51,7 @@ You can also use the geolocalization without using the GPS coordinates.
     ],
     'test': [
         'test/process/partner_assign.yml',
-        'test/ui/onchange_events.yml'
+        'test/ui/partner_assign_demo.yml'
     ],
     'installable': True,
     'active': False,

From a1951c3326ecb32481551f9646d3af23453a75c6 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 16:20:06 +0530
Subject: [PATCH 117/132] [IMP] crm: checked spelling

bzr revid: ron@tinyerp.com-20111123105006-99y9fy7lp19t2lzm
---
 addons/crm/test/process/communication_with_customer.yml | 2 +-
 addons/crm/test/process/merge_opportunity.yml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index a0a2da1016d..6633c7544df 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -46,7 +46,7 @@
   !python {model: crm.phonecall}: |
     self.convert_partner(cr, uid, [ref('crm.crm_case_phone06')], context=context)
 -
-  I check coverted phonecall to partner.
+  I check converted phonecall to partner.
 -
   !python {model: res.partner}: |
     partner_id = self.search(cr, uid, [('phonecall_ids', '=', ref('crm.crm_case_phone06'))])
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index e27610fd671..463e330fc10 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -45,7 +45,7 @@
   !python {model: crm.phonecall}: |
     self.case_close(cr, uid, [ref("crm.crm_case_phone06")])
 -
-  I check that the hone call is in 'Held' state.
+  I check that the phone call is in 'Held' state.
 -
   !assert {model: crm.phonecall, id: crm.crm_case_phone06, string: Phone call Helded}:
     - state == "done"

From 4072cb102e97c04663c98c28f8d1b92f0739efb5 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 16:23:53 +0530
Subject: [PATCH 118/132] [FIX] crm: click on forword button to forword its
 partner

bzr revid: ron@tinyerp.com-20111123105353-ctejxeua56nzmu7s
---
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index c49115078cd..35e04957dfa 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -128,7 +128,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                 lead.assign_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
 
             email_cc = to_email(case.email_cc)
-            email_cc = email_to and email_cc[0] or ''
+            email_cc = email_cc and email_cc[0] or ''
             new_cc = []
             if email_cc:
                 new_cc.append(email_cc)

From 691836ef94076bef3b6b3a5d9a1849062a75816d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 17:14:59 +0530
Subject: [PATCH 119/132] [IMP] crm, crm_partner_assign: checked spelling and
 put email_from to send email on ymls

bzr revid: ron@tinyerp.com-20111123114459-brutsthu72xoexnl
---
 addons/crm/test/process/communication_with_customer.yml  | 2 +-
 addons/crm/test/process/lead2opportunity2win.yml         | 6 +++---
 .../crm_partner_assign/test/process/partner_assign.yml   | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 6633c7544df..92e711ce016 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -23,7 +23,7 @@
   !python {model: mail.compose.message}: |
     lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
-    id = self.create(cr, uid, {'body_text': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci"}, context=context)
+    id = self.create(cr, uid, {'body_text': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
     try:
         self.send_mail(cr, uid, [id], context=context)
     except:
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 583fb1e7f08..dbc04abae19 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -6,7 +6,7 @@
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_case_qrecorp0")])
 - 
-  I check lead is in open.
+  I check lead state is "Open".
 -
   !assert {model: crm.lead, id: crm.crm_case_qrecorp0, string: Lead in open state}:
      - state == "open"
@@ -24,7 +24,7 @@
     assert lead.partner_id.id == ref("base.res_partner_agrolait"), 'Partner missmatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
 -
-  Now I start Communication and schedule phonecall with customer.
+  Now I begin communication and schedule a phone call with the customer.
 -
   !python {model: crm.opportunity2phonecall}: |
     import time
@@ -72,7 +72,7 @@
     id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
-  Now i check First lead converted on opportunity.
+  Now I check First lead converted on opportunity.
 -
   !python {model: crm.lead}: |
     opp = self.browse(cr, uid, ref('crm_case_employee0'))
diff --git a/addons/crm_partner_assign/test/process/partner_assign.yml b/addons/crm_partner_assign/test/process/partner_assign.yml
index ddccd92167e..1035f7e8862 100644
--- a/addons/crm_partner_assign/test/process/partner_assign.yml
+++ b/addons/crm_partner_assign/test/process/partner_assign.yml
@@ -6,11 +6,11 @@
   !python {model: res.partner}: |
     self.geo_localize(cr, uid, [ref('base.res_partner_ericdubois0')], context)
 -
- I check Geo Lattitude and Longitude of partner after set
+ I check Geo Latitude and Longitude of partner after set
 -
   !python {model: res.partner}: |
     partner = self.browse(cr, uid, ref('base.res_partner_ericdubois0'))
-    assert partner.partner_latitude == 50.4530495 , "Lattitude is wrong"
+    assert partner.partner_latitude == 50.4530495 , "Latitude is wrong"
     assert partner.partner_longitude == 3.9693885 , "Longitude is wrong"
 -
   I assign nearest partner to opportunity.
@@ -18,14 +18,13 @@
   !python {model: crm.lead}: |
     self.assign_partner(cr, uid, [ref('crm.crm_case_abcfuelcounits0')], context=context)
 -
-  I check assigned partner of opportunity who is nearest Geo Lattitude and Longitude of opportunity.
+  I check assigned partner of opportunity who is nearest Geo Latitude and Longitude of opportunity.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm.crm_case_abcfuelcounits0'))
     assert lead.partner_assigned_id.id == ref('base.res_partner_ericdubois0') , "Opportuniy is not assigned nearest partner"
-    assert lead.partner_latitude == 50.8495239 , "Lattitude is wrong"
+    assert lead.partner_latitude == 50.8495239 , "Latitude is wrong"
     assert lead.partner_longitude == 4.3667002 , "Longitude is wrong"
-    
 -
   I forward this opportunity to its nearest partner.
 -

From 80990349d33381dcc30197dee62a99fe0d63ae57 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 23 Nov 2011 18:54:10 +0530
Subject: [PATCH 120/132] [IMP] crm_claim: put active_id field on crm.claim
 model

bzr revid: ron@tinyerp.com-20111123132410-fucil8261sijpvtq
---
 addons/crm_claim/crm_claim.py           | 2 ++
 addons/crm_claim/test/process/claim.yml | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 5262c6ae7b8..7875d6a2f1a 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -46,6 +46,7 @@ class crm_claim(crm.crm_case, osv.osv):
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
+        'active': fields.boolean('Active'),
         'action_next': fields.char('Next Action', size=200),
         'date_action_next': fields.datetime('Next Action Date'),
         'description': fields.text('Description'),
@@ -95,6 +96,7 @@ class crm_claim(crm.crm_case, osv.osv):
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'active': lambda *a: 1
     }
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index f82a70f6988..e20436cd3c6 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -1,5 +1,5 @@
 -
-  Customer claim after sale our product. so He send claim request by email.
+  Customer requests a claim after the sale of our product. He sends claim request by email.
 -
   Mail script will be fetched him request from mail server. so I process that mail after read EML file 
 -
@@ -38,7 +38,7 @@
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     self.case_close(cr, uid, claim_ids)
 -
-  I check Claim details after closed
+  I check Claim details after closed.
 -
   !python {model: crm.claim}: |
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])

From 04ed829ad196bc5245eda1d7fad81709b8e5b8d2 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 24 Nov 2011 16:13:14 +0530
Subject: [PATCH 121/132] [IMP] crm: Click on forward to opprtunity by user,
 used allocate_salesman instead of assign_salesman

bzr revid: ron@tinyerp.com-20111124104314-yq5005rol2alnrj9
---
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 35e04957dfa..221b6b7980f 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -125,7 +125,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                 lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
 
             if this.send_to == 'user':
-                lead.assign_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
+                lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
 
             email_cc = to_email(case.email_cc)
             email_cc = email_cc and email_cc[0] or ''

From 8ed8d95e4cd83495caea18d3229e724600e82548 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 24 Nov 2011 17:07:56 +0530
Subject: [PATCH 122/132] [IMP] crm: Changed Assignation Tab after lead instead
 of last

bzr revid: ron@tinyerp.com-20111124113756-gurnga1rz9dzcuxl
---
 addons/crm_partner_assign/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 7cf47b95939..14e160fb397 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//notebook[last()]" position="inside">
+                    <xpath expr="//notebook/page[@string='Lead']" position="after">
                         <page string="Assignation" groups="base.group_extended">
                         <group name="partner_assign_group" col="5" colspan="4">
                             <separator string="Partner Assignation" colspan="5"/>

From f3f4aca79737ae530fc05b887e31c1dda327c295 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 25 Nov 2011 10:39:51 +0530
Subject: [PATCH 123/132] [FIX] crm: Convert Mass opportunity from wizard where
 opportunity have no assigned partner

bzr revid: ron@tinyerp.com-20111125050951-36vc64ja6jvbfo1t
---
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 221b6b7980f..48b61b166f6 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -194,14 +194,13 @@ class crm_lead_forward_to_partner(osv.osv_memory):
             partner_assigned_id = lead.partner_assigned_id and lead.partner_assigned_id.id or False
             user_id = False
             if not partner_assigned_id:
-                partner_assigned_id = lead.search_geo_partner(cr, uid, [lead.id], context=None).get(lead.id, False)
+                partner_assigned_id = proxy.search_geo_partner(cr, uid, [lead.id], context=None).get(lead.id, False)
             if partner_assigned_id:
                 assigned_partner = partner.browse(cr, uid, partner_assigned_id, context=context)
                 user_id = assigned_partner.user_id and assigned_partner.user_id.id or False
                 email_cc = assigned_partner.user_id and assigned_partner.user_id.user_email or ''
                 email = assigned_partner.email
             
-            
             res.update({
                 'subject' : subject,
                 'body_text' : body,

From 03ac39321e095593685d9b3cc8004876074dd4ee Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 25 Nov 2011 11:22:39 +0530
Subject: [PATCH 124/132] [IMP] crm: Improved opportunity_to_phonecall view

bzr revid: ron@tinyerp.com-20111125055239-6x69ybduwkkcj65r
---
 .../crm_opportunity_to_phonecall_view.xml     | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 5527e82c2e9..a12bd92115c 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,20 +16,14 @@
                     <field name="name"/>
                     <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                     <newline/>
-                    <group colspan="4">
-                        <field name="partner_id" readonly="True"/>
-                        <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="contact_name"/>
-                        <field name="phone"/>
-                    </group>
-                    <group colspan="4">
-                        <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
-                        <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
-                    </group>
+                    <field name="partner_id" readonly="True"/>
+                    <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                    <field name="contact_name"/>
+                    <field name="phone"/>
+                    <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>                    
+                    <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
                     <separator string="Notes" colspan="4"/>
-                    <group colspan="4">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </group>
+                    <field name="note" colspan="4" nolabel="1"/>
                     <separator string="" colspan="4"/>
                     <group colspan="4" col="3">
                         <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />

From 0bb3d29d2035c3d85270374092ff7bb03e164964 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 25 Nov 2011 11:57:03 +0530
Subject: [PATCH 125/132] [IMP] crm : Add arguments phone, contact_name, desc
 in schedule_phonecall function because of changes of field values in wizard
 to change on dependent models fields

bzr revid: ron@tinyerp.com-20111125062703-h5vq581a1ni93z7m
---
 addons/crm/crm_lead.py                            | 6 +++---
 addons/crm/wizard/crm_opportunity_to_phonecall.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 1ed039e4bc9..91a02863a45 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -666,7 +666,7 @@ class crm_lead(crm_case, osv.osv):
                 self.write(cr, uid, [lead_id], value, context=context)
         return True
 
-    def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
+    def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, desc, phone, contact_name, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
         """
         action :('schedule','Schedule a call'), ('log','Log a call')
         """
@@ -687,12 +687,12 @@ class crm_lead(crm_case, osv.osv):
                     'opportunity_id' : lead.id,
                     'user_id' : user_id or False,
                     'categ_id' : categ_id or False,
-                    'description' : lead.description or False,
+                    'description' : desc or '',
                     'date' : schedule_time,
                     'section_id' : section_id or False,
                     'partner_id': lead.partner_id and lead.partner_id.id or False,
                     'partner_address_id': lead.partner_address_id and lead.partner_address_id.id or False,
-                    'partner_phone' : lead.phone or (lead.partner_address_id and lead.partner_address_id.phone or False),
+                    'partner_phone' : phone or lead.phone or (lead.partner_address_id and lead.partner_address_id.phone or False),
                     'partner_mobile' : lead.partner_address_id and lead.partner_address_id.mobile or False,
                     'priority': lead.priority,
             }
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index e6a1b987d36..a45c87b1a6f 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -71,7 +71,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
         opportunity = self.pool.get('crm.lead')
         data = self.browse(cr, uid, ids, context=context)[0]
         call_ids = opportunity.schedule_phonecall(cr, uid, opportunity_ids, data.date, data.name, \
-                data.user_id and data.user_id.id or False, \
+                data.note, data.phone, data.contact_name, data.user_id and data.user_id.id or False, \
                 data.section_id and data.section_id.id or False, \
                 data.categ_id and data.categ_id.id or False, \
                 action=data.action, context=context)

From c64207b0c9098b5da65e4eaf88d31b898c4294a7 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 25 Nov 2011 18:51:51 +0530
Subject: [PATCH 126/132] [FIX] crm: Sending lead forword to its partner with
 attachament its generate Traceback

bzr revid: ron@tinyerp.com-20111125132151-eztonj8m7ac54r60
---
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 48b61b166f6..4286de91ed1 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -35,6 +35,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         'send_to': fields.selection([('user', 'User'), ('partner', 'Partner'), \
                          ('email', 'Email Address')], 'Send to', required=True),
         'user_id': fields.many2one('res.users', "User"),
+        'attachment_ids': fields.many2many('ir.attachment','lead_forward_to_partner_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
         'partner_id' : fields.many2one('res.partner', 'Partner'),
         'address_id' : fields.many2one('res.partner.address', 'Address'),
         'history': fields.selection([('info', 'Case Information'), ('latest', 'Latest email'), ('whole', 'Whole Story')], 'Send history', required=True),

From 5e0a6fe7d762619af497aa7fdd0411aaf670bf2d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 28 Nov 2011 12:27:18 +0530
Subject: [PATCH 127/132] [FIX] crm, crm_partner_assing: Fixed : [crm,
 crm_partner_assign installed] and i try to reinstall crm module and generate
 lead record from yml Its generated traceback: Error Cannot find field
 partner_assigned_id in the following view parts composing the view of object
 model crm.lead

bzr revid: ron@tinyerp.com-20111128065718-qqtju7r8cxizdagq
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index fad7859fee5..82be78a5728 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -444,7 +444,7 @@
         <field name="name">Opportunities</field>
         <field name="model">crm.lead</field>
         <field name="type">form</field>
-        <field name="priority">10</field>
+        <field name="priority">20</field>
         <field name="arch" type="xml">
             <form string="Opportunities">
                 <group colspan="4" col="7">

From 42a7b9f9a6e28352412817acd1fba728b7340d6d Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 28 Nov 2011 12:35:29 +0530
Subject: [PATCH 128/132] [IMP] crm, crm_claim: Removed commented lines from
 __openerp__.py

bzr revid: ron@tinyerp.com-20111128070529-eizoo3f93d0qrfob
---
 addons/crm/__openerp__.py       | 2 +-
 addons/crm_claim/__openerp__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index acba8d3c510..a98a0cbc6a4 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -123,7 +123,7 @@ Creates a dashboard for CRM that includes:
             'test/process/merge_opportunity.yml',
             'test/process/cancel_lead.yml',
             'test/process/segmentation.yml',
-            'test/ui/crm_demo.yml', #TODO : After installing crm_partner_assign view error  
+            'test/ui/crm_demo.yml',
             'test/ui/duplicate_lead.yml',
             'test/ui/delete_lead.yml'
              ],
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 217bec232c1..8c3854ffd2e 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -49,7 +49,7 @@ automatically new claims based on incoming emails.
         'crm_claim_demo.xml',
     ],
     'test': ['test/process/claim.yml',
-             'test/ui/claim_demo.yml'#TODO : After installing crm_partner_assign view error
+             'test/ui/claim_demo.yml'
              ],
     'installable': True,
     'active': False,

From ad7e7c48e02b7b5ac2392bfde38ee2d1c7b634fc Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 30 Nov 2011 14:36:19 +0530
Subject: [PATCH 129/132] [REM] crm_partner_assign: removed
 crm_partner_assign/test/ui/partner_assign_demo.yml

bzr revid: ron@tinyerp.com-20111130090619-37he2tau7vb3a2en
---
 addons/crm_partner_assign/__openerp__.py                  | 1 -
 addons/crm_partner_assign/test/ui/partner_assign_demo.yml | 7 -------
 2 files changed, 8 deletions(-)
 delete mode 100644 addons/crm_partner_assign/test/ui/partner_assign_demo.yml

diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index b816f1c8353..555717899b1 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -51,7 +51,6 @@ You can also use the geolocalization without using the GPS coordinates.
     ],
     'test': [
         'test/process/partner_assign.yml',
-        'test/ui/partner_assign_demo.yml'
     ],
     'installable': True,
     'active': False,
diff --git a/addons/crm_partner_assign/test/ui/partner_assign_demo.yml b/addons/crm_partner_assign/test/ui/partner_assign_demo.yml
deleted file mode 100644
index a178e767eb2..00000000000
--- a/addons/crm_partner_assign/test/ui/partner_assign_demo.yml
+++ /dev/null
@@ -1,7 +0,0 @@
--
-  I call onchange event to change partner address and Email.
--
-  !python {model: crm.lead.forward.to.partner}: |
-    action = self.on_change_partner(cr, uid, ref("crm.crm_case_qrecorp0"), ref("base.res_partner_9"))
-    assert action['value']['email_to'] == 'info@balmerinc.be', "Email is wrong"
-    self.on_change_email(cr, uid, [ref('crm.crm_case_qrecorp0')], ref('base.user_root'))

From e1fbd4ad7a492bf38fada37aa9615d9768bbc1e2 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 30 Nov 2011 15:10:11 +0530
Subject: [PATCH 130/132] [REF] crm: moved Extra info Tab after comunication
 and history

bzr revid: ron@tinyerp.com-20111130094011-qsmras8t8qkazqhx
---
 addons/crm/crm_lead_view.xml | 56 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index fddd1b1743d..ee551bc2400 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -143,34 +143,6 @@
                             type="object" icon="gtk-convert" />
                     </group>
                  </page>
-                 <page string="Extra Info" groups="base.group_extended">
-                    <group colspan="2" col="2">
-                        <separator string="Categorization" colspan="2" col="2"/>
-                        <field name="company_id"
-                            groups="base.group_multi_company"
-                            widget="selection" colspan="2" />
-                        <field name="type_id" select="1" widget="selection"/>
-                        <field name="channel_id" select="1" widget="selection"/>
-                        <field name="referred"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Dates" colspan="2" col="2"/>
-                        <field name="create_date"/>
-                        <field name="write_date"/>
-                        <field name="date_open"/>
-                        <field name="date_closed"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Mailings" colspan="2" col="2"/>
-                        <field name="optin" on_change="on_change_optin(optin)"/>
-                        <field name="optout" on_change="on_change_optout(optout)"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Statistics" colspan="2" col="2"/>
-                        <field name="day_open"/>
-                        <field name="day_close"/>
-                    </group>
-                 </page>
                  <page string="Communication &amp; History" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" widget="char" size="512"/>
@@ -223,6 +195,34 @@
                         name="%(mail.action_email_compose_message_wizard)d"
                         icon="terp-mail-message-new" type="action"/>
                  </page>
+                 <page string="Extra Info" groups="base.group_extended">
+                    <group colspan="2" col="2">
+                        <separator string="Categorization" colspan="2" col="2"/>
+                        <field name="company_id"
+                            groups="base.group_multi_company"
+                            widget="selection" colspan="2" />
+                        <field name="type_id" select="1" widget="selection"/>
+                        <field name="channel_id" select="1" widget="selection"/>
+                        <field name="referred"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Dates" colspan="2" col="2"/>
+                        <field name="create_date"/>
+                        <field name="write_date"/>
+                        <field name="date_open"/>
+                        <field name="date_closed"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Mailings" colspan="2" col="2"/>
+                        <field name="optin" on_change="on_change_optin(optin)"/>
+                        <field name="optout" on_change="on_change_optout(optout)"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="Statistics" colspan="2" col="2"/>
+                        <field name="day_open"/>
+                        <field name="day_close"/>
+                    </group>
+                 </page>
                 </notebook>
             </form>
         </field>

From f56cc312e46d3f63fcd6c5e57f3fb3293855ae6e Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 30 Nov 2011 17:36:40 +0530
Subject: [PATCH 131/132] [IMP] crm_parner_assign, crm: Corrected
 history[whole, laetst, case info] for lead forword to its nearest partner
 email wizard

bzr revid: ron@tinyerp.com-20111130120640-t6l8pec0fb6pehjq
---
 addons/crm/crm_lead.py                                     | 2 +-
 addons/crm_partner_assign/wizard/crm_forward_to_partner.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 9510041d37f..cbaa917eb88 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -422,7 +422,7 @@ class crm_lead(crm_case, osv.osv):
             else:
                 value = lead[field_name]
 
-            body.append("%s: %s\n" % (field.string, value or ''))
+            body.append("%s: %s" % (field.string, value or ''))
         return "\n".join(body + ['---'])
 
     def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 4286de91ed1..565f99b9db1 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -66,8 +66,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         res_id = context.get('active_id')
         model = context.get('active_model')
         lead = self.pool.get(model).browse(cr, uid, res_id, context)
-        body_text = self._get_info_body_text(cr, uid, lead, context=context)
-        context['mail.compose.message.body'] = history_type
+        body_text = self._get_message_body_text(cr, uid, lead, history_type, context=context)
         if body_text:
             res = {'value': {'body_text' : body_text}}
         return res
@@ -171,7 +170,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
                 to = 'To: %s' % (message.email_to or '')
                 sentdate = 'Date: %s' % (message.date or '')
                 desc = '\n%s'%(message.body_text)
-                original = [header, sender, to, sentdate, desc]
+                original = [header, sender, to, sentdate, desc, '\n']
                 original = '\n'.join(original)
                 body += original
         return body or ''

From 379ab719eec090c3dc83775c9856a564948d074f Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 30 Nov 2011 18:36:14 +0530
Subject: [PATCH 132/132] [IMP] crm: After Merged oppportunity, correct value
 of merge_description, and Email_cc[It means Text field value have filtered]

bzr revid: ron@tinyerp.com-20111130130614-s9e1a8v6hra0kmxr
---
 addons/crm/crm_lead.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index cbaa917eb88..49272c97576 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -369,7 +369,7 @@ class crm_lead(crm_case, osv.osv):
             return res and res.id or False
     
         def _concat_all(attr):
-            return ', '.join([getattr(opportunity, attr) or '' for opportunity in opportunities if hasattr(opportunity, attr)])
+            return ', '.join(filter(lambda x: x, [getattr(opportunity, attr) or '' for opportunity in opportunities if hasattr(opportunity, attr)]))
 
         data = {}
         for field_name in fields: