[MERGE] trunk-search_views or instead of and in groups
authorAntony Lesuisse <al@openerp.com>
Fri, 23 Sep 2011 17:22:47 +0000 (19:22 +0200)
committerAntony Lesuisse <al@openerp.com>
Fri, 23 Sep 2011 17:22:47 +0000 (19:22 +0200)
bzr revid: al@openerp.com-20110923172247-pj5ii3pxisiyco6k

17 files changed:
1  2 
addons/crm/crm_lead_view.xml
addons/crm/crm_phonecall_view.xml
addons/crm/report/crm_lead_report_view.xml
addons/crm_claim/crm_claim_view.xml
addons/crm_fundraising/crm_fundraising_view.xml
addons/crm_fundraising/report/crm_fundraising_report_view.xml
addons/crm_helpdesk/crm_helpdesk_view.xml
addons/event/event_view.xml
addons/membership/report/report_membership_view.xml
addons/mrp/report/mrp_production_order_view.xml
addons/procurement/procurement_view.xml
addons/project_issue/project_issue_menu.xml
addons/project_issue/project_issue_view.xml
addons/project_scrum/project_scrum_view.xml
addons/purchase_requisition/purchase_requisition_view.xml
addons/sale_margin/report/report_margin_view.xml
addons/stock/stock_view.xml

                  </field>
                  <separator orientation="vertical"/>
                  <field name="country_id" context="{'invisible_country': False}">
--                      <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
++                    <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
                  </field>
                  <newline/>
                  <group expand="0" string="Group By...">
             </search>
          </field>
      </record>
 -      <!-- Scheduled a phonecall search view-->
