diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index b3e45a33978..9d889799127 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -118,6 +118,14 @@ between mails and Open ERP.""",
         'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml'
     ],
+    'test': ['test/test_crm_lead.yml',
+            'test/test_crm_meeting.yml', 
+            'test/test_crm_opportunity.yml',
+            'test/test_crm_phonecall.yml', 
+            'test/test_crm_fund.yml',    
+            'test/test_crm_claim.yml',
+            'test/test_crm_helpdesk.yml',  
+             ],
     'installable': True,
     'active': False,
     'certificate': '0079056041421',
diff --git a/addons/crm/test/test_crm_claim.yml b/addons/crm/test/test_crm_claim.yml
new file mode 100644
index 00000000000..54ef47a56f5
--- /dev/null
+++ b/addons/crm/test/test_crm_claim.yml
@@ -0,0 +1,38 @@
+- |
+  Now 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.categ_claim2
+    date: '2010-04-21 20:13:00'
+    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.
+-
+  !assert {model: crm.claim, id: crm_claim_damagedproduct0}:
+    - state == 'draft'
+- |
+  Now I make sure that claim is at "Accepted" stage.
+- 
+  !record {model: crm.claim, id: crm.crm_claim_damagedproduct0}:
+    stage_id: crm.stage_claim1
+- |
+  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')])  
+  
diff --git a/addons/crm/test/test_crm_fund.yml b/addons/crm/test/test_crm_fund.yml
new file mode 100644
index 00000000000..4bcacbe148e
--- /dev/null
+++ b/addons/crm/test/test_crm_fund.yml
@@ -0,0 +1,32 @@
+- |
+  Now 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.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.type_fund2
+- |
+  I check that the Funds  is in 'draft' state.
+-
+  !assert {model: crm.fundraising, id: crm_fundraising_donationforbookstopoorschoolchildren0}:
+    - state == 'draft'
+- |
+  Now I open Funds by click on "Open" button
+-
+  !python {model: crm.fundraising}: |
+    self.case_open(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])  
+- |   
+  I can close Funds by click on "Done" button.
+-
+  !python {model: crm.fundraising}: |
+    self.case_close(cr, uid, [ref('crm_fundraising_donationforbookstopoorschoolchildren0')])  
diff --git a/addons/crm/test/test_crm_helpdesk.yml b/addons/crm/test/test_crm_helpdesk.yml
new file mode 100644
index 00000000000..6d3beb43b41
--- /dev/null
+++ b/addons/crm/test/test_crm_helpdesk.yml
@@ -0,0 +1,38 @@
+-
+  |
+  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: '2010-04-22 10:17:00'
+    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 check that the Helpdesk request  is in 'Draft' state.
+-
+  !assert {model: crm.helpdesk, id: crm_helpdesk_somefunctionalquestion0}: 
+    - state == 'draft'  
+- |
+  In order to make this helpdesk request to be considered I make it "Open"
+-
+  !python {model: crm.helpdesk}: |
+    self.case_open(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')])  
+- |
+  I can see that "Send Reminder" button is visible, which is used to send reminder to partner from
+  responsible person  or send reminder to responsible person from partner.
+-  
+   #this is not work for yaml.
+-   
+#  !python {model: crm.helpdesk}: |
+#     self.remind_user(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')], context={}, attach=False, destination=True)  
+- |
+  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')])    
+-
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
new file mode 100644
index 00000000000..f22adf72e82
--- /dev/null
+++ b/addons/crm/test/test_crm_lead.yml
@@ -0,0 +1,86 @@
+-  |
+   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.
+-  |
+   In order to test the flow, 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:
+       - crm.group_crm_user
+     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
+   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
+     partner_name: Stonage IT
+     phone: (855) 924-4364
+     mobile: (333) 715-1450
+     section_id: crm.section_sales_department
+     title: M.
+-  |
+   I check that the lead is in 'draft' state, 
+-    
+   !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in Draft}:
+     - state == "draft"
+-
+   I open lead by click on "Open" button,
+-   
+   !python {model: crm.lead}: |
+     self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
+       
+-  |
+   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.
+-  
+   !python {model: crm.lead}: |
+     lead = self.browse(cr, uid, ref('crm_lead_newcustomer0'))
+     if not lead.partner_id:
+       self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")])
+-  
+   #!act_window {target: new, res_model: crm.lead2opportunity, id: action_crm_lead2opportunity, name: Create Opportunity}
+-  |   
+   I can check that a lead and a business opportunity is now assigned to this
+   lead.
+-  |
+   I check that the partner associated to this lead as the same country, phone number
+   and name than the opportunity.
+-
+  #Remaining 
+-  
+  
+#   !python {model: crm.lead}: |
+#     lead = self.browse(cr, uid, ref("crm_lead_newcustomer0"))
+#     print "lead",  lead.partner_name
+#     obj_opportunity = self.pool.get('crm.opportunity')
+#     ids = obj_opportunity.search(cr, uid, [('name', '=', lead.partner_name)])
+#     opportunity = obj_opportunity.browse(cr, uid, ids)[0]
+#     assert lead.partner_name == opportunity.partner_id.name
+#     assert lead.phone == opportunity.phone
+
+- |
+  I configure with smtp server.
+- |
+  And I communicate with lead through send New mail to Lead using it email address from user which are loged.
+- |
+  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.
+
+  
\ No newline at end of file
diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml
new file mode 100644
index 00000000000..bd8142ecabf
--- /dev/null
+++ b/addons/crm/test/test_crm_meeting.yml
@@ -0,0 +1,109 @@
+- |
+  Now I will test Meetings which may be customer meeting or phonecall meeting or
+  internal Meeting.
+-   
+  I start by creating a new Meeting.   
+-
+  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 create Meeting.       
+- 
+  !record {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
+    categ_id: crm.categ_meet2
+    date: '2010-04-21 16:04:00'
+    date_deadline: '2010-04-22 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
+- |
+  Now 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 occure weekly on Monday and Friday 10 times
+- 
+  !record {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
+    count: 10
+    fr: 1
+    freq: weekly
+    mo: 1
+    rrule_type: custom
+    th: 1
+    tu: 1
+    we: 1
+- |
+  I can see from the calendar view that the meeting is scheduled on Monday and Friday
+  for 10 times,
+  I will search for one of the recurrent event and count the number of events
+-
+  !python {model: crm.meeting}: |
+     ids = self.search(cr, uid, [('date', '>=', '2010-05-21 00:00:00'), ('date', '<=', '2010-04-21 00:00:00')] )
+     assert len(ids) == 9      
+
+- |
+  Now If I want to edit meetings information for all occurence I click on "Edit All" button.
+-
+  !python {model: crm.meeting}: |
+    self.open_meeting(cr, uid, [ref('crm_meeting_regardingpresentation0')])
+- |   
+  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 occurences 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
+    partner_id: base.res_partner_9
+    user_ids:
+      - base.user_demo
+- |
+  If I set Send mail boolean as True I can see that an email is send to 
+    specified email address with proper meeting information.
+-
+   #this is not working for send mail boolean as True.
+-
+  !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')])
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
new file mode 100644
index 00000000000..4fd0ddace95
--- /dev/null
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -0,0 +1,81 @@
+-  |
+   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.opportunity, 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_oppor1
+    categ_id: crm.categ_oppor2
+    section_id: crm.section_sales_department
+    
+-  |
+   I check that the opportunity is in 'New' state.
+-
+   !assert {model: crm.opportunity, id: crm_opportunity_abcfuelcounits0}:
+     - state == "draft"
+-  |  
+   I open opportunity by click on "Open" button,
+-
+   !python {model: crm.opportunity}: |
+    self.case_open(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
+
+-  |
+   I schedule Meeting on this current opportunity by clicking on "schedule
+   Meeting".
+-
+   !python {model: crm.opportunity}: |
+    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 schedule meeting.
+   I fill proper data for that meeting and save it
+-
+   !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}:
+    alarm_id: base_calendar.alarm3
+    date: '2010-04-16 00:00:00'
+    date_deadline: '2010-04-16 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
+    rrule_type: weekly
+    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: '2010-04-17 11:15:00'
+    name: 'ABC FUEL CO 829264 - 10002 units '
+    section_id: crm.section_sales_department
+    user_id: base.user_demo
+- |    
+  schedule phonecall by apply (action_apply)function of 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}: |
+    ids = self.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: '2010-04-17 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
+    
\ No newline at end of file
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
new file mode 100644
index 00000000000..7e6ed56abc5
--- /dev/null
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -0,0 +1,89 @@
+- |
+  I start by creating a new phonecall.
+- 
+  !record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
+    date: '2010-04-21 18:59:00'
+    name: Interview call
+    partner_address_id: base.res_partner_address_1
+    partner_id: base.res_partner_9
+    partner_mobile: (+32)2 211 34 83
+    section_id: crm.section_sales_department
+    
+- |
+  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.
+-    
+#  !python {model: crm.phonecall2opportunity}: |
+#    self.action_apply(cr, uid, [1], {'active_id': ref('crm_phonecall_interviewcall0')})  
+
+-
+  # This is not working, find a way to do that in YAML
+      
+- |
+  I can see that a business opportunity is now assigned to this phonecall
+- |
+  I check that the partner associated to this as the same country, phone number
+  and name than the phonecall.
+- |
+  In order to avoid the duplication of similar partner, OpenERP should be able to
+  detect if the partner exists or if it should be created from the phonecall during the
+  conversion.
+- |
+  In order to test this, I log as the user "user_crm2"
+- |
+  Then, I create the same phonecall than the preceeding one but I change the name
+  of the phonecall.  But this customer keeps the same email.
+- |
+  This time OpenERP should detect that this customer already exists in the
+  partner base and I check that in the wizard, proposes me to link to this existing
+  partner instead of creating another one.
+- |
+  I confirm the conversion wizard.
+- |
+  And I check that the phonecall and the newly created business opportunity is linked
+  to the partner
+- |
+  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: '2010-04-20 00:00:00'
+    date_deadline: '2010-04-20 08:00:00'
+    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'
+    rrule_type: weekly
+    state: open
+
+-
+  #This is not working for yaml    
+-
+  I can jump to this meeting by "Meetings" shortcut from my phonecall's form view
+-
+  
+- |
+  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: '2010-04-21 19:49:00'
+    name: Interview call
+    section_id: crm.section_sales_department
+    user_id: base.user_root
+-
+  !python {model: crm.phonecall2phonecall}: |
+    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})