[IMP]: crm_claim: Improvement in claims reporting search view

bzr revid: rpa@tinyerp.com-20101004060316-gpjo32q7eruxxn0j

diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 65e9f3e..f03a5f7 100644 (file)
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -70,7 +70,8 @@ class crm_claim_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
-        'date_closed': fields.date('Closed', readonly=True), 
+        'date_closed': fields.date('Close Date', readonly=True), 
+        'date_deadline': fields.date('Deadline', readonly=True), 
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
     }
 
@@ -89,6 +90,7 @@ class crm_claim_report(osv.osv):
                     to_char(c.date, 'MM') as month,
                     to_char(c.date, 'YYYY-MM-DD') as day,
                     to_char(c.date_closed, 'YYYY-MM-DD') as date_closed,
+                    to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline,
                     c.state,
                     c.user_id,
                     c.stage_id,

diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index f75f9c1..35333e0 100644 (file)
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -130,14 +130,17 @@
                         <filter icon="gtk-cancel"
                             string="Cancel"
                             domain="[('state','=','cancel')]"/>
-                        <group>
-                            <separator orientation="vertical"/>
-                            <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                            <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                            <separator orientation="vertical"/>
-                            <field name="priority" />
-                            <field name="type_action" />
-                        </group>
+                        <separator orientation="vertical"/>
+                        <field name="partner_id"/>
+                        <separator orientation="vertical"/>
+                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="priority" />
+                        <field name="type_action" />
+                        <newline/>
+                        <field name="date_closed" />
+                        <field name="date_deadline" />
                     </group>
                     <newline/>
                     <group  expand="1" string="Group By...">
@@ -146,7 +149,8 @@
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-
+                        <filter string="Partner" name="partner" icon="terp-partner"
+                            domain="[]" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]"
                             context="{'group_by':'stage_id'}" />
@@ -157,7 +161,7 @@
 
                         <separator orientation="vertical"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
-                            context="{'group_by':'type_action'}" />
+                            context="{'group_by':'type_action'}" help="Action Type"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical" />