[MERGE] merged with openobject-addons

bzr revid: hmo@tinyerp.com-20100927104630-gexwg3tudfq3gly8

diff --cc addons/crm/crm_lead_view.xml
index 8238173,41d41ef..2df1369
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -325,7 -337,7 +340,8 @@@
                          help="Show Sales Team"/>
                  </field>
                  <newline/>
-                 <group  expand="0" string="Extended Filters..." groups="base.group_extended">
++
+                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                        <separator orientation="vertical"/>
@@@ -343,13 -355,18 +359,18 @@@
                      <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                      <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      <separator orientation="vertical"/>
-                     <filter string="Creation" icon="terp-go-month"
-                         domain="[]" context="{'group_by':'create_date'}" help="Create Date"/>
+                     <filter string="Category" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
+                     <filter string="Campaign" icon="terp-stock_symbol-selection"
+                         domain="[]" context="{'group_by':'type_id'}" />
+                     <filter string="Channel" icon="terp-stock_symbol-selection"
+                         domain="[]" context="{'group_by':'channel_id'}" />
+                     <separator orientation="vertical"/>
+                     <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
+                     <separator orientation="vertical"/>
 -                    <filter string="Creation" icon="terp-go-month"
++                    <filter string="Creation Month" icon="terp-go-month"
+                         domain="[]" context="{'group_by':'create_date'}" />
                  </group>
             </search>
          </field>

diff --cc addons/crm/report/crm_lead_report_view.xml
index 3826b5e,1939965..9966740
--- 1/addons/crm/report/crm_lead_report_view.xml
--- 2/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@@ -109,12 -110,24 +109,27 @@@
                          </field>
                     </group>
                     <newline/>
-                    <group  expand="1" string="Group By...">
-                         <filter string="Salesman" name="user" icon="terp-personal"
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                       <field name="partner_id"/>
+                       <separator orientation="vertical"/>
+                       <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
+                       <field name="categ_id" widget="selection"/>
+                       <field name="type_id" widget="selection"/>
+                       <field name="channel_id" widget="selection"/>
+                       <separator orientation="vertical"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <newline/>
+                       <field name="creation_date"/>
+                       <field name="opening_date"/>
+                       <field name="date_closed"/>
+                   </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                         <filter string="User" name="user" icon="terp-personal"
                              domain="[]" context="{'group_by':'user_id'}" />
 +                        <filter string="Sales Team" icon="terp-personal+"
 +                            domain="[]"
 +                            context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                          <separator orientation="vertical" />
@@@ -136,27 -153,12 +151,12 @@@
                              context="{'group_by':'company_id'}" />
                          <separator orientation="vertical" />
                          <filter string="Day" icon="terp-go-today"
 -                            domain="[]" context="{'group_by':'day'}"/>
 +                            domain="[]" context="{'group_by':'day'}" help="Day on which lead/opportunity is created"/>
                          <filter string="Month" icon="terp-go-month"
 -                            domain="[]" context="{'group_by':'month'}" />
 +                            domain="[]" context="{'group_by':'month'}" help="Month in which lead/opportunity is created"/>
                          <filter string="Year" icon="terp-go-year"
 -                            domain="[]" context="{'group_by':'name'}" />
 +                            domain="[]" context="{'group_by':'name'}" help="Year in which lead/opportunity is created"/>
                    </group>
-                   <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="partner_id"/>
-                       <separator orientation="vertical"/>
-                       <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" />
-                       <field name="categ_id" widget="selection"/>
-                       <field name="type_id" widget="selection"/>
-                       <field name="channel_id" widget="selection"/>
-                       <separator orientation="vertical"/>
-                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                       <newline/>
-                       <field name="creation_date"/>
-                       <field name="opening_date"/>
-                       <field name="date_closed"/>
-                   </group>
                 </search>
              </field>
          </record>

diff --cc addons/crm/report/crm_phonecall_report_view.xml
index 33d630e,8024ca7..8d8ee94
--- 1/addons/crm/report/crm_phonecall_report_view.xml
--- 2/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@@ -133,28 -143,15 +146,15 @@@
                          <separator orientation="vertical" />
                          <filter string="Company" icon="terp-go-home"
                              domain="[]"
