From 44d56c5bea5ae7948006a90bc8320a3bc4240961 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 9 Dec 2011 13:00:04 +0530 Subject: [PATCH 1/4] [IMP] improvement in code bzr revid: tpa@tinyerp.com-20111209073004-ll1y70suz5oo0yv5 --- addons/project/__openerp__.py | 1 + addons/project/project.py | 5 +++-- addons/project/test/project_demo.yml | 12 ++++++++++++ addons/project/test/project_process.yml | 16 ++++++++++------ addons/project/test/task_process.yml | 16 ++++++++++++---- 5 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 addons/project/test/project_demo.yml diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index c9484ae9dd8..1a03232e628 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -63,6 +63,7 @@ Dashboard for project members that includes: 'test':[ 'test/project_process.yml', 'test/task_process.yml', + 'test/project_demo.yml', ], 'installable': True, 'active': False, diff --git a/addons/project/project.py b/addons/project/project.py index 1fc83771005..c2dc37b062b 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -111,6 +111,7 @@ class project(osv.osv): if task.project_id: result[task.project_id.id] = True return result.keys() + #dead code def _get_project_work(self, cr, uid, ids, context=None): result = {} for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context): @@ -357,7 +358,7 @@ def Project(): working_days = %s resource = %s """ % ( - project.id, + project.id, project.date_start, working_days, '|'.join(['User_'+str(x) for x in puids]) ) @@ -1016,7 +1017,7 @@ class account_analytic_account(osv.osv): if vals.get('child_ids', False) and context.get('analytic_project_copy', False): vals['child_ids'] = [] return super(account_analytic_account, self).create(cr, uid, vals, context=context) - + def unlink(self, cr, uid, ids, *args, **kwargs): project_obj = self.pool.get('project.project') analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)]) diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml new file mode 100644 index 00000000000..3bcae52e238 --- /dev/null +++ b/addons/project/test/project_demo.yml @@ -0,0 +1,12 @@ +- + !record {model: project.project, id: project_integrate_openerp, view: False}: + partner_id: base.res_partner_agrolait +- + !record {model: project.task, id: project_task_1, view: False}: + remaining_hours: 10.00 +- + !record {model: project.task, id: project_task_1, view: False}: + planned_hours: 10.00 +- + !record {model: project.task, id: project_task_1, view: False}: + project_id: project_integrate_openerp \ No newline at end of file diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml index 1c0c7a18713..d162a5e5ba2 100644 --- a/addons/project/test/project_process.yml +++ b/addons/project/test/project_process.yml @@ -17,8 +17,7 @@ I check project details after convert from template. - !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be active}: - - state == "open" - + - state == "open" - I put project in pending. - @@ -28,7 +27,7 @@ I check state after put in pending. - !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be in pending state}: - - state == "pending" + - state == "pending" - I re-open the project. - @@ -38,7 +37,7 @@ I check state after reopen. - !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be open.}: - - state == "open" + - state == "open" - I close the project. - @@ -48,7 +47,7 @@ I check state after closed. - !assert {model: project.project, id: project_integrate_openerp, severity: error, string: Project should be close.}: - - state == "close" + - state == "close" - I set project into template. - @@ -59,8 +58,13 @@ - !python {model: project.project}: | self.schedule_tasks(cr, uid, [ref("project_integrate_openerp")], context=context) +- + I set copy the tasks of project. +- + !python {model: project.project}: | + self.template_copy(cr, uid, ref("project_integrate_openerp")) - I cancel Project. - !python {model: project.project}: | - self.set_cancel(cr, uid, [ref("project_project_9")]) + self.set_cancel(cr, uid, [ref("project_project_9")]) \ No newline at end of file diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml index e294b117397..a12877526c1 100644 --- a/addons/project/test/task_process.yml +++ b/addons/project/test/task_process.yml @@ -39,6 +39,11 @@ - !record {model: project.task.reevaluate, id: reevaluate_id}: remaining_hours : 120 +- + I chnge the stage of task to next stage +- + !python {model: project.task}: | + self.prev_type(cr, uid, [ref("project_task_1")]) - I reevaluate task with remaining hours. - @@ -49,11 +54,16 @@ - !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}: - remaining_hours == 120.0 +- + I chnge the stage of task to next stage +- + !python {model: project.task}: | + self.next_type(cr, uid, [ref("project_task_1")]) - I close the task. - !python {model: project.task}: | - self.do_close(cr, uid, [ref("project_task_1")]) + self.action_close(cr, uid, [ref("project_task_1")]) - I check state after closed. - @@ -63,6 +73,4 @@ I cancel Task. - !python {model: project.task}: | - self.do_cancel(cr, uid, [ref("project_task_2")]) - - + self.do_cancel(cr, uid, [ref("project_task_2")]) \ No newline at end of file From 7b052fa0a3cdc88bf6456526a2e6ff0a8cbcf522 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 9 Dec 2011 14:31:23 +0530 Subject: [PATCH 2/4] [IMP] change string bzr revid: tpa@tinyerp.com-20111209090123-12kku4od5n0g3ejb --- addons/project/test/task_process.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml index a12877526c1..0938e649785 100644 --- a/addons/project/test/task_process.yml +++ b/addons/project/test/task_process.yml @@ -40,7 +40,7 @@ !record {model: project.task.reevaluate, id: reevaluate_id}: remaining_hours : 120 - - I chnge the stage of task to next stage + I chnge the stage of task to previous stage - !python {model: project.task}: | self.prev_type(cr, uid, [ref("project_task_1")]) From 053270ae0d6e638789726fc3f0035a1efbf180f0 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 12 Dec 2011 17:27:57 +0530 Subject: [PATCH 3/4] [IMP] improved YML test case of Project bzr revid: tpa@tinyerp.com-20111212115757-ad9q8xzm8b38k2mo --- addons/project/__openerp__.py | 2 +- addons/project/test/project_process.yml | 2 +- addons/project/test/task_process.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index 1a03232e628..067c0b4d452 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -61,9 +61,9 @@ Dashboard for project members that includes: 'project_demo.xml', ], 'test':[ + 'test/project_demo.yml', 'test/project_process.yml', 'test/task_process.yml', - 'test/project_demo.yml', ], 'installable': True, 'active': False, diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml index d162a5e5ba2..3c51c464b1f 100644 --- a/addons/project/test/project_process.yml +++ b/addons/project/test/project_process.yml @@ -59,7 +59,7 @@ !python {model: project.project}: | self.schedule_tasks(cr, uid, [ref("project_integrate_openerp")], context=context) - - I set copy the tasks of project. + I copy the tasks of project. - !python {model: project.project}: | self.template_copy(cr, uid, ref("project_integrate_openerp")) diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml index 0938e649785..3d9edb54e57 100644 --- a/addons/project/test/task_process.yml +++ b/addons/project/test/task_process.yml @@ -40,10 +40,10 @@ !record {model: project.task.reevaluate, id: reevaluate_id}: remaining_hours : 120 - - I chnge the stage of task to previous stage + I change the stage of task to next stage. - !python {model: project.task}: | - self.prev_type(cr, uid, [ref("project_task_1")]) + self.next_type(cr, uid, [ref("project_task_1")]) - I reevaluate task with remaining hours. - @@ -55,10 +55,10 @@ !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}: - remaining_hours == 120.0 - - I chnge the stage of task to next stage + I change the stage of task to previous stage. - !python {model: project.task}: | - self.next_type(cr, uid, [ref("project_task_1")]) + self.prev_type(cr, uid, [ref("project_task_1")]) - I close the task. - From 97424370c6dc8646e7e094d9da94eb33eeeabae5 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 12 Dec 2011 17:58:58 +0530 Subject: [PATCH 4/4] [IMP] improved YML test case of Project bzr revid: tpa@tinyerp.com-20111212122858-hcmybqd9sinpfzs8 --- addons/project/test/task_process.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml index 3d9edb54e57..73250de2963 100644 --- a/addons/project/test/task_process.yml +++ b/addons/project/test/task_process.yml @@ -36,14 +36,14 @@ - !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}: - state == "open" -- - !record {model: project.task.reevaluate, id: reevaluate_id}: - remaining_hours : 120 - I change the stage of task to next stage. - !python {model: project.task}: | self.next_type(cr, uid, [ref("project_task_1")]) +- + !record {model: project.task.reevaluate, id: reevaluate_id}: + remaining_hours : 120 - I reevaluate task with remaining hours. - @@ -54,11 +54,6 @@ - !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}: - remaining_hours == 120.0 -- - I change the stage of task to previous stage. -- - !python {model: project.task}: | - self.prev_type(cr, uid, [ref("project_task_1")]) - I close the task. - @@ -69,6 +64,11 @@ - !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}: - state == "done" +- + I change the stage of task to previous stage. +- + !python {model: project.task}: | + self.prev_type(cr, uid, [ref("project_task_1")]) - I cancel Task. -