From 72d713c8cf95a4f8a5c125b3ffd79a1a71b0d5ce Mon Sep 17 00:00:00 2001
From: "KSA (OpenERP)" <>
Date: Wed, 17 Feb 2010 18:49:40 +0530
Subject: [PATCH] [IMP]: crm, sale: Put proper names in view, change in sale
 reporting menu

bzr revid: rpa@openerp.co.in-20100217131940-7jia1dccwracioef
---
 addons/crm/crm_claims_view.xml   |  9 +++++----
 addons/crm/crm_helpdesk_view.xml |  6 +++---
 addons/sale/report_sale_view.xml | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index b693545654f..e97221f081b 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -32,11 +32,13 @@
         <field name="model">crm.claim</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Claims"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+            <tree string="Claims" colors="blue:state=='open';red:(date_deadline&lt;=current_date)">
                 <field name="id"/>
                 <field name="name"/>
                 <field name="partner_id"/>
-                <field name="date" string="Claims Date"/>
+                <field name="date" string="Claim Date"/>
+                 <field name="date_deadline" string="Deadline"/>
+                 <field name="date_closed" string="Closure Date"/>
                 <field name="categ_id" string="Type" select="1"/>
                 <field name="state"/>
             </tree>
@@ -52,7 +54,6 @@
                 <group colspan="4" col="4">
                     <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">
@@ -215,7 +216,7 @@
                            />
                    </field>
                    <group expand="1" string="Group By..." colspan="4" col="20">
-                       <filter string="Deadline" icon="terp-crm" domain="[]" context="{'group_by':'date_deadline'}"/>                        
+                       <filter string="Deadline" icon="terp-crm" domain="[]" context="{'group_by':'date_deadline'}"/>
                        <filter string="Closure" icon="terp-crm" domain="[]"  context="{'group_by':'date_closed'}"/>
                    </group>
                </search>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 70b14fb4a12..b1c85683e8f 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -124,9 +124,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" />
+                <field name="name" string="Query Description" />
                 <field name="partner_id" string="Partner"/>
-                <field name="create_date"/>
+                <field name="date" string="Date"/>
                 <field name="date_deadline"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -174,7 +174,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>
diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml
index 6d9f4ec931b..28749e8b672 100644
--- a/addons/sale/report_sale_view.xml
+++ b/addons/sale/report_sale_view.xml
@@ -24,13 +24,13 @@
             <field name="name">Sale Orders By Partner </field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph,tree</field>
             <field name="context">{'report':True}</field>
             <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
         </record>        
 	    <record model="ir.actions.act_window.view" id="action_sale_order_01">
-	        <field name="sequence" eval="1"/>
+	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="sale.view_sale_order_report_tree"/>
 	        <field name="act_window_id" ref="action_sale_order_report_all"/>
@@ -67,28 +67,31 @@
             <field name="name">Sale Orders by Product</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph,tree</field>
             <field name="context">{'report':True}</field>
    			<field name="domain">[('product_uom_qty','!=','0')]</field>
             <field name="search_view_id" ref="sale.view_sales_order_line_filter"/>
         </record>
 	    <record model="ir.actions.act_window.view" id="action_order_product01">
-	        <field name="sequence" eval="1"/>
+	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="view_order_report_tree"/>
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
 	    </record>   
 	    <record model="ir.actions.act_window.view" id="action_order_product02">
-	        <field name="sequence" eval="2"/>
+	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="sale.view_order_line_graph"/>
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
 	    </record>      
 
 	<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
-    <menuitem action="action_sale_order_report_all" id="menu_report_sale_order_all" parent="base.next_id_64" sequence="3"/>
+	
+	<menuitem id="sale_reporting_menu" name="Sale" parent="base.next_id_64" sequence="8"/>
+	
+    <menuitem action="action_sale_order_report_all" id="menu_report_sale_order_all" parent="sale.sale_reporting_menu" sequence="3"/>
     
-    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="4"/>
+    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="sale.sale_reporting_menu" sequence="4"/>
      
       </data>
     </openerp>    
\ No newline at end of file