From 2fe5fdfc057f68ad5f3a2ceaa045de5385958d27 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Mon, 10 Jan 2011 12:56:52 +0530 Subject: [PATCH 1/5] [FIX] document_ftp: Corrected login procedure to run the test successfully. lp bug: https://launchpad.net/bugs/700682 fixed bzr revid: uco@tinyerp.com-20110110072652-zjacy104ru6a11uv --- addons/document_ftp/test_easyftp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py index 04a480fce36..419a34654da 100644 --- a/addons/document_ftp/test_easyftp.py +++ b/addons/document_ftp/test_easyftp.py @@ -37,7 +37,7 @@ def get_plain_ftp(timeout=10.0): def get_ftp_login(cr, uid, ormobj): ftp = get_plain_ftp() user = ormobj.pool.get('res.users').read(cr, uid, uid) - ftp.login(user.get('login',''), user.get('login','')) + ftp.login(user.get('login',''), user.get('password','')) ftp.cwd("/" + cr.dbname) return ftp From e280af96b4ee074c16ebf702b08df450fa1fd523 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Mon, 10 Jan 2011 18:21:13 +0530 Subject: [PATCH 2/5] [ADD] crm: Added a yaml for changes in stages for leads/opportunity. bzr revid: uco@tinyerp.com-20110110125113-js0bqdeoxl0nlxd8 --- addons/crm/__openerp__.py | 1 + addons/crm/test/test_crm_stage_changes.yml | 90 ++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 addons/crm/test/test_crm_stage_changes.yml diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 74eb1a95b23..169b300d86a 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -126,6 +126,7 @@ Create dashboard for CRM that includes: 'test/test_crm_opportunity.yml', 'test/test_crm_phonecall.yml', 'test/test_crm_recurrent_meeting.yml', + 'test/test_crm_stage_changes.yml', ], 'installable': True, 'active': False, diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml new file mode 100644 index 00000000000..6332d581366 --- /dev/null +++ b/addons/crm/test/test_crm_stage_changes.yml @@ -0,0 +1,90 @@ +- + 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_case_stage_lost1}: + name: Lost + on_change: true + probability: 0.0 + section_ids: + - crm.section_sales_department + sequence: 0.0 + type: opportunity +- + I create a lead 'OpenERP Presentation'. +- + !record {model: crm.lead, id: crm_lead_openerppresentation0}: + categ_id: crm.categ_oppor4 + day_close: 0.0 + day_open: 0.0 + name: OpenERP Presentation + planned_revenue: 0.0 + probability: 0.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 find that this lead can be converted to opportunity. +- + !record {model: crm.lead2opportunity, id: crm_lead2opportunity0}: + name: OpenERP Presentation + probability: 60.0 + planned_revenue: 45000.0 +- + So I convert the lead to opportunity. +- + !python {model: crm.lead2opportunity}: | + self.action_apply(cr, uid, [ref('crm_lead2opportunity0')], context={'active_id': 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')]) +- + Now 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_opportunity6'), 'Stage is not changed!' + assert opportunity.probability == 0.0, 'Probability is wrong!' +- + I create one more opportunity. +- + !record {model: crm.lead, id: crm_lead_partnerdemo0}: + categ_id: crm.categ_oppor3 + day_close: 0.0 + day_open: 0.0 + name: Partner Demo + planned_revenue: 50000.0 + probability: 70.0 + section_id: crm.section_sales_department + type: opportunity +- + I open this opportunity. +- + !python {model: crm.lead}: | + self.case_open(cr, uid, [ref('crm_lead_partnerdemo0')]) +- + I mark this opportunity as won. +- + !python {model: crm.lead}: | + self.case_close(cr, uid, [ref('crm_lead_partnerdemo0')]) +- + 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_partnerdemo0')) + assert opportunity.stage_id.id == ref('crm.stage_opportunity5'), 'Stage is not changed!' + assert opportunity.probability == 100.0, 'Probability is wrong!' From c4ac410cea739b6b25699a94a3c7cd4278e48ad0 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Tue, 11 Jan 2011 12:51:12 +0530 Subject: [PATCH 3/5] [REF] crm: Small change in yaml. bzr revid: uco@tinyerp.com-20110111072112-2lzr1o97t0frmrnu --- addons/crm/test/test_crm_stage_changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/test/test_crm_stage_changes.yml b/addons/crm/test/test_crm_stage_changes.yml index 6332d581366..85956ecdacb 100644 --- a/addons/crm/test/test_crm_stage_changes.yml +++ b/addons/crm/test/test_crm_stage_changes.yml @@ -5,7 +5,7 @@ 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_case_stage_lost1}: + !record {model: crm.case.stage, id: crm.stage_opportunity6}: name: Lost on_change: true probability: 0.0 From fb53d2dff50b9058144bcc18959d7d2fdc3d943b Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Tue, 11 Jan 2011 16:28:40 +0530 Subject: [PATCH 4/5] [Fix] project : remove parent_id bzr revid: sbh@tinyerp.com-20110111105840-02jozg91m3ukm7kc --- addons/project/project.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index a1f93e51980..43b6e4e8be8 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -127,7 +127,6 @@ class project(osv.osv): 'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose, but a user has to be member of a project to add a the to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), - 'parent_id': fields.many2one('project.project', 'Parent Project'), 'tasks': fields.one2many('project.task', 'project_id', "Project tasks"), 'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.", store = { From 2b389abe35252dc0bff39d601d4504e4a28071aa Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Tue, 11 Jan 2011 16:33:57 +0530 Subject: [PATCH 5/5] [REVERT] document_ftp: Reverted the changes for lp:700682 bzr revid: uco@tinyerp.com-20110111110357-bf51758r4ihzzbwt --- addons/document_ftp/test_easyftp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py index 419a34654da..04a480fce36 100644 --- a/addons/document_ftp/test_easyftp.py +++ b/addons/document_ftp/test_easyftp.py @@ -37,7 +37,7 @@ def get_plain_ftp(timeout=10.0): def get_ftp_login(cr, uid, ormobj): ftp = get_plain_ftp() user = ormobj.pool.get('res.users').read(cr, uid, uid) - ftp.login(user.get('login',''), user.get('password','')) + ftp.login(user.get('login',''), user.get('login','')) ftp.cwd("/" + cr.dbname) return ftp