diff options
Diffstat (limited to 'addons/project_issue/report')
| -rw-r--r-- | addons/project_issue/report/project_issue_report.py | 11 | ||||
| -rw-r--r-- | addons/project_issue/report/project_issue_report_view.xml | 32 |
2 files changed, 12 insertions, 31 deletions
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 29542f32912..36ce72f2a70 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -37,7 +37,6 @@ class project_issue_report(osv.osv): _columns = { 'name': fields.char('Year', size=64, required=False, readonly=True), - 'user_id':fields.many2one('res.users', 'Responsible', readonly=True), 'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True), 'month':fields.selection([('01', 'January'), ('02', 'February'), \ @@ -64,9 +63,9 @@ class project_issue_report(osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'), 'project_id':fields.many2one('project.project', 'Project',readonly=True), 'version_id': fields.many2one('project.issue.version', 'Version'), - 'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True), + 'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True), 'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"), - 'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True), + 'channel_id': fields.many2one('crm.case.channel', 'Channel',readonly=True), 'task_id': fields.many2one('project.task', 'Task',domain="[('object_id.model', '=', 'project.issue')]" ), 'email': fields.integer('# Emails', size=128, readonly=True), } @@ -95,14 +94,14 @@ class project_issue_report(osv.osv): c.project_id as project_id, c.version_id as version_id, 1 as nbr, - c.assigned_to, c.partner_id, - c.canal_id, + c.channel_id, c.task_id, date_trunc('day',c.create_date) as create_date, extract('epoch' from (c.date_open-c.create_date))/(3600*24) as delay_open, extract('epoch' from (c.date_closed-c.date_open))/(3600*24) as delay_close, - (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email + (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email + FROM project_issue c WHERE c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue')) diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 015a7750548..1ed21b8dc01 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -18,10 +18,9 @@ <field name="section_id" invisible="1"/> <field name="user_id" invisible="1"/> <field name="categ_id" invisible="1"/> - <field name="canal_id" invisible="1"/> + <field name="channel_id" invisible="1"/> <field name="partner_id" invisible="1"/> - <field name="task_id" invisible="1"/> - <field name="assigned_to" invisible="1"/> + <field name="task_id" invisible="1"/> <field name="date_closed" invisible="1"/> <field name="state" invisible="1"/> <field name="day" invisible="1"/> @@ -89,31 +88,14 @@ </field> <field name="project_id"/> - <field name="user_id" select="1" widget="selection"/> + <field name="user_id" select="1" widget="selection" filter_domain="[('user_id','ilike',self)]"/> + <field name="partner_id"/> + <field name="version_id" widget="selection" /> </group> <newline/> - <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended"> - <field name="partner_id"/> - <field name="assigned_to" widget="selection"/> - <separator orientation="vertical"/> - <field name="priority" /> - <separator orientation="vertical"/> - <field name="version_id" widget="selection" /> - <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/> - <field name="type_id" widget="selection"/> - <separator orientation="vertical"/> - <field name="company_id" widget="selection" groups="base.group_multi_company"/> - <newline/> - <field name="creation_date"/> - <field name="opening_date"/> - <field name="date_closed" string="Date Closed"/> - </group> - <newline/> - <group expand="1" string="Group By..." colspan="4" col="8"> - <filter name="User" string="Responsible" icon="terp-personal" - domain="[]" context="{'group_by':'user_id'}" /> + <group expand="1" string="Group By..." colspan="4" col="8"> <filter string="Assigned to" name="Responsible" icon="terp-personal" - domain="[]" context="{'group_by':'assigned_to'}" /> + domain="[]" context="{'group_by':'user_id'}" /> <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" /> <separator orientation="vertical" /> <filter string="Sale Team" icon="terp-personal+" |