++    <!-- Scheduled a phonecall search view-->
+     <record id="view_crm_case_scheduled_phonecalls_filter" model="ir.ui.view">
+         <field name="name">CRM - Scheduled Calls Search</field>
+         <field name="model">crm.phonecall</field>
+         <field name="type">search</field>
+         <field name="arch" type="xml">
+             <search string="Scheduled Phonecalls">
+                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>    
+                <separator orientation="vertical"/>
+                <filter icon="terp-go-today" string="Today"
+                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),
+                     ('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]"
+                    name="today"
+                    help="Todays's Phonecalls"
+                />
+                <filter icon="terp-go-week"
+                    string="7 Days"
+                    help="Phonecalls during last 7 days"
+                    domain="[('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                />
+                <separator orientation="vertical"/>
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="user_id">
+                    <filter icon="terp-personal-"
+                        domain="[('user_id','=',False)]"
+                        help="Unassigned Phonecalls" />
+                </field>
+                <field name="section_id"
+                    widget="selection" string="Sales Team">
+                    <filter icon="terp-personal+" groups="base.group_extended"
+                        domain="['|', ('section_id', '=', context.get('section_id')), '|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                        help="My Sales Team(s)" />
+                </field>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Partner" icon="terp-partner" domain="[]"
+                        context="{'group_by':'partner_id'}" />
+                    <filter string="Responsible" icon="terp-personal"
+                        domain="[]" context="{'group_by':'user_id'}" />
+                    <separator orientation="vertical" />
+                    <filter string="Creation" icon="terp-go-month" help="Creation Date"
+                        domain="[]" context="{'group_by':'create_date'}" />
+                    <filter string="Date" icon="terp-go-month" domain="[]"
+                        context="{'group_by':'date'}" help="Date of Call" />
+                </group>
+            </search>
+         </field>
 -    </record> 
++    </record>   
  
      </data>
  </openerp>
@@@ -73,6 -73,7 +73,7 @@@
                  <search string="Leads Analysis">
                      <group>
                          <filter icon="terp-personal"
 -                              name="lead"
++                            name="lead"
                              string="Lead"
                              domain="[('type','=', 'lead')]"
                              help="Show only lead"/>
  
                          <separator orientation="vertical" />
                          <filter icon="terp-check"
-                             string="Active"
-                             domain="[('state','in',('draft','open'))]"
-                             help="Leads/Opportunities which are in draft and open state"/>
+                             string="New"
+                             domain="[('state','=','draft')]"
+                             help="Leads/Opportunities which are in New state"/>
 -                                              <filter icon="terp-camera_test"
++                        <filter icon="terp-camera_test"
+                             string="Open"
+                             domain="[('state','=','open')]"
+                             help="Leads/Opportunities which are in open state"/>                            
                          <filter icon="gtk-media-pause"
                              string="Pending"
                              domain="[('state','=','pending')]"
                                      <tree string="History">
                                          <field name="display_text" string="History Information"/>
                                          <field name="email_from" invisible="1"/>
--                                                  <button
--                                                      string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
--                                                      name="%(mail.action_email_compose_message_wizard)d"
--                                                      context="{'mail.compose.message.mode':'reply'}"
--                                                      icon="terp-mail-replied" type="action" />
++                                        <button
++                                            string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
++                                            name="%(mail.action_email_compose_message_wizard)d"
++                                            context="{'mail.compose.message.mode':'reply'}"
++                                            icon="terp-mail-replied" type="action" />
                                      </tree>
                                      <form string="Communication &amp; History">
                                          <group col="4" colspan="4">
                                              <page string="Details">
                                                  <group attrs="{'invisible': [('email_from', '=', False)]}">
                                                      <field name="body_text" colspan="4" nolabel="1" height="250"/>
--                                                              <button colspan="4" string="Reply"
--                                                                  name="%(mail.action_email_compose_message_wizard)d"
--                                                                  context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                                                  icon="terp-mail-replied" type="action"/>
++                                                    <button colspan="4" string="Reply"
++                                                        name="%(mail.action_email_compose_message_wizard)d"
++                                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
++                                                        icon="terp-mail-replied" type="action"/>
                                                  </group>
                                                  <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                      <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                      name="%(crm.action_crm_add_note)d"
                                      context="{'model': 'crm.lead' }"
                                      icon="terp-document-new" type="action" />
--                                          <button string="Send New Email"
--                                              name="%(mail.action_email_compose_message_wizard)d"
--                                              icon="terp-mail-message-new" type="action"/>
++                                <button string="Send New Email"
++                                    name="%(mail.action_email_compose_message_wizard)d"
++                                    icon="terp-mail-message-new" type="action"/>
                              </page>
                          </notebook>
                      </group>
                                  <tree string="History">
                                      <field name="display_text" string="History Information"/>
                                      <field name="email_from" invisible="1"/>
--                                          <button
--                                              string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
--                                              name="%(mail.action_email_compose_message_wizard)d"
--                                              context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                              icon="terp-mail-replied" type="action" />
++                                    <button
++                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
++                                        name="%(mail.action_email_compose_message_wizard)d"
++                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
++                                        icon="terp-mail-replied" type="action" />
                                  </tree>
                                  <form string="History">
                                      <group col="4" colspan="4">
                                          <page string="Details">
                                              <group attrs="{'invisible': [('email_from', '=', False)]}">
                                                  <field name="body_text" colspan="4" nolabel="1" height="250"/>
--                                                      <button colspan="4" string="Reply"
--                                                          name="%(mail.action_email_compose_message_wizard)d"
--                                                          context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                                          icon="terp-mail-replied" type="action"/>
++                                                <button colspan="4" string="Reply"
++                                                    name="%(mail.action_email_compose_message_wizard)d"
++                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
++                                                    icon="terp-mail-replied" type="action"/>
                                              </group>
                                              <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                  <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                  name="%(crm.action_crm_add_note)d"
                                  context="{'model': 'crm.lead' }"
                                  icon="terp-document-new" type="action" />
--                                  <button string="Send New Email"
--                                      name="%(mail.action_email_compose_message_wizard)d"
--                                      icon="terp-mail-message-new" type="action"/>
++                            <button string="Send New Email"
++                                name="%(mail.action_email_compose_message_wizard)d"
++                                icon="terp-mail-message-new" type="action"/>
                          </page>
                          <page string="Extra Info" groups="base.group_extended">
                              <group col="2" colspan="2">
  
  <!-- Fundraising by user and section Search View-->
  
--              <record id="view_report_crm_fundraising_filter" model="ir.ui.view">
++        <record id="view_report_crm_fundraising_filter" model="ir.ui.view">
              <field name="name">crm.fundraising.report.selectt</field>
              <field name="model">crm.fundraising.report</field>
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Search">
                    <group>
--                              <filter string="  Year  " icon="terp-go-year"
--                                      domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
--                                      help="Funds raised in current year"/>
++                        <filter string="  Year  " icon="terp-go-year"
++                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
++                            help="Funds raised in current year"/>
  
                         <filter string="   Month   " icon="terp-go-month" name="This Month"
                             domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
--                         help="Funds raised in current month"/>
++                           help="Funds raised in current month"/>
  
                         <filter icon="terp-go-month" string="    Month-1    " 
                              domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                                  <tree string="History">
                                      <field name="display_text" string="History Information"/>
                                      <field name="email_from" invisible="1"/>
--                                          <button
--                                              string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
--                                              name="%(mail.action_email_compose_message_wizard)d"
--                                              context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                              icon="terp-mail-replied" type="action" />
++                                    <button
++                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
++                                        name="%(mail.action_email_compose_message_wizard)d"
++                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
++                                        icon="terp-mail-replied" type="action" />
                                  </tree>
                                  <form string="History">
                                      <group col="4" colspan="4">
                                          <page string="Details">
                                              <group attrs="{'invisible': [('email_from', '=', False)]}">
                                                  <field name="body_text" colspan="4" nolabel="1" height="250"/>
--                                                      <button colspan="4" string="Reply"
--                                                          name="%(mail.action_email_compose_message_wizard)d"
--                                                          context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                                          icon="terp-mail-replied" type="action"/>
++                                                <button colspan="4" string="Reply"
++                                                    name="%(mail.action_email_compose_message_wizard)d"
++                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
++                                                    icon="terp-mail-replied" type="action"/>
                                               </group>
                                              <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                  <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                  name="%(crm.action_crm_add_note)d"
                                  context="{'model': 'crm.lead' }"
                                  icon="terp-document-new" type="action" />
--                                  <button string="Send New Email"
--                                      name="%(mail.action_email_compose_message_wizard)d"
--                                      icon="terp-mail-message-new" type="action"/>
++                            <button string="Send New Email"
++                                name="%(mail.action_email_compose_message_wizard)d"
++                                icon="terp-mail-message-new" type="action"/>
                          </page>
                          <page string="Extra Info" groups="base.group_extended">
                              <group colspan="2" col="2">
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Search Helpdesk">
+                     <filter icon="terp-check" string="New" 
 -                                          name="current"
++                        name="current"
+                         domain="[('state','=','draft')]"
+                         help="New Helpdesk Request" />
+                     <filter icon="terp-camera_test"
+                         string="Open"
+                         domain="[('state','=','open')]"
+                         help="Open Helpdesk Request"
+                     />
+                     <filter icon="terp-gtk-media-pause"
+                         string="Pending"
+                         domain="[('state','=','pending')]"
+                         help="All pending Helpdesk Request"
+                     />
+                     <separator orientation="vertical"/>
                      <filter icon="terp-go-today" string="Today"
                          domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
                          help="Todays's Helpdesk Requests"
                                  <tree string="History">
                                      <field name="display_text" string="History Information"/>
                                      <field name="email_from" invisible="1"/>
--                                          <button
--                                              string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
--                                              name="%(mail.action_email_compose_message_wizard)d"
--                                              context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                              icon="terp-mail-replied" type="action" />
++                                    <button
++                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
++                                        name="%(mail.action_email_compose_message_wizard)d"
++                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
++                                        icon="terp-mail-replied" type="action" />
                                  </tree>
                                  <form string="History">
                                      <group col="4" colspan="4">
                                          <page string="Details">
                                              <group attrs="{'invisible': [('email_from', '=', False)]}">
                                                  <field name="body_text" colspan="4" nolabel="1" height="250"/>
--                                                      <button colspan="4" string="Reply"
--                                                          name="%(mail.action_email_compose_message_wizard)d"
--                                                          context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
--                                                          icon="terp-mail-replied" type="action"/>
++                                                <button colspan="4" string="Reply"
++                                                    name="%(mail.action_email_compose_message_wizard)d"
++                                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
++                                                    icon="terp-mail-replied" type="action"/>
                                              </group>
                                              <group attrs="{'invisible': [('email_from', '!=', False)]}">
                                                  <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                  name="%(crm.action_crm_add_note)d"
                                  context="{'model': 'crm.lead' }"
                                  icon="terp-document-new" type="action" />
--                                  <button string="Send New Email"
--                                      name="%(mail.action_email_compose_message_wizard)d"
--                                      icon="terp-mail-message-new" type="action"/>
++                            <button string="Send New Email"
++                                name="%(mail.action_email_compose_message_wizard)d"
++                                icon="terp-mail-message-new" type="action"/>
                             </page>
                      </notebook>
                  </form>
              <field name="arch" type="xml">
                  <search string="Membership">
                      <group>
-                         <filter string="Last 365 Days" icon="terp-go-year"
-                             domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                         <filter string="Last 30 Days" icon="terp-go-month" name="month"
-                             domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                         <filter string="  Year  " icon="terp-go-year"
+                         domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_from','&gt;=',time.strftime('%%Y-01-01'))]"
+                         help="Events created in current year"/>
+                         <filter string="   Month   " icon="terp-go-month" name="this_month"
+                         domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                         help="Events created in current month"/>
+                         <filter icon="terp-go-month" string="    Month-1    "
+                         domain="[('date_from','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                         help="Events created in last month"/>
 -                          <separator orientation="vertical"/>
 +                        <separator orientation="vertical"/>
                          <filter string="Forecast" icon="terp-gtk-jump-to-ltr" context="{'waiting_invoiced_totpending_visible':0}" help="This will display waiting, invoiced and total pending columns"/>
-                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                          <separator orientation="vertical"/>
+                         <filter string="Revenue Done" name="Revenue" icon="terp-dolar" context="{'paid_old_totearned_visible':0}" help="This will display paid, old and total earned columns"/>
                          <field name="partner_id"/>
                          <field name="membership_id"/>
                          <field name="user_id"/>
@@@ -1,9 -1,9 +1,9 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
      <data>
--      <!--
--      Production Order Report
--      -->
++    <!--
++    Production Order Report
++    -->
  
          <record id="view_report_mrp_production_order_tree" model="ir.ui.view">
              <field name="name">mrp.production.order.tree</field>
@@@ -25,7 -25,7 +25,7 @@@
                        <field name="location_src_id" invisible="1"/>
                        <field name="location_dest_id" invisible="1"/>
                        <field name="company_id" groups="base.group_multi_company" invisible="1"/>
--                              </tree>
++                </tree>
              </field>
          </record>
  
              </field>
          </record>
  
--              <record id="view_report_mrp_production_order_filter" model="ir.ui.view">
++        <record id="view_report_mrp_production_order_filter" model="ir.ui.view">
              <field name="name">mrp.production.order.select</field>
              <field name="model">mrp.production.order</field>
              <field name="type">search</field>
              <field name="arch" type="xml">
                  <search string="Search">
                    <group>
--                          <filter icon="terp-go-year" string="Year"
--                                  domain="[('year','=',time.strftime('%%Y'))]"
--                                  help="Production performed during current year"/>
--                          <filter icon="terp-go-month" string="Month"
--                                      name="month"
--                                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
--                                      help="Production performed during current month"/>
--                              <filter icon="terp-go-week"
--                                  string="Month -1"
--                                  domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
--                                  help="Production during last month"/>
++                        <filter icon="terp-go-year" string="Year"
++                                domain="[('year','=',time.strftime('%%Y'))]"
++                                help="Production performed during current year"/>
++                        <filter icon="terp-go-month" string="Month"
++                                name="month"
++                                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
++                                help="Production performed during current month"/>
++                        <filter icon="terp-go-week"
++                                string="Month -1"
++                                domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
++                                help="Production during last month"/>
                        <separator orientation="vertical"/>
-                         <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
-                         <filter icon="terp-check" string="In Production" domain="[('state','=','in_production')]"/>
-                         <filter icon="terp-camera_test" string="Done" domain="[('state','=','done')]"/>
+                         <filter icon="terp-camera_test" string="Ready" domain="[('state','=','ready')]"/>
+                         <filter icon="terp-check" string="In production" domain="[('state','=','in_production')]"/>
+                         <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                        <separator orientation="vertical"/>
                          <field name="location_src_id" />
                          <field name="location_dest_id" />
                      </group>
                     <newline/>
                     <group expand="1" string="Group By...">
--                      <filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
--                      <filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
--                      <separator orientation="vertical"/>
++                        <filter string="Raw Material Location" icon="terp-gtk-jump-to-rtl" context="{'group_by':'location_src_id'}"/>
++                        <filter string="Finished Products Location" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_dest_id'}"/>
++                        <separator orientation="vertical"/>
                          <filter string="Product" name="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" />
--                      <filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
--                      <separator orientation="vertical"/>
++                        <filter string="BOM" icon="terp-mrp" context="{'group_by':'bom_id'}"/>
++                        <separator orientation="vertical"/>
                          <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
--                      <separator orientation="vertical"/>
--                      <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
--                      <separator orientation="vertical" groups="base.group_multi_company"/>
++                        <separator orientation="vertical"/>
++                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
++                        <separator orientation="vertical" groups="base.group_multi_company"/>
                          <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
--                      <separator orientation="vertical"/>
--                      <filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
--                      <separator orientation="vertical"/>
--                      <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
++                        <separator orientation="vertical"/>
++                        <filter string="Month" name="terp-go-month" icon="terp-go-month" context="{'group_by':'month'}"/>
++                        <separator orientation="vertical"/>
++                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
                     </group>
                    </search>
              </field>
              <field name="help">This reporting allows you to analyse your manufacturing activities and performance.</field>
          </record>
  
--              <record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
--              <field name="sequence" eval="1"/>
--              <field name="view_mode">tree</field>
--              <field name="view_id" ref="view_report_mrp_production_order_tree"/>
--              <field name="act_window_id" ref="action_report_mrp_production_order"/>
--          </record>
++        <record model="ir.actions.act_window.view" id="action_report_mrp_production_order_tree">
++            <field name="sequence" eval="1"/>
++            <field name="view_mode">tree</field>
++            <field name="view_id" ref="view_report_mrp_production_order_tree"/>
++            <field name="act_window_id" ref="action_report_mrp_production_order"/>
++        </record>
  
          <record model="ir.actions.act_window.view" id="action_report_mrp_production_order_graph">
--              <field name="sequence" eval="2"/>
--              <field name="view_mode">graph</field>
--              <field name="view_id" ref="view_report_mrp_production_order_graph"/>
--              <field name="act_window_id" ref="action_report_mrp_production_order"/>
--          </record>
++            <field name="sequence" eval="2"/>
++            <field name="view_mode">graph</field>
++            <field name="view_id" ref="view_report_mrp_production_order_graph"/>
++            <field name="act_window_id" ref="action_report_mrp_production_order"/>
++        </record>
  
          <menuitem name="Production Analysis" action="action_report_mrp_production_order" id="menu_report_mrp_production_orders_tree" parent="next_id_77"/>
  
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
--      <data>
--              <!--
++    <data>
++        <!--
          Procurement
          -->
  
                          <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                          <filter string="Reason" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'name'}"/>
                          <filter string="Scheduled Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_planned'}"/>
