Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-clean-yml-project-tpa into
lp:~openerp-dev/openobject-addons/trunk-polish2_impove_testcase_yml_project-kbh.
Requested reviews:
Ujjvala Collins (OpenERP) (uco-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-yml-project-tpa/+merge/85079
Project
Improve yml of Project module.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-clean-yml-project-tpa/+merge/85079
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-polish2_impove_testcase_yml_project-kbh.
=== modified file 'project/__openerp__.py'
--- project/__openerp__.py 2011-11-28 10:40:02 +0000
+++ project/__openerp__.py 2011-12-09 08:53:37 +0000
@@ -63,6 +63,7 @@
'test':[
'test/project_process.yml',
'test/task_process.yml',
+ 'test/project_demo.yml',
],
'installable': True,
'active': False,
=== modified file 'project/project.py'
--- project/project.py 2011-11-13 15:40:52 +0000
+++ project/project.py 2011-12-09 08:53:37 +0000
@@ -111,6 +111,7 @@
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 @@
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 @@
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)])
=== added file 'project/test/project_demo.yml'
--- project/test/project_demo.yml 1970-01-01 00:00:00 +0000
+++ project/test/project_demo.yml 2011-12-09 08:53:37 +0000
@@ -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
=== modified file 'project/test/project_process.yml'
--- project/test/project_process.yml 2011-11-28 11:11:07 +0000
+++ project/test/project_process.yml 2011-12-09 08:53:37 +0000
@@ -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.
-
@@ -60,7 +59,12 @@
!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
=== modified file 'project/test/task_process.yml'
--- project/test/task_process.yml 2011-11-28 11:11:07 +0000
+++ project/test/task_process.yml 2011-12-09 08:53:37 +0000
@@ -40,6 +40,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.
-
!python {model: project.task.reevaluate}: |
@@ -50,10 +55,15 @@
!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
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
