From ecd59426ae00db603fe8f48d9c4595e7c774731b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 22 Jun 2012 10:05:04 +0200
Subject: [PATCH] [MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20120622080504-bd0291ildonwdz82
---
 .../report/mail_message_report_view.xml.THIS  | 100 ------------------
 addons/share/res_users_view.xml               |   2 +-
 addons/stock/stock_view.xml                   |  15 +--
 addons/stock_planning/stock_planning_view.xml |   2 +-
 addons/subscription/subscription_view.xml     |   4 +-
 addons/survey/survey_view.xml                 |   8 +-
 6 files changed, 16 insertions(+), 115 deletions(-)
 delete mode 100644 addons/mail/report/mail_message_report_view.xml.THIS

diff --git a/addons/mail/report/mail_message_report_view.xml.THIS b/addons/mail/report/mail_message_report_view.xml.THIS
deleted file mode 100644
index 10c60a30cb0..00000000000
--- a/addons/mail/report/mail_message_report_view.xml.THIS
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- Latest Activities -->
-        <record model="ir.actions.act_window" id="action_latest_activities_tree">
-            <field name="name">Latest Activities</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!-- Mail message report search view  -->
-        <record id="view_mail_message_report_filter" model="ir.ui.view">
-            <field name="name">mail.message.report.select</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Mail message Analysis">
-                    <group>
-                        <field name="creation_date"/>
-                   </group>
-                   <newline/>
-                   <group  expand="1" string="Group By...">
-                        <filter string="Model" icon="terp-go-home" context="{'group_by':'res_model'}" />
-                            <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
-                        <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
-                  </group>
-               </search>
-            </field>
-        </record>
-
-        <!-- Mail message report Tree view  -->
-        <record id="view_mail_message_report_tree" model="ir.ui.view">
-            <field name="name">mail.message.report.tree</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-            <tree string="Mail message Analysis">
-                <field name="name" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="res_model" invisible="1"/>
-                <field name="nbr" />
-                <field name="creation_date" invisible="1"/>
-             </tree>
-            </field>
-       </record>
-
-        <!-- Monthly Activity per Document -->
-        <record id="board_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Monthly Activity per Document" type="bar">
-                	<field name="res_model"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_monthly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Monthly Activity per Document</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['res_model'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_mail_message_report_graph"></field>
-        </record>
-
-        <!-- Weekly Global Activity -->
-        <record id="board_weekly_mail_message_report_graph" model="ir.ui.view">
-            <field name="name">board.weekly.mail.message.report.graph</field>
-            <field name="model">mail.message.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Weekly Global Activity" type="bar">
-                	<field name="day"/>
-                	<field name="nbr" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        <record id="board_weekly_mail_message_report_action" model="ir.actions.act_window">
-            <field name="name">Weekly Global Activity</field>
-            <field name="res_model">mail.message.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]</field>
-            <field name="context">{'group_by':['day'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="board_weekly_mail_message_report_graph"></field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 3da6c47dec7..1d85857808e 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -30,7 +30,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <search string="Groups">
-                    <field name="name" filter_domain="[('name','ilike',self)]" string="Group"/>
+                    <field name="name" string="Group"/>
                     <separator orientation="vertical"/>
                     <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner"
                         domain="[('share','=',False)]"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 33343f24fa6..d2a7c2d90b2 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -78,7 +78,7 @@
             <field name="arch" type="xml">
                 <search string="Search Inventory">
                     <group>
-                        <field name="name" string="Inventory Reference" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Inventory Reference"/>
                         <separator orientation="vertical"/>
                         <field name="date"/>
                         <separator orientation="vertical"/>
@@ -288,6 +288,7 @@
                         <field name="name" string="Pack" filter_domain="['|',('name','ilike',self),('serial','ilike',self)]"/>
                         <separator orientation="vertical"/>
                         <field name="date" />
+                        <separator orientation="vertical"/>
                         <field name="active"/>
                     </group>
                 </search>
@@ -554,7 +555,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Locations">
-                    <field name="name" string="Stock Locations" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Stock Locations"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-home" name="in_location"
                         string="Internal" domain="[('usage', '=', 'internal')]" help="Internal Locations" />
@@ -1291,8 +1292,8 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
-                        <separator orientation="vertical"/>
+                        <field name="origin" string="Stock Moves"/>
+                        <separator orientation="vertical" groups="base.group_no_one"/>
                         <field name="date" groups="base.group_no_one"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
@@ -1478,7 +1479,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <field name="origin" string="Stock Moves"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
@@ -1509,7 +1510,7 @@
             <field name="arch" type="xml">
                 <search string="Stock Moves">
                     <group>
-                        <field name="origin" string="Stock Moves" filter_domain="[('origin','ilike',self)]"/>
+                        <field name="origin" string="Stock Moves"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
                         <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
@@ -1704,7 +1705,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Journal">
-                    <field name="name" string="Stock Journal" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Stock Journal"/>
                     <separator orientation="vertical"/>
                     <field name="user_id"/>
                 </search>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 617af7d68a7..60f8127165f 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -50,7 +50,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Stock Periods">
-                    <field name="name" string="Stock Periods" filter_domain="[('name','ilike',self)]"/>
+                    <field name="name" string="Stock Periods"/>
                     <separator orientation="vertical"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 90e16a698c2..e02ce3d07dd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -74,7 +74,7 @@
             <field name="arch" type="xml">
                 <search string="Search Subscription">
                     <group>
-                        <field name="name" string="Subscription" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Subscription"/>
                         <separator orientation="vertical"/>
                         <field name="date_init"/>
                         <separator orientation="vertical"/>
@@ -168,7 +168,7 @@
             <field name="arch" type="xml">
                 <search string="Subscription Document">
                     <group>
-                        <field name="name" string="Subscription Document" filter_domain="[('name','ilike',self)]"/>
+                        <field name="name" string="Subscription Document"/>
                         <separator orientation="vertical"/>
                         <field name="model"/>
                     </group>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 6c7a7f4a5e2..c50613f466b 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -258,7 +258,7 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
-                        <field name="title" string="Survey" filter_domain="[('title','ilike',self)]"/>
+                        <field name="title" string="Survey"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="All New Survey"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="All Open Survey"/>
@@ -473,7 +473,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Survey Page">
-                    <field name="title" string="Page" filter_domain="[('title','ilike',self)]"/>
+                    <field name="title" string="Page"/>
                     <separator orientation="vertical"/>
                     <field name="survey_id"/>
                     <newline/>
@@ -679,7 +679,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Question">
-                    <field name="question" string="Question" filter_domain="[('question','ilike',self)]"/>
+                    <field name="question" string="Question"/>
                     <separator orientation="vertical"/>
                     <field name="page_id"/>
                     <field name="survey" widget="selection"/>
@@ -1102,7 +1102,7 @@
             <field name="arch" type="xml">
                 <search string="Search Survey">
                    <group>
-                        <field name="email" string="Survey" filter_domain="[('email','ilike',self)]"/>
+                        <field name="email" string="Survey"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-gtk-media-pause" string="Waiting Answer" domain="[('state','=','waiting_answer')]"/>
                         <filter icon="terp-emblem-important" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>