[MERGE]

bzr revid: hmo@tinyerp.com-20100303110436-czic6b4dgmkhlv9j

diff --cc addons/report_crm/report_crm_claim_view.xml
index 396b213,396b213..6793355
--- 1/addons/report_crm/report_crm_claim_view.xml
--- 2/addons/report_crm/report_crm_claim_view.xml
+++ b/addons/report_crm/report_crm_claim_view.xml
@@@ -56,7 -56,7 +56,7 @@@
              <field name="inherit_id" ref="view_crm_case_filter"/>
              <field name="type">search</field>
              <field name="arch" type="xml">
--                <field name="state" position="before">
++                <field name="user_id" position="before">
                 </field>
              </field>
          </record>

diff --cc addons/report_crm/report_crm_fundraising_view.xml
index 8faba79,531d1f8..da92023
--- 1/addons/report_crm/report_crm_fundraising_view.xml
--- 2/addons/report_crm/report_crm_fundraising_view.xml
+++ b/addons/report_crm/report_crm_fundraising_view.xml
@@@ -61,7 -61,7 +61,7 @@@
              <field name="inherit_id" ref="view_crm_case_filter"/>
              <field name="type">search</field>
              <field name="arch" type="xml">
--                <field name="state" position="before">
++                <field name="user_id" position="before">
                 </field>
              </field>
          </record>

diff --cc addons/report_crm/report_crm_lead_view.xml
index a8ae776,a8ae776..97903e7
--- 1/addons/report_crm/report_crm_lead_view.xml
--- 2/addons/report_crm/report_crm_lead_view.xml
+++ b/addons/report_crm/report_crm_lead_view.xml
@@@ -55,7 -55,7 +55,7 @@@
              <field name="inherit_id" ref="view_crm_case_filter"/>
              <field name="type">search</field>
              <field name="arch" type="xml">
--                  <field name="state" position="before"/>
++                  <field name="user_id" position="before"/>
              </field>
          </record>
                

diff --cc addons/report_crm/report_crm_opportunity_view.xml
index 4efbba6,4efbba6..9b2712e
--- 1/addons/report_crm/report_crm_opportunity_view.xml
--- 2/addons/report_crm/report_crm_opportunity_view.xml
+++ b/addons/report_crm/report_crm_opportunity_view.xml
@@@ -61,7 -61,7 +61,7 @@@
              <field name="inherit_id" ref="view_crm_case_filter"/>
              <field name="type">search</field>
              <field name="arch" type="xml">
--                <field name="state" position="before">
++                <field name="user_id" position="before">
                 </field>
              </field>
          </record>

diff --cc addons/report_crm/report_crm_phonecall_view.xml
index c7bb87f,0dba483..27f9ced
--- 1/addons/report_crm/report_crm_phonecall_view.xml
--- 2/addons/report_crm/report_crm_phonecall_view.xml
+++ b/addons/report_crm/report_crm_phonecall_view.xml
@@@ -45,41 -48,48 +48,18 @@@
                      <field group="True" name="user_id"/>
                  </graph>
              </field>
--        </record>
++        </record> 
  
          <record id="view_crm_phonecall_filter" model="ir.ui.view">
              <field name="name">report.crm.phonecall.select</field>
              <field name="model">report.crm.phonecall</field>
++            <field name="inherit_id" ref="view_crm_case_filter"/>
              <field name="type">search</field>
              <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="Won" icon="terp-hr" domain="[('state','=','done')]"/>
-                                               <filter string="Lost" icon="terp-hr" domain="[('state','=','cancel')]"/>                                                
-                                               <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/>
-                   <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="Category" icon="terp-sale" domain="[]" context="{'group_by':'categ_id'}"/>
-                    </group>
-                </search>
-             
 -                                              <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')]"/>
 -                                              <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>                                              
 -                   </group>
 -                   <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>
 -            
++                <field name="user_id" position="before">
++               </field>
              </field>
--        </record>
++        </record>       
          
          <record id="action_report_crm_phonecall" model="ir.actions.act_window">
              <field name="name">Phone Calls</field>

diff --cc addons/report_crm/report_crm_view.xml
index 6e93f65,f2498a0..c55cf54
--- 1/addons/report_crm/report_crm_view.xml
--- 2/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@@ -53,20 -53,27 +53,26 @@@
              <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'))]"/>
++                        <separator orientation="vertical"/>   
                                                <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')]"/>                                                
-                                               <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"/>
+                                               <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="state" select="1"/>
++                </field>
                     </group>
                     <newline/>
                    <group expand="1" string="Group By..." colspan="4" col="8">