--                      <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
++                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      </group>
                  </search>
              </field>
@@@ -1,8 -1,8 +1,6 @@@
  <?xml version="1.0"?>
  <openerp>
  <data>
--
--    ######################## ISSUE TRACKING (menu) ###########################
      <!--
          ALL BUGS
      -->
@@@ -13,7 -13,7 +11,7 @@@
          <field name="view_mode">tree,calendar</field>
          <field name="view_id" ref="project_issue_tree_view"/>
          <field name="domain" eval=""/>
-         <field name="context">{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}</field>
 -        <field name="context">{"search_default_user_id": uid, "search_default_New": 1, "search_default_project_id":project_id}</field>
++        <field name="context">{"search_default_user_id": uid, "search_default_draft": 1, "search_default_project_id":project_id}</field>
          <field name="search_view_id" ref="view_project_issue_filter"/>
          <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
      </record>
@@@ -40,7 -40,7 +38,7 @@@
      </record>
  
      <act_window
--              context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
++            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
              id="act_project_project_2_project_issue_all"
              name="Issues"
              res_model="project.issue"
              <field name="arch" type="xml">
                  <search string="Issue Tracker Search">
                      <group>
-                         <filter string="Current" name="current" domain="[('state','in',('open','draft','pending'))]" help="New, pending and to do" icon="terp-check"/>
-                         <separator orientation="vertical"/>
-                         <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
-                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-camera_test"/>
 -                        <filter string="New" icon="terp-document-new" name="New" domain="[('state','=','draft')]" help="New Issues"/>