--                            context="{'group_by':'company_id'}" />
++                            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 call"/>
                          <filter string="Month" icon="terp-go-month"
 -                            domain="[]" context="{'group_by':'month'}" />
 +                            domain="[]" context="{'group_by':'month'}" help="Month of call"/>
                          <filter string="Year" icon="terp-go-year"
 -                            domain="[]" context="{'group_by':'name'}" />
 +                            domain="[]" context="{'group_by':'name'}" help="Year of call"/>
                    </group>
- 
-                    <newline/>
-                    <group  expand="0" string="Extended Filters..."  groups="base.group_extended">
-                       <field name="partner_id"/>
-                         <separator orientation="vertical"/>
-                         <field string="Type" name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                         <separator orientation="vertical"/>
-                         <field name="company_id" groups="base.group_multi_company"/>
-                            <newline/>
-                         <field name="creation_date"/>
-                         <field name="opening_date"/>
-                         <field name="date_closed"/>
-                    </group>
                 </search>
              </field>
          </record>

diff --cc addons/crm_claim/report/crm_claim_report_view.xml
index cabf4ae,edb3dc2..db5973c
--- 1/addons/crm_claim/report/crm_claim_report_view.xml
--- 2/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@@ -123,64 -119,62 +123,61 @@@
                                        </field>
                     </group>
                     <newline/>
-                    <group  expand="0" string="Group By...">
-                         <filter string="Salesman" name="User" icon="terp-personal"
+                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                          <filter icon="terp-dialog-close"
+                             string="Done"
+                             domain="[('state','=','done')]"/>
+                         <filter icon="gtk-cancel"
+                             string="Cancel"
+                             domain="[('state','=','cancel')]"/>
+                         <group>
+                             <separator orientation="vertical"/>
+                             <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                             <separator orientation="vertical"/>
+                             <field name="priority" />
+                             <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+                         </group>
+                    </group>
+                    <newline/>
+                    <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>
-                    <newline/>
-                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                          <filter icon="terp-dialog-close"
-                               string="Done"
-                               domain="[('state','=','done')]"/>
--
-                       <filter icon="gtk-cancel"
-                               string="Cancel"
-                               domain="[('state','=','cancel')]"/>
-                       <separator orientation="vertical"/>
-                       <field name="partner_id"/>
-                       <separator orientation="vertical"/>
-                           <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                               <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                               <separator orientation="vertical"/>
-                               <field name="priority" />
-                               <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-                           <newline/>
-                         <field name="date_closed"/>
-                    </group>
                 </search>
              </field>
          </record>

diff --cc addons/crm_fundraising/report/crm_fundraising_report_view.xml
index fb82f4c,989b364..68cd856
--- 1/addons/crm_fundraising/report/crm_fundraising_report_view.xml
--- 2/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@@ -122,56 -118,50 +122,54 @@@
                                        </field>
                     </group>
                     <newline/>
-                    <group  expand="0" string="Group By...">
-                         <filter string="Salesman" name="User" icon="terp-personal"
+                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                          <filter icon="terp-dialog-close"
+                             string="Done"
+                             domain="[('state','=','done')]"/>
+ 
+                         <filter icon="gtk-cancel"
+                             string="Cancel"
+                             domain="[('state','=','cancel')]"/>
+ 
+                         <group>
+                             <separator orientation="vertical"/>
+                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
+                          </group>
+                    </group>
+                    <newline/>
+                    <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'}" />
 -
 -                        <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"
 +                         <filter string="State" icon="terp-stock_effects-object-colorize"
                              domain="[]" context="{'group_by':'state'}" />
 -
                          <filter string="Category" icon="terp-stock_symbol-selection"
                              domain="[]" context="{'group_by':'categ_id'}" />
 -
 +                        <filter string="Payment Mode" help="Payment Mode"
 +                            icon="terp-dolar" domain="[]"
 +                            context="{'group_by':'type_id'}" />
 +                        <separator orientation="vertical" />
 +                        <filter string="Company" icon="terp-go-home"
 +                            domain="[]"
 +                            context="{'group_by':'company_id'}" />
 +                            
                          <separator orientation="vertical" />
                          <filter string="Day" icon="terp-go-today"
 -                            domain="[]" context="{'group_by':'day'}"/>
 +                            domain="[]" context="{'group_by':'day'}"
 +                            help="Date of fundraising"/>
  
                          <filter string="Month" icon="terp-go-month"
 -                            domain="[]" context="{'group_by':'month'}" />
 +                            domain="[]" context="{'group_by':'month'}" 
 +                            help="Month of fundraising"/>
  
                          <filter string="Year" icon="terp-go-year"
