[MERGE] merged with openobject-addons

[odoo/odoo.git] / addons / crm_claim / report / crm_claim_report_view.xml

diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index edb3dc2..db5973c 100644 (file)
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -19,6 +19,7 @@
                     <field name="day" invisible="1"/>
                                        <field name="nbr" string="#Claim" sum="#Claim"/>
                        <field name="delay_close" avg="Avg Closing Delay"/>
+                       <field name="delay_expected"/>
                        <field name="state" invisible="1"/>
                        <field name="stage_id" invisible="1"/>
                        <field name="categ_id" invisible="1"/>
@@ -42,6 +43,7 @@
                                        <field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
                     <field name="delay_close"/>
+                    <field name="delay_expected"/>
                     <field name="amount_revenue"/>
                     <field name="amount_costs"/>
                     <field name="amount_revenue_prob"/>
@@ -75,14 +77,17 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="8">
-                               <filter string="This Year" icon="terp-go-year"
-                                       domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                               <filter string="  Year  " icon="terp-go-year"
+                                       domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                                       help="Claims created in current year"/>
 
-                       <filter string="This Month" icon="terp-go-month" name="This Month"
-                          domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter string="   Month   " icon="terp-go-month" name="This Month"
+                          domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                          help="Claims created in current month"/>
 
-                       <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Claims created in last month"/>
 
                                <separator orientation="vertical" />
                         <filter icon="terp-document-new"
@@ -96,25 +101,24 @@
                                domain="[('state','=','pending')]"/>
 
                                <separator orientation="vertical" />
-                               <field name="section_id"
+                               <field name="section_id" string="Sales Team"
                                        default="context.get('section_id', False)"
-                                       widget="selection"
                                        context="{'invisible_section': False}">
 
                                        <filter icon="terp-personal+"
                                                context="{'invisible_section': False}"
                                                domain="[('section_id.user_id','=',uid)]"
-                                               help="My section" />
+                                               help="My team" />
 
                                </field>
-                               <field name="company_id" widget="selection">
+                               <field name="company_id">
                            <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
 
-                       <field name="user_id" select="1" widget="selection">
+                       <field name="user_id" string="Salesman" select="1">
                                        <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                                        </field>
                    </group>
@@ -139,42 +143,41 @@
                    <group  expand="1" string="Group By...">
                         <filter string="User" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-
-                        <filter string="Section" icon="terp-personal+"
+                        <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-
+                            
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-
                         <filter string="Stage" icon="terp-stage" domain="[]"
                              context="{'group_by':'stage_id'}" />
-
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
+                             context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical"/>
-                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                             context="{'group_by':'priority'}" />
-                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
                              context="{'group_by':'type_id'}" />
-
+                        <filter string="State" 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'}"/>
+                            domain="[]" context="{'group_by':'day'}"
+                            help="Date of claim"/>
 
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" 
+                            help="Month of claim"/>
 
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" 
+                            help="Year of claim"/>
                   </group>
-
                </search>
             </field>
         </record>
@@ -182,7 +185,7 @@
 <!-- CRM Claim Report Action -->
 
         <record id="action_report_crm_claim" model="ir.actions.act_window">
-            <field name="name">Claims</field>
+            <field name="name">Claims Analysis</field>
             <field name="res_model">crm.claim.report</field>
             <field name="view_type">form</field>
                        <field name="view_mode">tree,graph</field>