Merge lp:~openerp-dev/openobject-addons/trunk-bug-1158394-nco into lp:openobject-addons

[Nimesh Contractor(Open ERP)]

Hello,

     Fix the problem of project / task progress aggregate on group by.

Thanks.

Unmerged revisions

8698. By Pooja Zankhariya(OpenERP) on 2013-05-06

[FIX] task progress aggregate on group by is now calculated by hour

=== modified file 'project/project.py'
--- project/project.py	2013-04-15 08:43:02 +0000
+++ project/project.py	2013-05-06 10:20:36 +0000
@@ -79,6 +79,13 @@
                  "mail.alias": "alias_id"}
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
+        result = super(project,self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
+        for r in result:
+            if 'planned_hours' in r and r['planned_hours'] <> 0:
+                r['progress_rate'] = r['effective_hours'] * 100 / r['planned_hours']
+        return result
+
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
             return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)