From 11bab66faa6f9f024e93fac55ed207b909b74662 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Mon, 27 Dec 2010 10:50:32 +0200 Subject: [PATCH] crm: remove trailing whitespace, utf8 apostrophe. bzr revid: p_christ@hol.gr-20101227085032-bkun8ia2sije5l2p --- addons/crm/test/test_crm_lead.yml | 30 +++++++------- addons/crm/test/test_crm_opportunity.yml | 24 +++++------ addons/crm/test/test_crm_phonecall.yml | 41 +++++++++---------- .../wizard/crm_opportunity_to_phonecall.py | 2 +- 4 files changed, 48 insertions(+), 49 deletions(-) diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml index 3c4a988cc79..353a8c95432 100644 --- a/addons/crm/test/test_crm_lead.yml +++ b/addons/crm/test/test_crm_lead.yml @@ -1,12 +1,12 @@ - | - In order to test the CRM in OpenERP, + 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 @@ -16,11 +16,11 @@ 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 @@ -30,26 +30,26 @@ section_id: crm.section_sales_department referred: False - | - I check that the lead is in 'draft' state, -- + 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")]) - | I check that lead is now in 'open' state. - !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}: - - state == "open" - + - state == "open" + - | As the lead seems to be a real business opportunity, I will convert it to a - partner + partner and a business opportunity by clicking on the "Convert" button. -- +- !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")]}) @@ -66,21 +66,21 @@ !python {model: crm.lead2opportunity.partner}: | self.make_partner(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")]}) - - Now, I give value to this wizard field. + Now, I give value to this wizard field. - - !record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}: + !record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}: name: Capegemini planned_revenue: 0.00 probability: 0.00 - Then, Click on "Create Opportunity" button of this wizard. -- +- !python {model: crm.lead2opportunity}: | self.action_apply(cr, uid, [ref('crm_lead2opportunity_stonage_0')], {'active_id': ref('crm_lead_newcustomer0')}) - | In order to check the opportunity is created or not, I check type. -- +- !python {model: crm.lead}: | lead = self.browse(cr, uid, ref("crm_lead_newcustomer0")) assert lead.type == 'opportunity' diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml index b4b7ce29276..1392402965a 100644 --- a/addons/crm/test/test_crm_opportunity.yml +++ b/addons/crm/test/test_crm_opportunity.yml @@ -11,13 +11,13 @@ stage_id: crm.stage_opportunity1 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 open opportunity by click on "Open" button, - !python {model: crm.lead}: | @@ -29,7 +29,7 @@ - !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. @@ -49,27 +49,27 @@ - | 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 categ_id: crm.categ_phone1 -- | - schedule phonecall by apply (action_apply)function of opportunity2phoncall wizard -- +- | + 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. -- + 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. +- | + 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' @@ -78,4 +78,4 @@ partner_address_id: base.res_partner_address_1 partner_id: base.res_partner_9 section_id: crm.section_sales_department - + diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml index 7455518af27..5c12da99a7d 100644 --- a/addons/crm/test/test_crm_phonecall.yml +++ b/addons/crm/test/test_crm_phonecall.yml @@ -1,36 +1,35 @@ - | 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 section_id: crm.section_sales_department -- | +- Now , 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 -- +- Now, click on "Continue" button of this wizard. -- +- !python {model: crm.phonecall2partner}: | - self.make_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 + probability: 0.0 +- + Now, I click on "Convert" button of this wizard. - - Now, 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")}) @@ -39,29 +38,29 @@ - !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}: - opportunity_id != False - + - | And I check that the phonecall and the newly created business opportunity is linked to same partner - - !python {model: crm.phonecall}: | + !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: '2010-04-20 00:00:00' @@ -73,13 +72,13 @@ 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: '2010-04-21 19:49:00' name: Interview call @@ -87,7 +86,7 @@ user_id: base.user_root categ_id: crm.categ_phone1 - | - I click on "Schedule" button of this wizard. + I click on "Schedule" button of this wizard. - !python {model: crm.phonecall2phonecall}: | - self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')}) + self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')}) diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py index bd2aaca0607..0b68d7f37ba 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall.py +++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py @@ -85,7 +85,7 @@ class crm_opportunity2phonecall(osv.osv_memory): 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 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