++                        <filter string="New" icon="terp-document-new" name="draft" domain="[('state','=','draft')]" help="New Issues"/>
+                         <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                          <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                          <separator orientation="vertical"/>
                          <field name="name" string="Issue / Partner" filter_domain="['|', '|', ('partner_id','ilike',self), ('email_from','ilike',self), ('name','ilike',self)]"/>
@@@ -61,8 -61,8 +61,8 @@@
                          <field name="name" select="1"/>
                          <field name="project_id" select="1"/>
                          <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
--                                      <button name="%(action_postpone_wizard)d" string="Postpone" type="action"
--                                                      help="Postpone backlog" colspan="2"
++                        <button name="%(action_postpone_wizard)d" string="Postpone" type="action"
++                            help="Postpone backlog" colspan="2"
                           icon="gtk-convert"  attrs="{'invisible':[('state','in',['done', 'cancel'])]}"/>
                          <field name="user_id" select="1"/>
                          <field name="sequence" groups="base.group_extended"/>
                      <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                      <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                      <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" states="open,draft,close,cancel"
--                                      string="Burndown Chart" type="action" icon="gtk-print"/>
++                                    string="Burndown Chart" type="action" icon="gtk-print"/>
                  </tree>
              </field>
          </record>
                                              <separator colspan="4" string="Are there anything blocking you?"/>
                                              <field colspan="4" name="question_blocks" nolabel="1"/>
                                              <separator colspan="4" string=""/>
