[MERGE]:merged with trunk

bzr revid: apa@tinyerp.com-20120801070425-ydyx8nc2ngi3j0zi

2 files changed, 26 insertions, 60 deletions

diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 5957ee284e8..b43cbc51c50 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -50,7 +50,6 @@ class project_issue_report(osv.osv):
         'opening_date': fields.date('Date of Opening', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Date of Closing', readonly=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
         '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),
@@ -86,7 +85,6 @@ class project_issue_report(osv.osv):
                     c.working_hours_open,
                     c.working_hours_close,
                     c.section_id,
-                    c.categ_id,
                     c.stage_id,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
                     c.company_id as company_id,
@@ -104,7 +102,7 @@ class project_issue_report(osv.osv):
 
                 FROM
                     project_issue c
-                WHERE c.active= 'true' and c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
+                WHERE c.active= 'true'
             )""")
 
 project_issue_report()
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 862f52b1931..c1ae69517c2 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -17,19 +17,18 @@
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="section_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="categ_id" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="task_id" invisible="1"/>                    
+                    <field name="task_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
                     <field name="state" invisible="1"/>
                     <field name="day" invisible="1"/>
-                    <field name="nbr" string="#Project Issues" sum='#Number of Project Issues'/>
-                    <field name="delay_open" avg='Avg Opening Delay'/>
-                    <field name="delay_close" avg='Avg Closing Delay'/>
-                    <field name="working_hours_open" avg='Open Working Hours'/>
-                    <field name="working_hours_close" avg='Close Working hours'/>
-                    <field name="email" sum='# Emails'/>
+                    <field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/>
+                    <field name="delay_open" avg="Avg Opening Delay"/>
+                    <field name="delay_close" avg="Avg Closing Delay"/>
+                    <field name="working_hours_open" avg="Open Working Hours"/>
+                    <field name="working_hours_close" avg="Close Working hours"/>
+                    <field name="email" sum="# Emails"/>
                   </tree>
             </field>
         </record>
@@ -52,61 +51,30 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                   <group>
-                        <field name="creation_date"/>
-                        <separator orientation="vertical" />
-                        <filter  icon="terp-camera_test"
-                            string="New"
-                            domain="[('state','=','draft')]"/>
-                        <filter  icon="terp-check"
-                            string="To Do"
-                            domain="[('state','=','open')]"/>
-                        <filter icon="terp-gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"/>
-                        <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
-                          <separator orientation="vertical" />
-                          <field name="project_id"/>
-                          <field name="user_id" widget="selection"/>
-                          <field name="partner_id"/>
-                          <field name="version_id" widget="selection" />
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="Assigned to" name="Responsible" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+                    <field name="creation_date"/>
+                    <filter  icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
+                    <filter  icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
+                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="partner_id"/>
+                    <field name="version_id"/>
+                    <group  expand="1" string="Group By...">
+                        <filter string="Assigned to" name="Responsible" icon="terp-personal" 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+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <separator orientation="vertical" />
+                        <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Project"  name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
-                        <separator orientation="vertical" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
-                        <separator orientation="vertical" />
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical"/>
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <separator orientation="vertical" />
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
-
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
-
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
+                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
                    </group>
                </search>
             </field>