[IMP]: crm, product: Generic Improvment in view + search view

bzr revid: rpa@openerp.co.in-20100216135741-ie0fd5x06cpfz5wv

4 files changed, 21 insertions, 11 deletions

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 99c7c67c770..1289b44a0cd 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -25,12 +25,17 @@ import os
 import base64
 import tools
 import mx.DateTime
+import datetime
 
-from tools.translate import _
-from osv import fields 
-from osv import osv 
+from datetime import datetime
+from datetime import timedelta
+from osv import fields
 from osv import orm
+from osv import osv
 from osv.orm import except_orm
+from tools.translate import _
+
+
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
@@ -270,6 +275,7 @@ class crm_case(osv.osv):
         'email_from': _get_default_email,
         'state': lambda *a: 'draft',
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date_deadline': lambda *a:(datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'),
         'section_id': _get_section,
     }
     _order = 'date_deadline desc, date desc,id desc'
diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 73fb7734248..82560e95959 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -36,9 +36,8 @@
                 <field name="id"/>
                 <field name="name"/>
                 <field name="partner_id"/>
-                <field name="date" string="Date"/>
+                <field name="date" string="Claim Date"/>
                 <field name="categ_id" string="Type" select="1"/>
-                <field name="probability"/>
                 <field name="state"/>
             </tree>
         </field>
@@ -54,10 +53,11 @@
                     <field name="name"/>
                     <field name="date" string="Date of Claim"/>
                     <field name="planned_cost" string="Claim Cost"/>
+                    <field name="date_deadline" string="Deadline"/>
                 </group>
                 <group colspan="4" col="4">
                 <notebook>
-                <page string="Claims Info">
+                <page string="Claim Info">
                 	<separator colspan="4" string="Communication"/>
                 	<group colspan="4" col="4">
                 		<field name="partner_id" string="Partner"
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 7439d584193..d11a09584d0 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -126,10 +126,9 @@
         <field name="arch" type="xml">
             <tree string="Helpdesk Support Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id"/>
-                <field name="name" string="Support Query"/>
+                <field name="name" string="Query Description"/>
                 <field name="partner_id" string="Partner"/>
-                <field name="planned_revenue"/>
-                <field name="probability"/>
+                <field name="date"/>
                 <field name="date_deadline"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -177,7 +176,7 @@
                </group>
                <separator orientation="vertical"/>
                <group col="6" colspan="2">
-             		<field name="name" select='1' string="Subject"/>
+             		<field name="name" select='1' string="Query"/>
                		<field name="user_id" select="1" widget="selection">
 	                   	<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Helpdesk Requests" default="1"/>
                    </field>
@@ -190,6 +189,11 @@
                                help="My section"/>
 			   		</field>
                    </group>
+                   <group expand="1" string="Group By..." colspan="4" col="8">
+						<filter string="Customer" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Priority" icon="terp-sale" domain="[]" context="{'group_by':'priority'}"/>
+					</group>
            </search>
         </field>
     </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index e0b2cc714f6..fefac1da3d7 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -18,8 +18,8 @@
                     <group col='8' colspan='4'>
                         <filter string="Services" icon="terp-stock" domain="[('type','=','service')]"/>
                         <filter string="Stockable" icon="terp-stock" domain="['|',('type','=','product'),('type','=','consu')]"/>
-                        <field name="name" select="1"/>
                         <field name="default_code" select="1"/>
+                        <field name="name" select="1"/>
                         <field name="categ_id" select="1" widget="selection"/>
                    </group>
                    <newline/>