--                                                                      <button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
++                                            <button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
                                              <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
                                          </page>
                                          <page string="Optional Info">
                      <group col="8" colspan="4">
                          <field name="state" readonly="1"/>
                          <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
--                                              string="Burndown Chart" type="action" icon="gtk-print"/>
++                                    string="Burndown Chart" type="action" icon="gtk-print"/>
                          <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                          <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                          <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
              <field name="inherit_id" ref="project.view_task_search_form"/>
              <field name="arch" type="xml">
                  <xpath expr="/search/group[@string='Group By...']/filter[@string='Project']" position="after">
--                      <separator orientation="vertical"/>
++                    <separator orientation="vertical"/>
                      <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                      <filter string="Backlog" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'product_backlog_id'}"/>
                  </xpath>
          </record>
  
          <act_window
--              context="{'search_default_sprint_id': [active_id], 'default_sprint_id': active_id}"
++            context="{'search_default_sprint_id': [active_id], 'default_sprint_id': active_id}"
              id="act_scrum_sprint_2_product_backlog"
              name="Backlogs"
              res_model="project.scrum.product.backlog"
              view_type="form"/>
  
          <act_window
--              context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1, 'default_sprint_id': active_id}"
++            context="{'search_default_sprint_id': active_id, 'search_default_user_id': uid, 'search_default_current':1, 'default_sprint_id': active_id}"
              id="act_scrum_sprint_2_project_task"
              name="Tasks"
              res_model="project.task"
              </xpath>
          </field>
      </record>
 -    