-                             domain="[]" context="{'group_by':'name'}" 
-                             help="Year of fundraising"/>
- 
+                             domain="[]" context="{'group_by':'name'}" />
                    </group>
-                    <newline/>
-                    <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                          <filter icon="terp-dialog-close"
-                               string="Done"
-                               domain="[('state','=','done')]"/>
- 
-                       <filter icon="gtk-cancel"
-                               string="Cancel"
-                               domain="[('state','=','cancel')]"/>
- 
-                       <group>
-                                   <separator orientation="vertical"/>
-                                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
-                                    </group>
-                    </group>
                 </search>
              </field>
          </record>

diff --cc addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 836aa1d,1d49410..8bb5307
--- 1/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
--- 2/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@@ -112,57 -109,44 +112,50 @@@
                          context="{'invisible_section': False}"
                          domain="[('section_id.user_id.company_id','=',uid)]"
                          help="My company"/>
 -
                          </field>
 -                         <field name="user_id" widget="selection"/>
 +                         <field name="user_id" string="Salesman">
 +                         <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
 +                         </field>
                     </group>
                     <newline/>
-                   <group expand="0" string="Group By...">
-                         <filter string="Salesman" icon="terp-personal"
+                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
+                         <filter string="Priority" icon="terp-rating-rated"
+                             domain="[]" context="{'group_by':'priority'}" />
+                    </group>
+                    <newline/>
+                    <group expand="1" string="Group By...">
+                         <filter string="User" icon="terp-personal"
                              domain="[]" context="{'group_by':'user_id'}"
                              default="1" />
 -
 -                        <filter string="Company" icon="terp-go-home"
 -                            domain="[]"
 -                            context="{'group_by':'company_id'}" />
 -
 -                        <filter string="Section" icon="terp-personal+"
 +                        <filter string="Sales Team" icon="terp-personal+"
                              domain="[]"
                              context="{'group_by':'section_id'}" />
 -
 +                        <filter string="Partner" icon="terp-personal"
 +                            domain="[]"
 +                            context="{'group_by':'partner_id'}" />
 +                            
 +                        <separator orientation="vertical" />
 +                        <filter string="Channel" icon="terp-call-start"
 +                            domain="[]"
 +                            context="{'group_by':'canal_id'}" />
 +                            
                          <separator orientation="vertical" />
                          <filter string="State" icon="terp-stock_effects-object-colorize"
                              domain="[]" context="{'group_by':'state'}" />
 -
 -                        <filter string="Partner" icon="terp-personal"
 +                       
 +                        <separator orientation="vertical" />
 +                        <filter string="Company" icon="terp-go-home" 
                              domain="[]"
 -                            context="{'group_by':'partner_id'}" />
 -
 +                            context="{'group_by':'company_id'}" />
 +                            
                          <separator orientation="vertical" />
 +                        <filter string="Day" icon="terp-go-today"
 +                            domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
                          <filter string="Month" icon="terp-go-month"
 -                            domain="[]" context="{'group_by':'month'}" />
 -
 +                            domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
                          <filter string="Year" icon="terp-go-year"
 -                            domain="[]" context="{'group_by':'name'}" />
 +                            domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
- 
                    </group>
-                     <newline/>
-                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                         <separator orientation="vertical"/>
-                         <field name="categ_id" domain="[('object_id.model', '=', 'crm.helpdesk')]"/>
-                         <field name="priority"/>
-                         <newline/>
-                         <field name="date_closed"/>
-                    </group>
- 
- 
                 </search>
              </field>
          </record>

diff --cc addons/project/report/project_report_view.xml
index 5218a96,f269399..1ae5adc
--- 1/addons/project/report/project_report_view.xml
--- 2/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@@ -107,31 -107,32 +107,32 @@@
                        <field name="partner_id" />
                      </group>
                      <newline/>
