[MERGE] merged refactoring of superfluous "My ..." buttons in search views
authorRvo(Open ERP) <>
Wed, 19 May 2010 13:45:31 +0000 (15:45 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 19 May 2010 13:45:31 +0000 (15:45 +0200)
bzr revid: odo@openerp.com-20100519134531-eb6ki0snr5e0xr41

27 files changed:
1  2 
addons/account/project/project_view.xml
addons/crm/crm_lead_menu.xml
addons/crm/crm_lead_view.xml
addons/crm/crm_meeting_menu.xml
addons/crm/crm_meeting_view.xml
addons/crm/crm_opportunity_menu.xml
addons/crm/crm_opportunity_view.xml
addons/crm/crm_phonecall_menu.xml
addons/crm/crm_phonecall_view.xml
addons/crm/crm_view.xml
addons/crm_claim/crm_claim_menu.xml
addons/crm_claim/crm_claim_view.xml
addons/crm_fundraising/crm_fundraising_menu.xml
addons/crm_fundraising/crm_fundraising_view.xml
addons/crm_helpdesk/crm_helpdesk_menu.xml
addons/crm_helpdesk/crm_helpdesk_view.xml
addons/hr_expense/hr_expense_view.xml
addons/hr_holidays/report/hr_holidays_report_view.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/hr_recruitment/report/hr_recruitment_report_view.xml
addons/idea/idea_view.xml
addons/project/project_view.xml
addons/project_issue/project_issue_view.xml
addons/project_issue/report/project_issue_report_view.xml
addons/project_planning/project_planning_view.xml
addons/resource/resource_view.xml
addons/scrum/scrum_view.xml

@@@ -6,12 -6,10 +6,12 @@@
          <field name="name">Leads</field>
          <field name="res_model">crm.lead</field>
          <field name="view_mode">tree,form</field>
 +        <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
          <field name="view_id" ref="crm_case_tree_view_leads"/>
 -        <field name="context">{"search_default_user_id":uid}</field>
++        <field name="context">{"search_default_user_id":uid,'search_default_current':1}</field>
          <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-         <field name="context">{'search_default_current':1}</field>
      </record>
 +
      <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
          <field name="sequence" eval="1"/>
          <field name="view_mode">tree</field>
Simple merge
          <field name="res_model">crm.meeting</field>
          <field name="view_mode">calendar,tree,form,gantt</field>
          <field name="view_id" ref="crm_case_calendar_view_meet"/>
-         <field name="context">{'search_default_current':1}</field>
 -        <field name="context">{"search_default_user_id":uid}</field>
++        <field name="context">{'search_default_current':1,"search_default_user_id":uid}</field>
          <field name="search_view_id" ref="view_crm_case_meetings_filter"/>
      </record>
 +
      <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
          <field name="sequence" eval="1"/>
          <field name="view_mode">calendar</field>
          <field name="arch" type="xml">
                  <search string="Search Meetings">
                         <group col="12" colspan="4">
-                                       <filter icon="terp-project" name="current" string="Current"
-                                  domain="[('state','in',('draft', 'open'))]"
-                                  help="Current Meetings"/>
-                            <filter icon="terp-partner" string="My Meetings"
-                                domain="[('user_id','=',uid)]"
-                                help="My Meetings" />
 -                           <filter icon="terp-crm" name="current" string="Current"
 -                           domain="[('state','in',('draft', 'open'))]"
 -                           help="Current Meetings"/>
++                           <filter icon="terp-project" name="current" string="Current"
++                                domain="[('state','in',('draft', 'open'))]"
++                                help="Current Meetings"/>
                             <separator orientation="vertical"/>
                             <field name="name" select="1" string="Subject"/>
                             <field name="partner_id" select="1" />
-                            <field name="section_id"
-                                select="1" widget="selection">
-                                <filter icon="terp-crm"
-                                    domain="[('section_id','=',context.get('section_id',False))]"
-                                    help="My section" />
-                            </field>
+                            <field name="section_id" select="1" widget="selection">
+                            <filter icon="terp-crm"
+                                domain="[('section_id','=',context.get('section_id',False))]"
+                                help="My section" />
+                                  </field>
                             <field name="user_id" select="1" widget="selection"/>
                         </group>
 +                       <newline/>
 +                                              <group expand="0" string="Group By..." colspan="16">
 +                                                      <filter string="Date" icon="terp-project"
 +                                                      domain="[]" context="{'group_by':'date'}" />
 +                                                  <filter string="Privacy" icon="terp-crm"
 +                                                      domain="[]" context="{'group_by':'class'}" />
 +                                                  <separator orientation="vertical" />
 +                                                  <filter string="Responsible" icon="terp-crm" domain="[]"
 +                                                      context="{'group_by':'user_id'}" />
 +                                                  <filter string="Partner" icon="terp-partner" domain="[]"
 +                                                      context="{'group_by':'partner_id'}" />
 +                                                  <separator orientation="vertical" />
 +                                                  <filter string="State" icon="terp-crm" domain="[]"
 +                                                      context="{'group_by':'state'}" />
 +                                                  <separator orientation="vertical" />
 +                                              </group>
                  </search>
              </field>
          </record>
  
       <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
            <field name="name">Opportunities</field>
 -          <field name="res_model">crm.opportunity</field>
 +          <field name="res_model">crm.lead</field>
            <field name="view_mode">tree,form,graph</field>
 +          <field name="domain">[('type','=','opportunity')]</field>
 +          <field name="context">{'search_default_current':1}</field>
            <field name="view_id" ref="crm_case_tree_view_oppor"/>
+           <field name="context">{"search_default_user_id":uid}</field>
            <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
       </record>
 +
       <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
            <field name="sequence" eval="1"/>
            <field name="view_mode">tree</field>
                  <field name="section_id"
                      default="context.get('section_id', False)" select="1"
                      widget="selection">
-                     <filter icon="terp-crm"
-                         domain="[('section_id','=',context.get('section_id',False))]"
-                         help="My section" />
-                 </field>
+                       <filter icon="terp-crm"
+                               domain="[('section_id','=',context.get('section_id',False))]"
+                               help="My section" />
+                       </field>
                  <newline/>
 -                <group expand="1" string="Group By..." colspan="16">
 +                <group expand="0" string="Group By..." colspan="16">
                      <filter string="Stage" icon="terp-crm" domain="[]"
                          context="{'group_by':'stage_id'}" />
                      <filter string="Priority" icon="terp-crm" domain="[]"
Simple merge
                 </field>
                 <field name="section_id"
                     select="1" widget="selection" string="Sales Team">
-                    <filter icon="terp-crm"
-                        domain="[('section_id','=',context.get('section_id',False))]"
-                        help="My section" />
-                </field>
+                                       <filter icon="terp-crm"
+                         domain="[('section_id','=',context.get('section_id',False))]"
+                         help="My section" />
+                 </field>
                 <newline/>
 -               <group expand="1" string="Group By..." colspan="4">
 +               <group expand="0" string="Group By..." colspan="4">
                     <filter string="Partner" icon="terp-crm" domain="[]"
                         context="{'group_by':'partner_id'}" />
                     <filter string="Responsible" icon="terp-crm"
  
          <record id="crm_case_categ0-act" model="ir.actions.act_window">
              <field name="name">Cases</field>
 -            <field name="res_model">crm.case</field>
 +            <field name="res_model">mailgate.thread</field>
              <field name="view_type">form</field>
              <field name="view_id" ref="crm_case_tree-view"/>
+             <field name="context">{"search_default_user_id":uid}</field>
              <field name="search_view_id" ref="view_crm_case_filter"/>
          </record>
  
index b0d1749,0000000..7fb1c08
mode 100644,000000..100644
--- /dev/null
@@@ -1,53 -1,0 +1,53 @@@
 +<?xml version="1.0"?>
 +<openerp>
 +    <data noupdate="1">
 +
 +        <menuitem id="base.menu_aftersale" name="After-Sale Services"
 +            groups="base.group_extended"
 +            parent="base.menu_base_partner" sequence="6" />
 +
 +        <!-- Claims Menu -->
 +
 +        <record model="ir.actions.act_window" id="crm_case_categ_claim0">
 +            <field name="name">Claims</field>
 +            <field name="res_model">crm.claim</field>
 +            <field name="view_type">form</field>
 +            <field name="view_mode">tree,calendar,form,graph</field>
 +            <field name="view_id" ref="crm_case_claims_tree_view"/>
-             <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>
++            <field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_user_id":uid}</field>
 +            <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
 +        </record>
 +
 +        <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
 +            <field name="sequence" eval="1"/>
 +            <field name="view_mode">tree</field>
 +            <field name="view_id" ref="crm_case_claims_tree_view"/>
 +            <field name="act_window_id" ref="crm_case_categ_claim0"/>
 +        </record>
 +
 +        <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_claim0">
 +            <field name="sequence" eval="2"/>
 +            <field name="view_mode">calendar</field>
 +            <field name="view_id" ref="crm_case_claims_calendar_view"/>
 +            <field name="act_window_id" ref="crm_case_categ_claim0"/>
 +        </record>
 +
 +        <record model="ir.actions.act_window.view" id="action_crm_tag_form_claim0">
 +            <field name="sequence" eval="3"/>
 +            <field name="view_mode">form</field>
 +            <field name="view_id" ref="crm_case_claims_form_view"/>
 +            <field name="act_window_id" ref="crm_case_categ_claim0"/>
 +        </record>
 +
 +        <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
 +            <field name="sequence" eval="4"/>
 +            <field name="view_mode">graph</field>
 +            <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
 +            <field name="act_window_id" ref="crm_case_categ_claim0"/>
 +        </record>
 +
 +        <menuitem name="Claims" id="menu_crm_case_claims"
 +            parent="base.menu_aftersale" action="crm_case_categ_claim0" />
 +
 +    </data>
 +</openerp>
index 4228096,0000000..7a3dd4c
mode 100644,000000..100644
--- /dev/null
@@@ -1,295 -1,0 +1,287 @@@
 +<?xml version="1.0"?>
 +<openerp>
 +    <data>
 +
 +    <!-- Claims categories  -->
 +
 +    <record id="crm_claim_categ_action" model="ir.actions.act_window">
 +        <field name="name">Claim Categories</field>
 +        <field name="res_model">crm.case.categ</field>
 +        <field name="view_type">form</field>
 +        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
 +        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
 +        <field name="context">{'object_id':'crm.claim'}</field>
 +    </record>
 +
 +    <menuitem action="crm_claim_categ_action"
 +        id="menu_crm_case_claim-act" parent="crm.menu_crm_case_categ" />
 +
 +    <!-- Claim Stages -->
 +
 +    <record id="crm_claim_stage_act" model="ir.actions.act_window">
 +        <field name="name">Claim Stages</field>
 +        <field name="res_model">crm.case.stage</field>
 +        <field name="view_type">form</field>
 +        <field name="view_id" ref="crm.crm_case_stage_tree"/>
 +        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
 +        <field name="context">{'object_id':'crm.claim'}</field>
 +    </record>
 +
 +    <menuitem action="crm_claim_stage_act"
 +            id="menu_crm_claim_stage_act" parent="crm.menu_crm_case_stage" />
 +
 +    <!-- Claim Resource Type -->
 +
 +    <record id="crm_claim_resource_act" model="ir.actions.act_window">
 +        <field name="name">Claim Resource Type</field>
 +        <field name="res_model">crm.case.resource.type</field>
 +        <field name="view_type">form</field>
 +        <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
 +        <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
 +        <field name="context">{'object_id':'crm.claim'}</field>
 +    </record>
 +
 +    <menuitem action="crm_claim_resource_act"
 +            id="menu_crm_claim_stage_act"
 +            parent="crm.menu_crm_case_resource_type" />
 +
 +        <!-- Claims    -->
 +
 +    <record model="ir.ui.view" id="crm_case_claims_tree_view">
 +        <field name="name">CRM - Claims Tree</field>
 +        <field name="model">crm.claim</field>
 +        <field name="type">tree</field>
 +        <field name="arch" type="xml">
 +            <tree string="Claims" colors="blue:state=='pending';black:state=='open';grey:state in ('close', 'cancel')">
 +                <field name="id"/>
 +                <field name="name"/>
 +                <field name="partner_id"/>
 +                <field name="user_id" />
 +                <field name="section_id"/>
 +                <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"/>
 +                <button name="case_open" string="Open"
 +                    states="draft,pending" type="object"
 +                    icon="gtk-go-forward" />
 +                <button name="case_pending" string="Pending"
 +                    states="draft,open" type="object"
 +                    icon="gtk-media-pause" />
 +                <button name="case_close" string="Close"
 +                    states="open,draft,pending" type="object"
 +                    icon="gtk-close" />
 +                <button name="case_cancel" string="Cancel"
 +                    states="draft,open,pending" type="object"
 +                    icon="gtk-cancel" />
 +                <button name="case_reset" string="Reset to Draft"
 +                    states="done,cancel" type="object" icon="gtk-convert" />
 +            </tree>
 +        </field>
 +    </record>
 +
 +    <record model="ir.ui.view" id="crm_case_claims_form_view">
 +        <field name="name">CRM - Claims Form</field>
 +        <field name="model">crm.claim</field>
 +        <field name="type">form</field>
 +        <field name="arch" type="xml">
 +            <form string="Claims">
 +                <group colspan="4" col="4">
 +                    <field name="name"/>
 +                    <field name="date" string="Date of Claim"/>
 +                    <field name="date_deadline" string="Deadline"/>
 +                </group>
 +                <group colspan="4" col="4">
 +
 +                <notebook>
 +                <page string="Claim Info">
 +                    <separator colspan="4" string="Communication"/>
 +                    <group colspan="4" col="4">
 +                        <field name="partner_id" string="Partner"
 +                            on_change="onchange_partner_id(partner_id)" />
 +                        <field name="partner_address_id" string="Contact"
 +                            on_change="onchange_partner_address_id(partner_address_id, email_from)" />
 +                        <field name="partner_phone"/>
 +                        <field name="partner_mobile"/>
 +                        <field name="email_from"/>
 +                    </group>
 +                    <separator colspan="4" string="Status and Categorization"/>
 +                    <group colspan="4" col="6">
 +                        <field name="user_id" string="Responsible"/>
 +                        <field name="section_id" widget="selection"/>
 +                        <label string="Stage: " align="1.0"/>
 +                        <group colspan="1" col="2">
 +                            <field name="stage_id" select="1" nolabel="1"/>
 +                            <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
 +                        </group>
 +                        <field name="categ_id" select="1" widget="selection"
 +                            domain="[('object_id.model', '=', 'crm.claim')]" />
 +                        <field name="type_id" string="Type of Action" select="1"
 +                            domain="[('object_id.model', '=', 'crm.claim')]" />
 +                        <field name="priority"/>
 +                    </group>
 +                    <separator colspan="4" string="References"/>
 +                    <group colspan="4" col="4">
 +                        <field name="ref"/>
 +                        <field name="ref2"/>
 +                    </group>
 +                    <separator colspan="4" string="Claim/Action Description"/>
 +                    <field name="description" colspan="4" nolabel="1"/>
 +                    <separator colspan="4" string=""/>
 +                    <group col="8" colspan="4">
 +                        <field name="state" select="1"/>
 +                        <button name="case_close" string="Done"
 +                            states="open,draft,pending" type="object"
 +                            icon="gtk-jump-to" />
 +                        <button name="case_open" string="Open"
 +                            states="draft,pending" type="object"
 +                            icon="gtk-go-forward" />
 +                        <button name="case_cancel" string="Cancel"
 +                            states="draft,open,pending" type="object"
 +                            icon="gtk-cancel" />
 +                        <button name="case_pending" string="Pending"
 +                            states="draft,open" type="object"
 +                            icon="gtk-media-pause" />
 +                        <button name="case_reset"
 +                            string="Reset to Draft" states="done,cancel"
 +                            type="object" icon="gtk-convert" />
 +                    </group>
 +                </page>
 +                <page string="History" groups="base.group_extended">
 +                    <field name="id" select="1"/>
 +                    <field name="active"/>
 +                    <field name="canal_id"/>
 +                    <field name="som"/>
 +                    <separator colspan="4" string="Dates"/>
 +                    <field name="create_date"/>
 +                    <field name="date_closed"/>
 +                    <field name="log_ids" nolabel="1" colspan="4">
 +                        <tree string="Logs">
 +                            <field name="name" colspan="4"/>
 +                            <field name="date"/>
 +                            <field name="user_id"/>
 +                        </tree>
 +                        <form string="Logs">
 +                            <separator string="Action Information" colspan="4"/>
 +                            <field name="name" colspan="4"/>
 +                            <field name="date"/>
 +                            <field name="user_id"/>
 +                        </form>
 +                    </field>
 +                </page>
 +                <page string="Emails" groups="base.group_extended">
 +                   <group colspan="4">
 +                       <field colspan="4" name="email_cc" string="CC"/>
 +                   </group>
 +                    <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
 +                        <form string="Communication history">
 +                            <group col="6" colspan="4">
 +                                <field name="date"/>
 +                                <field name="email_to"/>
 +                                <field name="email_from"/>
 +                                                      </group>
 +                                   <newline/>
 +                                   <field name="description" colspan="4" nolabel="1"/>
 +                                   <button colspan="4"
 +                                       string="Reply to Last Email"
 +                                       name="%(crm.action_crm_send_mail)d"
 +                                       context="{'mail':'reply', 'model': 'crm.claim'}"
 +                                       icon="gtk-undo" type="action" />
 +                               </form>
 +                               <tree string="Communication history">
 +                                   <field name="description"/>
 +                                   <field name="email_to"/>
 +                                   <field name="date"/>
 +                               </tree>
 +                           </field>
 +                           <button colspan="4" string="Send New Email"
 +                               name="%(crm.action_crm_send_mail)d"
 +                               context="{'mail':'new', 'model': 'crm.claim'}"
 +                               icon="gtk-go-forward" type="action" />
 +                 </page>
 +                </notebook>
 +
 +                </group>
 +            </form>
 +        </field>
 +    </record>
 +
 +    <!-- Claim Calendar view -->
 +
 +    <record model="ir.ui.view" id="crm_case_claims_calendar_view">
 +        <field name="name">CRM - Claims Calendar</field>
 +        <field name="model">crm.claim</field>
 +        <field name="type">calendar</field>
 +        <field name="priority" eval="2"/>
 +        <field name="arch" type="xml">
 +            <calendar string="Claims" date_start="date" color="user_id">
 +                <field name="name"/>
 +                <field name="partner_name"/>
 +                <field name="categ_id"/>
 +            </calendar>
 +        </field>
 +    </record>
 +
 +    <!-- Claim Graph view -->
 +
 +    <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
 +        <field name="name">CRM -Graph</field>
 +        <field name="model">crm.claim</field>
 +        <field name="type">graph</field>
 +        <field name="arch" type="xml">
 +            <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
 +                <field name="stage_id"/>
 +                <field name="planned_cost" operator="+"/>
 +                <field name="planned_revenue" operator="+"/>
 +            </graph>
 +        </field>
 +    </record>
 +
 +    <!-- Crm claim Search view -->
 +
 +    <record id="view_crm_case_claims_filter" model="ir.ui.view">
 +            <field name="name">CRM - Claims Search</field>
 +            <field name="model">crm.claim</field>
 +            <field name="type">search</field>
 +            <field name="arch" type="xml">
 +                <search string="Search Claims">
-                    <filter icon="gtk-new" string="Current"
-                        domain="[('state','in',('draft', 'open'))]" name="current"
++                   <filter icon="gtk-new" string="Current" name="current"
++                       domain="[('state','in',('draft', 'open'))]"
 +                       separator="1" help="Current Claims" default="1"
 +                   />
 +                   <filter icon="gtk-execute"
 +                       string="In Progress"
 +                       domain="[('state','=','open')]"
 +                       separator="1" help="In Progress Claims"
 +                   />
 +                   <filter icon="gtk-media-pause"
 +                       string="Pending"
 +                       domain="[('state','=','pending')]"
 +                       separator="1" help="All pending Claims"
 +                   />
 +                   <separator orientation="vertical"/>
 +                   <field name="name" select='1'/>
 +                   <field name="partner_id" select="1"/>
 +                   <field name="user_id" select="1" widget="selection">
 +                           <filter icon="terp-partner"
-                                domain="[('user_id','=',uid)]" help="My Claims"
-                                default="1" />
-                            <filter icon="terp-partner"
 +                               domain="[('user_id','=', False)]"
 +                               help="Unassigned Claims" />
 +                   </field>
 +                   <field name="section_id" select="1"
-                        widget="selection"
-                        default="context.get('section_id', False)">
-                        <filter icon="terp-crm"
-                            domain="[('section_id','=',context.get('section_id',False))]"
-                            help="My section" />
-                    </field>
++                       widget="selection"/>
 +                   <newline/>
 +                   <group expand="0" string="Group By..." colspan="10" col="20">
 +                       <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>
 +           </field>
 +        </record>
 +
 +     </data>
 +</openerp>
index 9a8d6de,0000000..e681594
mode 100644,000000..100644
--- /dev/null
@@@ -1,46 -1,0 +1,46 @@@
 +<?xml version="1.0"?>
 +<openerp>
 +<data noupdate="1">
 +
 +<!-- MENU -->
 +
 +    <menuitem id="base.menu_fundrising" name="Fund Raising"
 +        groups="base.group_extended"
 +        parent="base.menu_base_partner" sequence="7" />
 +
 +    <record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
 +        <field name="name">Funds</field>
 +        <field name="res_model">crm.fundraising</field>
 +        <field name="view_mode">tree,form,graph</field>
-         <field name="context">{"search_default_current":1}</field>
 +        <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
++        <field name="context">{"search_default_user_id":uid,"search_default_current":1}</field>
 +        <field name="search_view_id" ref="crm_fundraising.view_crm_case_fund_filter"/>
 +    </record>
 +
 +    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
 +        <field name="sequence" eval="1"/>
 +        <field name="view_mode">tree</field>
 +        <field name="view_id" ref="crm_fundraising.crm_case_tree_view_fund"/>
 +        <field name="act_window_id" ref="crm_fundraising.crm_case_category_act_fund_all1"/>
 +    </record>
 +
 +    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
 +        <field name="sequence" eval="2"/>
 +        <field name="view_mode">form</field>
 +        <field name="view_id" ref="crm_fundraising.crm_case_form_view_fund"/>
 +        <field name="act_window_id" ref="crm_fundraising.crm_case_category_act_fund_all1"/>
 +    </record>
 +
 +    <record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all1">
 +        <field name="sequence" eval="3"/>
 +        <field name="view_mode">graph</field>
 +        <field name="view_id" ref="crm_fundraising.crm_case_graph_view_fund"/>
 +        <field name="act_window_id" ref="crm_fundraising.crm_case_category_act_fund_all1"/>
 +    </record>
 +
 +    <menuitem name="Fund Raising" id="menu_crm_case_fund_raise"
 +      parent="base.menu_fundrising"
 +      action="crm_case_category_act_fund_all1" sequence="1" />
 +
 +</data>
 +</openerp>
index 9a2b3b4,0000000..68fcd76
mode 100644,000000..100644
--- /dev/null
@@@ -1,311 -1,0 +1,303 @@@
 +<?xml version="1.0"?>
 +<openerp>
 +    <data>
 +
 +        <!-- Fund Raising Categories Form View -->
 +
 +        <record id="crm_fund_categ_action" model="ir.actions.act_window">
 +            <field name="name">Fundraising Categories</field>
 +            <field name="res_model">crm.case.categ</field>
 +            <field name="view_type">form</field>
 +            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
 +            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
 +            <field name="context">{'object_id':'crm.fundraising'}</field>
 +        </record>
 +
 +        <menuitem action="crm_fund_categ_action"
 +            id="menu_crm_case_fundraising-act" groups="base.group_extended"
 +            parent="crm.menu_crm_case_categ" />
 +
 +        <!-- Fund Stage Form View -->
 +
 +        <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
 +            <field name="name">Fundraising Stages</field>
 +            <field name="res_model">crm.case.stage</field>
 +            <field name="view_type">form</field>
 +            <field name="view_id" ref="crm.crm_case_stage_tree"/>
 +            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
 +            <field name="context">{'object_id':'crm.fundraising'}</field>
 +        </record>
 +
 +        <menuitem action="crm_fundraising_stage_act"
 +            groups="base.group_extended"
 +            id="menu_crm_fundraising_stage_act"
 +            parent="crm.menu_crm_case_stage" />
 +
 +        <!-- Fund Resource Type Form View -->
 +
 +        <record id="crm_fundraising_resource_act" model="ir.actions.act_window">
 +            <field name="name">Fundraising Resource Type</field>
 +            <field name="res_model">crm.case.resource.type</field>
 +            <field name="view_type">form</field>
 +            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
 +            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
 +            <field name="context">{'object_id':'crm.fundraising'}</field>
 +        </record>
 +
 +        <menuitem action="crm_fundraising_resource_act"
 +            groups="base.group_extended"
 +            id="menu_crm_fundraising_resource_act"
 +            parent="crm.menu_crm_case_resource_type" />
 +
 +
 +        <!-- Fund Raising Tree View -->
 +
 +        <record model="ir.ui.view" id="crm_case_tree_view_fund">
 +            <field name="name">CRM - Funds Tree</field>
 +            <field name="model">crm.fundraising</field>
 +            <field name="type">tree</field>
 +            <field name="arch" type="xml">
 +                <tree string="Funds Tree"
 +                    colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
 +                    <field name="name" string="Fund Description" />
 +                    <field name="categ_id" />
 +                    <field name="type_id" string="Payment Mode" />
 +                    <field name="planned_cost" string="Amount" />
 +                    <field name="probability" />
 +                    <field name="user_id" />
 +                    <field name="state" />
 +                    <field name="partner_id" invisible="1"/>
 +                    <button name="case_close" string="Done"
 +                        states="open,draft,pending" type="object"
 +                        icon="gtk-close" />
 +                    <button name="case_open" string="Open"
 +                        states="draft,pending" type="object"
 +                        icon="gtk-go-forward" />
 +                    <button name="case_cancel" string="Cancel"
 +                        states="draft,open,pending" type="object"
 +                        icon="gtk-cancel" />
 +                    <button name="case_pending" string="Pending"
 +                        states="draft,open" type="object" icon="gtk-media-pause" />
 +                    <button name="case_escalate" string="Escalate"
 +                        states="open,draft,pending" type="object"
 +                        groups="base.group_extended"
 +                        icon="gtk-go-up" />
 +                    <button name="case_reset" string="Reset to Draft"
 +                        states="done,cancel" type="object" icon="gtk-convert" />
 +                </tree>
 +            </field>
 +        </record>
 +
 +        <!-- Fund Raising Form View -->
 +
 +        <record model="ir.ui.view" id="crm_case_form_view_fund">
 +            <field name="name">CRM - Funds Form</field>
 +            <field name="model">crm.fundraising</field>
 +            <field name="type">form</field>
 +            <field name="arch" type="xml">
 +                <form string="Funds Form">
 +                    <group colspan="4" col="6">
 +                        <field name="name" select="1" string="Name"/>
 +                        <field name="section_id" colspan="1" widget="selection"/>
 +                        <field name="user_id" string="Responsible"/>
 +                        <field name="date"/>
 +                        <field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
 +                        <field name="type_id" string="Payment Mode" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
 +                    </group>
 +                    <notebook colspan="4">
 +                        <page string="Funds">
 +                            <group colspan="2" col="2">
 +                                <separator colspan="4" string="Communication"/>
 +                                <field name="partner_id" select="1"
 +                                    on_change="onchange_partner_id(partner_id, email_from)"
 +                                    colspan="2" />
 +                                <field name="partner_address_id"
 +                                    string="Contact"
 +                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
 +                                    colspan="1" />
 +                                <field name="email_from" colspan="2"/>
 +                            </group>
 +                            <group colspan="2" col="2">
 +                                <separator colspan="4" string="Estimates"/>
 +                                <field name="planned_cost"/>
 +                                <field name="planned_revenue"/>
 +                                <field name="probability"/>
 +                            </group>
 +                            <separator colspan="4" string="Notes"/>
 +                                <field name="description" nolabel="1" colspan="4"/>
 +                            <separator colspan="4"/>
 +                            <group col="8" colspan="4">
 +                                <field name="state"/>
 +                                <button name="case_close" string="Done"
 +                                    states="open,draft,pending" type="object"
 +                                    icon="gtk-close" />
 +                                <button name="case_open" string="Open"
 +                                    states="draft,pending" type="object"
 +                                    icon="gtk-go-forward" />
 +                                <button name="case_cancel" string="Cancel"
 +                                    states="draft,open,pending" type="object"
 +                                    icon="gtk-cancel" />
 +                                <button name="case_pending" string="Pending"
 +                                    states="draft,open" type="object"
 +                                    icon="gtk-media-pause" />
 +                                <button name="case_escalate" string="Escalate"
 +                                    states="open,draft,pending" type="object"
 +                                    groups="base.group_extended"
 +                                    icon="gtk-go-up" />
 +                                <button name="case_reset"
 +                                    string="Reset to Draft" states="done,cancel"
 +                                    type="object" icon="gtk-convert" />
 +                            </group>
 +                        </page>
 +                        <page string="History" groups="base.group_extended">
 +                            <group col="2" colspan="2">
 +                                <separator colspan="4" string="Misc"/>
 +                                <field name="active"/>
 +                                <field name="id" select="1"/>
 +                                <field name="priority" string="Priority"/>
 +                                <field name="canal_id"/>
 +                                <field name="som"/>
 +                            </group>
 +                            <group col="2" colspan="2">
 +                                <separator colspan="4" string="Dates"/>
 +                                <field name="create_date"/>
 +                                <field name="date_closed"/>
 +                                <field name="duration"/>
 +                            </group>
 +                            <newline/>
 +                            <group colspan="4" col="2">
 +                                <separator colspan="4" string="References"/>
 +                                <field colspan="4" name="ref"/>
 +                                <field colspan="4" name="ref2"/>
 +                            </group>
 +                            <field name="log_ids" nolabel="1" colspan="4">
 +                                <tree string="Logs">
 +                                    <field name="name" colspan="4"/>
 +                                    <field name="date"/>
 +                                    <field name="user_id"/>
 +                                </tree>
 +                                <form string="Logs">
 +                                    <separator string="Action Information" colspan="4"/>
 +                                    <field name="name" colspan="4"/>
 +                                    <field name="date"/>
 +                                    <field name="user_id"/>
 +                                </form>
 +                            </field>
 +                        </page>
 +                        <page string="Emails" groups="base.group_extended">
 +                            <group colspan="4">
 +                                <field colspan="4" name="email_cc" string="CC"/>
 +                            </group>
 +                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
 +                                <form string="Communication history">
 +                                    <group col="6" colspan="4">
 +                                        <field name="date"/>
 +                                        <field name="email_to"/>
 +                                        <field name="email_from"/>
 +                                    </group>
 +                                    <newline/>
 +                                    <field name="description" colspan="4" nolabel="1"/>
 +                                    <button colspan="4"
 +                                        string="Reply to Last Email"
 +                                        name="%(crm.action_crm_send_mail)d"
 +                                        context="{'mail':'reply', 'model': 'crm.fundraising'}"
 +                                        icon="gtk-undo" type="action" />
 +                                </form>
 +                                <tree string="Communication history">
 +                                    <field name="description"/>
 +                                    <field name="email_to"/>
 +                                    <field name="date"/>
 +                                </tree>
 +                            </field>
 +                            <button colspan="4" string="Send New Email"
 +                                name="%(crm.action_crm_send_mail)d"
 +                                context="{'mail':'new', 'model': 'crm.fundraising'}"
 +                                icon="gtk-go-forward" type="action" />
 +                        </page>
 +                    </notebook>
 +                </form>
 +            </field>
 +        </record>
 +
 +        <!-- Fund Raising Calendar View -->
 +
 +        <record model="ir.ui.view" id="crm_case_calendar_view_fund">
 +            <field name="name">CRM - Funds Calendar</field>
 +            <field name="model">crm.fundraising</field>
 +            <field name="type">calendar</field>
 +            <field name="priority" eval="2"/>
 +            <field name="arch" type="xml">
 +                <calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
 +                    <field name="name"/>
 +                    <field name="partner_id"/>
 +                </calendar>
 +            </field>
 +        </record>
 +
 +        <!-- Fund Raising Graph View -->
 +
 +        <record model="ir.ui.view" id="crm_case_graph_view_fund">
 +            <field name="name">CRM - Funds Graph</field>
 +            <field name="model">crm.fundraising</field>
 +            <field name="type">graph</field>
 +            <field name="arch" type="xml">
 +                <graph string="Funds by Categories" type="bar" orientation="horizontal">
 +                    <field name="categ_id"/>
 +                    <field name="planned_cost" operator="+"/>
 +                    <field name="state" group="True"/>
 +                </graph>
 +            </field>
 +        </record>
 +
- <!-- Fund Raising Search View -->
++        <!-- Fund Raising Search View -->
 +        <record id="view_crm_case_fund_filter" model="ir.ui.view">
 +                <field name="name">CRM - Funds Search</field>
 +                <field name="model">crm.fundraising</field>
 +                <field name="type">search</field>
 +                <field name="arch" type="xml">
 +                    <search string="Search Funds">
 +                        <group col='6' colspan='4'>
 +                            <filter icon="gtk-new" string="Current"
 +                                domain="[('state','in',('draft', 'open'))]" name="current"
 +                                help="Current Funds" />
 +                            <filter icon="gtk-yes" string="Open"
 +                                domain="[('state','=','open')]"
 +                                help="Open Funds" />
 +                            <filter icon="gtk-media-pause"
 +                                string="Pending"
 +                                domain="[('state','=','pending')]"
 +                                help="Pending Funds" />
 +                            <separator orientation="vertical" />
-                             <filter icon="terp-partner" string="My Funds"
-                                 default="1" domain="[('user_id','=',uid)]"
-                                 separator="1"
-                                 help="Funds Related to Current User"
-                                 />
-                             <separator orientation="vertical" />
 +                            <field name="state" select="1" />
 +                            <field name="name" select='1'
 +                                string="Fund Description" />
 +                            <field name="user_id" select="1"
 +                                widget="selection">
 +                                <filter icon="terp-partner"
 +                                    domain="[('user_id','=', False)]"
 +                                    help="Unassigned" />
 +                            </field>
 +                            <field name="section_id" select="1" widget="selection" string="Sales Team">
 +                                <filter icon="terp-crm"
 +                                    domain="[('section_id','=',context.get('section_id',False))]"
 +                                    help="My section" />
 +                            </field>
 +                        </group>
 +                        <newline/>
 +                        <group expand="0" string="Group By..." colspan="10" col="20">
 +                            <filter string="Partner" icon="terp-partner"
 +                                domain="[]"
 +                                context="{'group_by':'partner_id'}" />
 +                            <filter string="Responsible" icon="terp-crm"
 +                                domain="[]"
 +                                context="{'group_by':'user_id'}" />
 +                            <separator orientation="vertical" />
 +                            <filter string="Type" icon="terp-project"
 +                                domain="[]"
 +                                context="{'group_by':'type_id'}" />
 +                        </group>
 +                    </search>
 +                </field>
 +            </record>
 +    </data>
 +</openerp>
index 5030fd6,0000000..f671e3b
mode 100644,000000..100644
--- /dev/null
@@@ -1,43 -1,0 +1,44 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<openerp>
 +    <data noupdate="1">
 +    <menuitem id="base.menu_aftersale" name="After-Sale Services"
 +      parent="base.menu_base_partner" sequence="6" />
 +
 +<!-- Help Desk (menu) -->
 +
 +    <record model="ir.actions.act_window" id="crm_case_helpdesk_act111">
 +        <field name="name">Helpdesk Requests</field>
 +        <field name="res_model">crm.helpdesk</field>
 +        <field name="view_mode">tree,calendar,form</field>
 +        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
++        <field name="context">{"search_default_user_id":uid}</field>
 +        <field name="search_view_id" ref="view_crm_case_helpdesk_filter"/>
 +    </record>
 +
 +    <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act111">
 +        <field name="sequence" eval="1"/>
 +        <field name="view_mode">tree</field>
 +        <field name="view_id" ref="crm_case_tree_view_helpdesk"/>
 +        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
 +    </record>
 +
 +    <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_act111">
 +        <field name="sequence" eval="2"/>
 +        <field name="view_mode">calendar</field>
 +        <field name="view_id" ref="crm_case_helpdesk_calendar_view"/>
 +        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
 +    </record>
 +
 +    <record model="ir.actions.act_window.view" id="action_crm_sec_form_view_act111">
 +        <field name="sequence" eval="3"/>
 +        <field name="view_mode">form</field>
 +        <field name="view_id" ref="crm_case_form_view_helpdesk"/>
 +        <field name="act_window_id" ref="crm_case_helpdesk_act111"/>
 +    </record>
 +
 +    <menuitem name="Helpdesk and Support" id="menu_help_support_main"
 +      parent="base.menu_aftersale" action="crm_case_helpdesk_act111" />
 +
 +    </data>
 +</openerp>
 +
index 9331139,0000000..27ccee6
mode 100644,000000..100644
--- /dev/null
@@@ -1,263 -1,0 +1,259 @@@
 +<?xml version="1.0"?>
 +<openerp>
 +    <data>
 +
 +        <!-- Helpdesk Support Categories Form View -->
 +
 +        <record id="crm_helpdesk_categ_action" model="ir.actions.act_window">
 +            <field name="name">Helpdesk Categories</field>
 +            <field name="res_model">crm.case.categ</field>
 +            <field name="view_type">form</field>
 +            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
 +            <field name="domain">[('object_id.model', '=', 'crm.helpdesk')]</field>
 +            <field name="context">{'object_id':'crm.helpdesk'}</field>
 +        </record>
 +
 +        <menuitem action="crm_helpdesk_categ_action"
 +            id="menu_crm_case_helpdesk-act" parent="crm.menu_crm_case_categ" />
 +
 +        <!--  Helpdesk Support Form View -->
 +
 +        <record model="ir.ui.view" id="crm_case_form_view_helpdesk">
 +            <field name="name">CRM - Helpdesk Support Form</field>
 +            <field name="model">crm.helpdesk</field>
 +            <field name="type">form</field>
 +            <field name="arch" type="xml">
 +                <form string="Helpdesk Support">
 +                    <group colspan="4" col="7">
 +                        <field name="name" select="1"/>
 +                        <field name="section_id" widget="selection"/>
 +                        <field name="user_id" select="1"/>
 +                        <button name="remind_user"
 +                            states="open,pending"
 +                            string="Send Reminder" type="object"
 +                            icon="gtk-go-forward" />
 +                        <field name="som"/>
 +                        <field name="date" select="1"/>
 +                        <field name="date_deadline"/>
 +                    </group>
 +                    <notebook colspan="4">
 +                        <page string="General">
 +                            <group col="3" colspan="2">
 +                                <separator colspan="4" string="Communication"/>
 +                                <field name="partner_id" colspan="2"
 +                                    on_change="onchange_partner_id(partner_id, email_from)"
 +                                    select="1" />
 +                                <field name="partner_address_id" colspan="2"
 +                                    on_change="onchange_partner_address_id(partner_address_id, email_from)"
 +                                />
 +                                <newline/>
 +                                <field name="email_from" colspan="2"/>
 +                                <button name="remind_partner"
 +                                    states="open,pending"
 +                                    string="Send Reminder" type="object"
 +                                    icon="gtk-go-forward" />
 +                            </group>
 +
 +                            <group col="2" colspan="2">
 +                                <separator colspan="4" string="Categorization"/>
 +                                <field name="priority"/>
 +                                <field name="categ_id"/>
 +                                <field name="canal_id"/>
 +                            </group>
 +
 +                            <separator colspan="4" string="Notes"/>
 +                            <field name="description" colspan="4"
 +                                nolabel="1" widget="text_tag" readonly="1" />
 +                            <separator colspan="4"/>
 +                            <group col="8" colspan="4">
 +                                <field name="state" select="1"/>
 +                                <button name="case_close"
 +                                states="open,draft,pending" string="Close"
 +                                type="object" icon="gtk-close" />
 +                                <button name="case_open"
 +                                states="draft,pending" string="Open"
 +                                type="object" icon="gtk-go-forward" />
 +                                <button name="case_cancel"
 +                                states="draft,open,pending" string="Cancel"
 +                                type="object" icon="gtk-cancel" />
 +                                <button name="case_pending"
 +                                states="draft,open" string="Pending"
 +                                type="object" icon="gtk-media-pause" />
 +                                <button name="case_escalate"
 +                                states="open,draft,pending"
 +                                string="Escalate" type="object"
 +                                icon="gtk-go-up" />
 +                                <button name="case_reset"
 +                                states="done,cancel"
 +                                string="Reset to Draft" type="object"
 +                                icon="gtk-convert" />
 +                            </group>
 +                        </page>
 +                        <page string="History" groups="base.group_extended">
 +                            <group colspan="2" col="2">
 +                                <separator colspan="4" string="Dates"/>
 +                                <field name="create_date"/>
 +                                <field name="date_closed"/>
 +                            </group>
 +                            <group colspan="2" col="2">
 +                                <separator colspan="4" string="Misc"/>
 +                                <field name="id" select="1"/>
 +                                <field name="active"/>
 +                            </group>
 +                            <group colspan="2" col="2">
 +                                <separator colspan="4" string="Estimates"/>
 +                                <field name="planned_cost"/>
 +                            </group>
 +                            <newline/>
 +                            <group colspan="4" col="2">
 +                                <separator colspan="4" string="References"/>
 +                                <field colspan="4" name="ref"/>
 +                                <field colspan="4" name="ref2"/>
 +                            </group>
 +                            <field colspan="4" name="log_ids" nolabel="1">
 +                                <tree string="Logs">
 +                                    <field name="name" colspan="4"/>
 +                                    <field name="date"/>
 +                                    <field name="user_id"/>
 +                                </tree>
 +                                <form string="Logs">
 +                                    <separator string="Action Information" colspan="4"/>
 +                                    <field name="name" colspan="4"/>
 +                                    <field name="date"/>
 +                                    <field name="user_id"/>
 +                                </form>
 +                            </field>
 +                        </page>
 +                        <page string="Emails" groups="base.group_extended">
 +                            <group colspan="4">
 +                                <field colspan="4" name="email_cc" string="CC"/>
 +                            </group>
 +                            <field name="message_ids" colspan="4" nolabel="1" mode="form,tree">
 +                                <form string="Communication history">
 +                                    <group col="6" colspan="4">
 +                                        <field name="date"/>
 +                                        <field name="email_to"/>
 +                                        <field name="email_from"/>
 +                                    </group>
 +                                    <newline/>
 +                                    <field name="description" colspan="4" nolabel="1"/>
 +                                    <button colspan="4"
 +                                        string="Reply to Last Email"
 +                                        name="%(crm.action_crm_send_mail)d"
 +                                        context="{'mail':'reply', 'model': 'crm.helpdesk'}"
 +                                        icon="gtk-undo" type="action" />
 +                                </form>
 +                                <tree string="Communication history">
 +                                    <field name="description"/>
 +                                    <field name="email_to"/>
 +                                    <field name="date"/>
 +                                </tree>
 +                            </field>
 +                            <button colspan="4" string="Send New Email"
 +                                name="%(crm.action_crm_send_mail)d"
 +                                context="{'mail':'new', 'model': 'crm.helpdesk'}"
 +                                icon="gtk-go-forward" type="action" />
 +                        </page>
 +                    </notebook>
 +                </form>
 +            </field>
 +        </record>
 +
 +        <!-- Helpdesk Support Tree View  -->
 +
 +        <record model="ir.ui.view" id="crm_case_tree_view_helpdesk">
 +            <field name="name">CRM - Helpdesk Support Tree</field>
 +            <field name="model">crm.helpdesk</field>
 +            <field name="type">tree</field>
 +            <field name="arch" type="xml">
 +                <tree string="Helpdesk Support Tree"
 +                    colors="black:state=='open';blue:state=='pending';grey:state in ('cancel','close')">
 +                    <field name="id"/>
 +                    <field name="name" string="Query Description" />
 +                    <field name="partner_id" string="Partner"/>
 +                    <field name="date" string="Date"/>
 +                    <field name="date_deadline"/>
 +                    <field name="user_id"/>
 +                    <field name="section_id"/>
 +                    <field name="priority"/>
 +                    <field name="state"/>
 +                    <button name="case_close" string="Done"
 +                        states="open,draft,pending" type="object"
 +                        icon="gtk-close" />
 +                    <button name="case_open" string="Open"
 +                        states="draft,pending" type="object"
 +                        icon="gtk-go-forward" />
 +                    <button name="case_cancel" string="Cancel"
 +                        states="draft,open,pending" type="object"
 +                        icon="gtk-cancel" />
 +                    <button name="case_pending" string="Pending"
 +                        states="draft,open" type="object"
 +                        icon="gtk-media-pause" />
 +                    <button name="case_escalate" string="Escalate"
 +                        groups="base.group_extended"
 +                        states="open,draft,pending" type="object"
 +                        icon="gtk-go-up" />
 +                    <button name="case_reset" string="Reset to Draft"
 +                        states="done,cancel" type="object" icon="gtk-convert" />
 +                </tree>
 +            </field>
 +        </record>
 +
 +        <!--  Helpdesk Support Calendar View -->
 +
 +        <record model="ir.ui.view" id="crm_case_helpdesk_calendar_view">
 +            <field name="name">CRM - Helpdesk Support Calendar</field>
 +            <field name="model">crm.helpdesk</field>
 +            <field name="type">calendar</field>
 +            <field name="priority" eval="2"/>
 +            <field name="arch" type="xml">
 +                <calendar string="Helpdesk Supports" date_start="date" color="user_id" date_delay="duration">
 +                    <field name="name"/>
 +                    <field name="partner_id"/>
 +                    <field name="categ_id"/>
 +                </calendar>
 +            </field>
 +        </record>
 +
 +        <!-- Helpdesk Support Search View  -->
 +
 +        <record id="view_crm_case_helpdesk_filter" model="ir.ui.view">
 +            <field name="name">CRM - Helpdesk Search</field>
 +            <field name="model">crm.helpdesk</field>
 +            <field name="type">search</field>
 +            <field name="arch" type="xml">
 +                <search string="Search Helpdesk">
 +                    <filter icon="gtk-home" string="Today"
 +                        separator="1"
 +                        domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
 +                        help="Todays's Helpdesk Requests"
 +                        />
 +                    <filter icon="gtk-media-rewind"
 +                        string="7 Days" separator="1"
 +                        help="Helpdesk requests during last 7 days"
 +                        domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
 +                        />
 +                    <separator orientation="vertical"/>
 +                    <field name="name" select='1' string="Query"/>
 +                    <field name="partner_id" />
-                     <field name="user_id" select="1" widget="selection">
-                         <filter icon="terp-partner"
-                             domain="[('user_id','=',uid)]"
-                             help="My Helpdesk Requests" default="1" />
-                     </field>
++                    <field name="user_id" select="1" widget="selection"/>
 +                    <field name="section_id" select="1" widget="selection" string="Sales Team">
 +                        <filter icon="terp-crm"
 +                            domain="[('section_id','=',context.get('section_id',False))]"
 +                            help="My section" />
 +                    </field>
 +                    <newline/>
 +                    <group expand="0" string="Group By..." colspan="12" col="20">
 +                        <filter string="Customer" icon="terp-crm"
 +                            domain="[]" context="{'group_by':'partner_id'}" />
 +                        <filter string="State" icon="terp-crm" domain="[]"
 +                            context="{'group_by':'state'}" />
 +                        <filter string="Priority" icon="terp-crm"
 +                            domain="[]" context="{'group_by':'priority'}" />
 +                    </group>
 +                </search>
 +            </field>
 +        </record>
 +
 +    </data>
 +</openerp>
Simple merge
          <field name="model">idea.idea</field>
          <field name="type">search</field>
          <field name="arch" type="xml">
 -              <search string="Ideas">
 -                      <group col="10" colspan="4">
 -                              <filter icon="gtk-execute" string="Draft"
 -                                      domain="[('state','=','draft')]" help="Draft Ideas" />
 -                              <filter icon="gtk-execute" string="Open"
 -                                      domain="[('state','=','open')]" help="Open Ideas" />
 -                              <separator orientation="vertical"/>
 -                          <field name="title" select="1"/>
 -                          <field name="category_id" select="1"/>
 -                          <field name="user_id" widget="selection" select="1"/>
 -                              </group>
 -              </search>
 +            <search string="Ideas">
 +                <group col="10" colspan="4">
-                     <filter icon="gtk-execute" string="My Ideas" domain="[('user_id','=',uid)]" help="My Ideas"/>
-                     <separator orientation="vertical"/>
 +                    <filter icon="gtk-execute" string="Draft"
 +                        domain="[('state','=','draft')]" help="Draft Ideas" />
 +                    <filter icon="gtk-execute" string="Open"
 +                        domain="[('state','=','open')]" help="Open Ideas" />
 +                    <separator orientation="vertical"/>
 +                    <field name="title" select="1"/>
 +                    <field name="category_id" select="1"/>
-                     <field name="user_id" select="1"/>
++                    <field name="user_id" select="1" widget="selection"/>
 +                </group>
 +                <newline/>
 +                <group expand="1" string="Group By..." colspan="12" col="10">
 +                    <filter icon="gtk-execute" string="Creator" help="By Creators" context="{'group_by':'user_id'}"/>
 +                    <filter icon="gtk-execute" string="State" help="By States" context="{'group_by':'state'}"/>
 +                    <filter icon="gtk-execute" string="Category" help="By Idea Category" context="{'group_by':'category_id'}"/>
 +                </group>
 +            </search>
          </field>
      </record>
  
Simple merge
          <record id="view_project_issue_report_filter" model="ir.ui.view">
              <field name="name">project.issue.report.select</field>
              <field name="model">project.issue.report</field>
 -            <field name="inherit_id" ref="crm.view_crm_case_filter"/>
              <field name="type">search</field>
              <field name="arch" type="xml">
 -               <data>
 +                              <search string="Search">
 +                  <group col="16" colspan="8">
 +                              <!--  <filter string="This Year" name="This Year" icon="terp-hr"
 +                                      domain="[('name','=',time.localtime()[0])]"/>-->
 +                              <filter string="This Year" icon="terp-hr"
 +                                      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="This Month" name="This Year" icon="terp-hr"
 +                                      domain="[('month','=',time.strftime('%%m'))]" />-->
 +                       <filter string="This Month" icon="terp-hr" 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 icon="gtk-media-rewind" 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'))]"/>
 +
 +                              <separator orientation="vertical" />
 +                        <filter icon="terp-hr"
 +                              string="Draft"
 +                              domain="[('state','=','draft')]"/>
 +                                         <filter icon="terp-hr"
 +                              string="Open"
 +                              domain="[('state','=','open')]"/>
 +                                         <filter icon="terp-hr"
 +                              string="Pending"
 +                              domain="[('state','=','pending')]"/>
 +
 +                              <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="company_id" widget="selection">
 +                           <filter icon="terp-crm"
 +                        context="{'invisible_section': False}"
 +                        domain="[('section_id.user_id.company_id','=',uid)]"
 +                        help="My company"/>
 +                        </field>
 +
-                               <field name="user_id"  select="1" widget="selection">
-                                       <filter icon="terp-crm" string="My Project Issue" help="My Project Issue Entries" domain="[('user_id','=',uid)]" />
-                                       </field>
++                              <field name="user_id"  select="1" widget="selection"/>
 +                   </group>
 +                   <newline/>
 +                   <group  expand="1" string="Extended options..." colspan="10" col="12">
 +                         <filter icon="terp-sale"
 +                              string="Done"
 +                              domain="[('state','=','done')]"/>
  
 -              <xpath expr='//search[@string="Search"]/group[1]/field[@name="user_id"]' position='replace'>
 -                      <field name="user_id"  select="1" widget="selection"/>
 -              </xpath>
 -                      <xpath expr='//search[@string="Search"]/group[@string="Extended options..."]/filter[@string="Cancel"]' position='after'>
 +                      <filter icon="terp-sale"
 +                              string="Cancel"
 +                              domain="[('state','=','cancel')]"/>
                        <group>
                                <separator orientation="vertical"/>
                                        <field name="project_id" widget="selection" />
  
  
    </data>
--</openerp>
++</openerp>
Simple merge
                          <field name="name"/>
                          <field name="project_id" widget="selection"/>
                          <field name="sprint_id" widget="selection">
 -                              <filter icon="terp-project"
 -                                      string="Sprints"
 -                                      domain="[('sprint_id.state','=','open')]"
 -                                      help="Backlogs Assigned To Current Sprints"/>
 -                              <filter icon="terp-project"
 -                                      string="Sprints"
 -                                      domain="[('sprint_id','=',False)]"
 -                                      help="Backlogs Not Assigned To Sprints."/>
 +                            <filter icon="terp-project"
 +                                string="Sprints"
 +                                domain="[('sprint_id.state','=','open')]"
 +                                help="Backlogs Assigned To Current Sprints"/>
 +                            <filter icon="terp-project"
 +                                string="Sprints"
 +                                domain="[('sprint_id','=',False)]"
 +                                help="Backlogs Not Assigned To Sprints."/>
                          </field>
-                         <field name="user_id" widget="selection">
-                             <filter default="1"
-                                 icon="terp-project"
-                                 string="My Features"
-                                 domain="[('user_id','=',uid)]"
-                                 help="My Backlogs"/>
-                         </field>
+                         <field name="user_id" widget="selection"/>
                      </group>
                      <newline/>
                      <group expand="1" string="Group By..." colspan="4" col="20">