++
+     <record model="ir.ui.view" id="request_for_quotation_inherit">
+         <field name="name">request.for.quotation.select.inherit</field>
+         <field name="type">form</field>
+         <field name="model">purchase.order</field>
+         <field name="inherit_id" ref="purchase.view_request_for_quotation_filter"/>
+         <field name="arch" type="xml">
+             <xpath expr="/search/group/filter[@string='Not invoices']" position="after">
+              <separator orientation="vertical"/>
+              <filter icon="terp-gtk-jump-to-rtl" string="Requisition" domain="[('requisition_id','!=',False)]"  help="Purchase Orders with requisition"/>
+             </xpath>
+         </field>
+     </record>
      <record model="ir.ui.view" id="view_purchase_requisition_form">
          <field name="name">purchase.requisition.form</field>
          <field name="type">form</field>
@@@ -78,8 -93,8 +93,8 @@@
                                  <field name="minimum_planned_date"/>
                                  <field name="origin"/>
                                  <field name="state"/>
--                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>                                                          
--                                                              <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
++                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order" icon="gtk-cancel"/>                                
++                                <button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-apply"/>
                                  <button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
                              </tree>
                           </field>
              <field name="arch" type="xml">
                  <search string="Search Purchase Requisition">
                   <group>
-                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Purchase Requisition"/>
 -                    <filter icon="terp-document-new" name="New" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
