[IMP] project issue

bzr revid: nel@tinyerp.com-20100607080133-qpl63e1r8hnsgvc1

diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 26ae525..92f170e 100644 (file)
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -51,6 +51,7 @@ 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),
+        'user_id2':fields.many2one('res.users', 'Assigned To', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
@@ -66,6 +67,7 @@ class project_issue_report(osv.osv):
         'day': fields.char('Day', size=128, readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
+        'date_closed': fields.date('Closed Date', readonly=True),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
         'nbr': fields.integer('# of Issues', readonly=True),
@@ -78,8 +80,8 @@ class project_issue_report(osv.osv):
         'company_id' : fields.many2one('res.company', 'Company'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
-        'type_id': fields.many2one('crm.case.resource.type', 'Type', domain="[('object_id.model', '=', 'project.issue')]"),
-        'date_closed': fields.date('Close Date', readonly=True),
+        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'user_id2losed': fields.date('Close Date', readonly=True),
         'assigned_to' : 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),

diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 396a892..dd88d41 100644 (file)
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -12,7 +12,7 @@
                     <field name="month" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
-                    <field name="type_id" string="Type" invisible="1"/>
+                    <field name="type_id" string="Version" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="section_id" invisible="1"/>
@@ -91,11 +91,13 @@
                    <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Project"  name="project_id" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
-                        <filter string="User" name="User" icon="terp-personal" 
-                        domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                         <separator orientation="vertical" />
+                        <filter name="User" string="Responsible" icon="terp-personal" 
+                        domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Assigned to" name="Responsible" icon="terp-personal"
+                        domain="[]" context="{'group_by':'assigned_to'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
-                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="Section" icon="terp-sale"
                                domain="[]"
@@ -103,7 +105,7 @@
                         <filter string="Category" icon="terp-stock_symbol-selection"
                                domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Type"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />