diff options
| author | Olivier Dony <odo@openerp.com> | 2012-12-06 16:38:56 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-12-06 16:38:56 +0100 |
| commit | 5db87bea9ca535a53dfedd044c8563f3874078b3 (patch) | |
| tree | 6dbd5a1905415ed666a9e309494a8483bc420b20 /addons/project_issue | |
| parent | 82e892bc536c3a8426b78e9a1962002a4be675c3 (diff) | |
| parent | 28e4d3a2864b4267673c123478c36c2dfe03a904 (diff) | |
[MERGE] Bugfixes from 6.1 until revision 6800
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
Diffstat (limited to 'addons/project_issue')
| -rw-r--r-- | addons/project_issue/project_issue.py | 1 | ||||
| -rw-r--r-- | addons/project_issue/report/project_issue_report.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 55aa0fd557b..3168e253fe8 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -500,7 +500,6 @@ class project_issue(base_stage, osv.osv): custom_values['priority'] = msg.get('priority') res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context) - # self.convert_to_bug(cr, uid, [res_id], context=context) return res_id def message_update(self, cr, uid, ids, msg, update_vals=None, context=None): diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index bb95d5195c4..75bb2c07ef1 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -52,8 +52,8 @@ class project_issue_report(osv.osv): 'date_closed': fields.date('Date of Closing', readonly=True), 'stage_id': fields.many2one('project.task.type', 'Stage'), 'nbr': fields.integer('# of Issues', readonly=True), - 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True), - 'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True), + 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True, group_operator="avg"), + 'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True, group_operator="avg"), 'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg", help="Number of Days to open the project issue."), 'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg", |