++                    <filter icon="terp-document-new" name="draft" string="New" domain="[('state','=','draft')]" help="New Purchase Requisition"/>
                      <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','in_progress')]" help="Purchase Requisition in negociation"/>
                      <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" help="Current Purchase Requisition"/>
                      <separator orientation="vertical"/>
                  </group>
                  <newline/>
                    <group expand="0" string="Group By..." groups="base.group_extended">
--                      <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
--                                      <separator orientation="vertical"/>
++                    <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
++                    <separator orientation="vertical"/>
                      <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                      <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                      <separator orientation="vertical"/>
              </xpath>
          </field>
      </record>
--      <act_window
++    <act_window
              domain="[('requisition_id', '=', active_id)]"
              id="act_res_partner_2_purchase_order"
              name="Purchase orders"
              res_model="purchase.order"
              src_model="purchase.requisition"/>
--    
++
      </data>
  </openerp>
@@@ -1,30 -1,30 +1,30 @@@
  <?xml version="1.0"?>
  <openerp>
--      <data>
++    <data>
++
++        <record model="ir.ui.view" id="view_report_account_invoice_tree">
++            <field name="name">report.account.invoice.product.tree</field>
++            <field name="model">report.account.invoice.product</field>
++            <field name="type">tree</field>
++            <field name="arch" type="xml">
++                <tree string="Invoices by product">
++                    <field name="date"/>
++                    <field name="year" invisible="1" />
++                    <field name="month" invisible="1"/>
++                    <field name="day" invisible="1"/>
++                    <field name="type"/>
++                    <field name="state"/>
++                    <field name="product_id" invisible="1" />
++                    <field name="partner_id"/>
++                    <field name="categ_id" invisible="1" />
++                    <field name="amount"/>
++                    <field name="cost_price"/>
++                    <field name="margin"/>
++                    <field name="quantity"/>
++                </tree>
++            </field>
++        </record>
  
--              <record model="ir.ui.view" id="view_report_account_invoice_tree">
--                      <field name="name">report.account.invoice.product.tree</field>
--                      <field name="model">report.account.invoice.product</field>
--                      <field name="type">tree</field>
--                      <field name="arch" type="xml">
--                              <tree string="Invoices by product">
--                                      <field name="date"/>
--                      <field name="year" invisible="1" />
--                      <field name="month" invisible="1"/>
--                      <field name="day" invisible="1"/>
--                                      <field name="type"/>
--                                      <field name="state"/>
--                                      <field name="product_id" invisible="1" />
--                                      <field name="partner_id"/>
--                                      <field name="categ_id" invisible="1" />
--                                      <field name="amount"/>
--                                      <field name="cost_price"/>
--                                      <field name="margin"/>
--                                      <field name="quantity"/>
--                              </tree>
--                      </field>
--              </record>
--              
           <record id="view_report_account_invoice_filter" model="ir.ui.view">
              <field name="name">account.invoice.product.filter</field>
              <field name="model">report.account.invoice.product</field>
              <field name="arch" type="xml">
                  <search string="Search Margin">
                      <group>
