[IMP]report_crm:Improve the view of report

bzr revid: sbh@tinyerp.com-20100303095122-h5k0rol6zod11vz8

diff --git a/addons/report_crm/report_crm_fundraising_view.xml b/addons/report_crm/report_crm_fundraising_view.xml
index 8faba79..531d1f8 100644 (file)
--- a/addons/report_crm/report_crm_fundraising_view.xml
+++ b/addons/report_crm/report_crm_fundraising_view.xml
@@ -14,11 +14,11 @@
                        <field name="name" />
                                        <field name="month"/>
                        <field name="nbr" string="#Fundraising"/>
-                       <field name="delay_close"/>
                     <field name="amount_revenue"/>
-                    <field name="amount_revenue_prob"/>
                     <field name="probability"/>
-                    <field name="state"/>
+                    <field name="amount_revenue_prob"/>
+                    <field name="delay_close"/>
+                    <field name="state" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="stage_id"  invisible="1"/>
                     <field name="categ_id" invisible="1"/>

diff --git a/addons/report_crm/report_crm_phonecall_view.xml b/addons/report_crm/report_crm_phonecall_view.xml
index c7bb87f..05748b9 100644 (file)
--- a/addons/report_crm/report_crm_phonecall_view.xml
+++ b/addons/report_crm/report_crm_phonecall_view.xml
@@ -15,7 +15,10 @@
                                        <field name="month"/>
                                        <field name="nbr" string="#Phone calls" />
                        <field name="delay_close"/>
-                       <field name="categ_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="categ_id" invisible="1"/>                     
                                </tree>
             </field>
         </record>
@@ -54,26 +57,38 @@
             <field name="arch" type="xml">
                                <search string="Search">
                   <group col="16" colspan="8">
-                               <filter string="My Cases" icon="terp-hr" domain="[('user_id','=',uid)]" help="My cases by section"/>
-                               <separator orientation="vertical"/>
                                <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
                                                <filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
+                                               <filter string="Current" icon="terp-hr" domain="[('state','=','draft')]"/>
                                                <filter string="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-                                               <filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>                                                
+                                               <filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>
+                                               <separator orientation="vertical"/>     
+                                               <field name="section_id" default="context.get('section_id', False)" widget="selection"
+                                               context="{'invisible_section': False}">
+                                <filter icon="terp-crm"
+                        context="{'invisible_section': False}"
+                        domain="[('section_id.user_id','=',uid)]"
+                        help="My section"/>
+                        </field>
+                         <field name="user_id" widget="selection">
+                       <filter icon="terp-partner"
+                               domain="[('user_id','=',uid)]"
+                               help="My " default="1"
+                       />
+                </field>                                               
                                                <separator orientation="vertical"/>
                                                <field name="name" select="1"/>
                            <field name="month" select="1"/>
-                           <field name="user_id" select="1"/>
-                                               <field name="section_id" select="1"/>
                            <field name="nbr" select="1"/>
                            <field name="state" select="1"/>
                    </group>
-                  <newline/>
+                   <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Section" icon="terp-sale" domain="[]" context="{'group_by':'section_id'}"/>
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                        <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
+                       <filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
                        <filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>
                    </group>
                </search>

diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index 947e942..f2498a0 100644 (file)
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -73,10 +73,7 @@
                        />
                 </field>                                               
                                                <separator orientation="vertical"/>
-                                               <field name="name" select="1"/>
-                           <field name="month" select="1"/>
-                           <field name="nbr" select="1"/>
-                           <field name="state" select="1"/>
+                                       <field name="state" select="1"/>
                    </group>
                    <newline/>
                   <group expand="1" string="Group By..." colspan="4" col="8">
@@ -85,7 +82,7 @@
                         <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
                        <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'month'}"/>
-                       <filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'year'}"/>
+                       <filter string="Year" icon="terp-sale" domain="[]" context="{'group_by':'name'}"/>
                        <filter string="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>
                    </group>