+                     <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                         <field name="type_id" widget="selection"/>
+                         <separator orientation="vertical"/>
+                         <field name="date_start"/>
+                         <field name="date_deadline"/>
+                         <field name="date_end"/>
+                         <separator orientation="vertical"/>
+                         <field name="priority"/>
+                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                     </group>
+                     <newline/>
                      <group expand="1" string="Group By..." colspan="10" col="12">
                          <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
 -                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
 -                        <separator orientation="vertical"/>
 -                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                          <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                          <separator orientation="vertical"/>
 +                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
 +                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
 +                        <separator orientation="vertical"/>
                          <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                          <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                          <filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                          <separator orientation="vertical"/>
 -                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
 -                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
 -                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 +                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Current Day"/>
 +                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Current Month"/>
 +                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Current Year"/>
                      </group>
-                     <newline/>
-                       <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-                               <field name="priority" string="Priority"/>
-                           <field name="type_id" widget="selection"/>
-                           <newline/>
-                         <field name="date_start"/>
-                         <field name="date_end"/>
-                         <field name="date_deadline"/>
-                           <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                     </group>
                  </search>
              </field>
          </record>

diff --cc addons/project_issue/report/project_issue_report_view.xml
index 0f4a4a6,9ceded3..5ddfd1e
--- 1/addons/project_issue/report/project_issue_report_view.xml
--- 2/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@@ -93,8 -90,28 +93,25 @@@
                                <field name="user_id"  select="1" widget="selection"/>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+                        <field name="partner_id"/>
+                        <field name="assigned_to" widget="selection"/>
+                        <separator orientation="vertical"/>
+                        <field name="priority" />
+                        <separator orientation="vertical"/>
+                        <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
+                        <separator orientation="vertical"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        <newline/>
+                        <field name="creation_date"/>
+                        <field name="opening_date"/>
+                        <field name="date_closed" string="Date Closed"/>
+                    </group>
+                    <newline/>
                     <group  expand="1" string="Group By..." colspan="4" col="8">
 -                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
 -                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
 -                        <separator orientation="vertical" />
 -                        <filter name="User" string="Responsible" icon="terp-personal"
 +                              <filter name="User" string="Responsible" icon="terp-personal"
                          domain="[]" context="{'group_by':'user_id'}" />
                          <filter string="Assigned to" name="Responsible" icon="terp-personal"
                          domain="[]" context="{'group_by':'assigned_to'}" />
@@@ -119,34 -134,19 +136,17 @@@
                          <filter string="Company" icon="terp-go-home"
                                domain="[]"
                                context="{'group_by':'company_id'}" />
 -
                          <separator orientation="vertical" />
                          <filter string="Day" icon="terp-go-today"
 -                              domain="[]" context="{'group_by':'day'}"/>
 +                              domain="[]" context="{'group_by':'day'}" help="Current Day"/>
  
                          <filter string="Month" icon="terp-go-month"
 -                              domain="[]" context="{'group_by':'month'}" />
 +                              domain="[]" context="{'group_by':'month'}" help="Current Month"/>
  
                          <filter string="Year" icon="terp-go-year"
 -                              domain="[]" context="{'group_by':'name'}" />
 +                              domain="[]" context="{'group_by':'name'}" help="Current Year"/>
  
                    </group>
-                    <newline/>
-                    <group  expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
-                               <field name="partner_id"/>
-                               <field name="assigned_to" widget="selection"/>
-                               <separator orientation="vertical"/>
-                               <field name="priority" />
-                               <separator orientation="vertical"/>
-                               <field name="type_id" widget="selection"/>
-                               <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                               <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
-                               <separator orientation="vertical"/>
-                               <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                               <newline/>
-                             <field name="creation_date"/>
-                             <field name="opening_date"/>
-                             <field name="date_closed" string="Date Closed"/>
-                         </group>
 -
                 </search>
              </field>
          </record>

diff --cc addons/sale/report/sale_report_view.xml
index f8076b0,f1ff0e1..d796edd
--- 1/addons/sale/report/sale_report_view.xml
--- 2/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@@ -100,19 -108,10 +109,10 @@@
                      <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                      <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                      <separator orientation="vertical"/>
 -                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
 -                    <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
 -                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
 +                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
 +                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
 +                   <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
                  </group>
-                 <newline/>
-                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                     <field name="shop_id"/>
-                     <field name="categ_id" widget="selection"/>
-                     <field name="company_id" groups="base.group_multi_company"/>
-                     <newline/>
-                     <field name="date"/>
-                     <field name="date_confirm"/>
-                 </group>
              </search>
          </field>
      </record>

diff --cc addons/sale/sale.py
Simple merge