--                                              <filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
--                                              <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
--                                              <separator orientation="vertical"/>
--                                              <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Invoices"/>
--                              <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
-                               <filter string="Current" icon="terp-check" domain="[('state', '=' ,'open')]" help="open Invoices"/>
-                               <filter string="Done" icon="terp-dialog-close" domain="[('state','=','paid')]" help="Done Invoices"/>
 -                              <filter string="Open" icon="terp-check" domain="[('state', '=' ,'open')]" help="Open Invoices"/>
 -                              <filter string="Done" icon="terp-dialog-close" domain="[('state','=','paid')]" help="Done Invoices"/>
++                        <filter icon="terp-go-year" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="All Months Sales by Margin"/>
++                        <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by Margin"/>
++                        <separator orientation="vertical"/>
++                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Invoices"/>
++                        <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="[('state','=','proforma')]" help="Pro-forma Invoices"/>
++                        <filter string="Open" icon="terp-check" domain="[('state', '=' ,'open')]" help="Open Invoices"/>
++                        <filter string="Done" icon="terp-dialog-close" domain="[('state','=','paid')]" help="Done Invoices"/>
                      </group>
                      <newline/>
                      <group expand="0" string="Extended Filters..." groups="base.group_extended">
                      <group expand="1" string="Group By...">
                          <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                          <separator orientation="vertical"/>
--                          <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
--                          <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
--                                              <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
--                                              <separator orientation="vertical"/>
--                          <filter string="Day" icon="terp-go-month" 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="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
++                        <filter string="Category" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
++                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
++                        <separator orientation="vertical"/>
++                        <filter string="Day" icon="terp-go-month" 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'}"/>
                      </group>
                  </search>
              </field>
          </record>
--        
++
          <record id="view_report_account_invoice_graph" model="ir.ui.view">
               <field name="name">report.account.invoice.product.graph</field>
               <field name="model">report.account.invoice.product</field>
               <field name="type">graph</field>
               <field name="arch" type="xml">
                   <graph string="Invoice by Partner" type="pie">
--                      <field name="partner_id"/>
--                                      <field name="margin"/>
++                    <field name="partner_id"/>
++                    <field name="margin"/>
                   </graph>
               </field>
          </record>
--                
--              <record id="action_report_account_invoice_report" model="ir.actions.act_window">
--              <field name="name">Invoice Analysis</field>
--              <field name="res_model">report.account.invoice.product</field>
--              <field name="view_type">form</field>
--              <field name="view_mode">tree,graph</field>
--              <field name="context">{"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]}</field>
--              <field name="search_view_id" ref="view_report_account_invoice_filter"/>
++
++        <record id="action_report_account_invoice_report" model="ir.actions.act_window">
++            <field name="name">Invoice Analysis</field>
++            <field name="res_model">report.account.invoice.product</field>
++            <field name="view_type">form</field>
++            <field name="view_mode">tree,graph</field>
++            <field name="context">{"search_default_At Date":1,'group_by_no_leaf':1,'group_by':[]}</field>
++            <field name="search_view_id" ref="view_report_account_invoice_filter"/>
              <field name="help">This report gives you an overview of all the invoices generated by the system. You can sort and group your results by specific selection criteria to quickly find what you are looking for.</field>
--          </record>           
++        </record>
  
--              <menuitem name="Invoice Report" id="menu_report_account_invoice_product" parent="account.menu_finance_reporting"/>
++        <menuitem name="Invoice Report" id="menu_report_account_invoice_product" parent="account.menu_finance_reporting"/>
  
--              <menuitem name="Invoice" id="menu_report_account_invoice_reoirt" parent="menu_report_account_invoice_product" action="action_report_account_invoice_report" groups="account.group_account_manager"/>
--      </data>
++        <menuitem name="Invoice" id="menu_report_account_invoice_reoirt" parent="menu_report_account_invoice_product" action="action_report_account_invoice_report" groups="account.group_account_manager"/>
++    </data>
  </openerp>
              <field name="arch" type="xml">
                  <search string="Stock Moves">
                      <group>
-                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
-                         <separator orientation="vertical"/>
-                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
-                         <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
 -                      <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
 -                      <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
 +                        <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
++                        <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
+                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
 -                          <separator orientation="vertical"/>
++                        <separator orientation="vertical"/>
+                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                          <separator orientation="vertical"/>
                          <field name="product_id"/>
                          <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>