diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 035c44ec4ed..501a50b96c2 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -249,7 +249,7 @@
                             <group>
                                 <group>
                                     <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                                    <field name="user_id" options='{"no_open": true}'/>
+                                    <field name="user_id"/>
                                     <field name="name" invisible="1"/>
                                     <field name="payment_term" widget="selection"/>
                                 </group>
@@ -385,7 +385,7 @@
                             <group col="4">
                                 <group>
                                     <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                                    <field name="user_id" groups="base.group_user" options='{"no_open": true}'/>
+                                    <field name="user_id" groups="base.group_user"/>
                                     <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
                                     <field name="period_id" domain="[('state', '=', 'draft')]"
                                         groups="account.group_account_manager"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 0b2a69ded7d..24d21cff3e8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -517,7 +517,7 @@
                         <page string="Advanced Settings">
                             <group>
                                 <group>
-                                    <field name="user_id" options='{"no_open": true}'/>
+                                    <field name="user_id"/>
                                     <field name="view_id" widget="selection"/>
                                     <field name="sequence_id" required="0"/>
                                 </group>
@@ -2638,7 +2638,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <group>
                         <group>
                             <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" domain="[('type', '=', 'cash')]" />
-                            <field name="user_id" readonly="1" string="Responsible" options='{"no_open": true}'/>
+                            <field name="user_id" readonly="1" string="Responsible"/>
                             <field name="total_entry_encoding"/>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
                         </group>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 0bc0cd0c3bb..3e2ba0fe5f3 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -31,7 +31,7 @@
                         <separator string="Conditions" colspan="4"/>
                         <field name="product_id"/>
                         <field name="partner_id"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="date_start"/>
                         <field name="date_stop"/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 50c0443b02a..cdc772ad65d 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -254,7 +254,7 @@
                     <group>
                         <field name="name"/>
                         <field name="date"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                     </group>
                     <group>
                         <field name="method_time"/>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index b4b8e7796c2..07f397c663f 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -249,7 +249,7 @@
                         <field name="name"/>
                         <field name="coda_data" filename="name"/>
                         <field name="date"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <separator string="Additional Information"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index dd9a78b261a..5395bcafb17 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -120,7 +120,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <field name="mode"/>
                         </group>
                         <group>
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 036fe7c29ff..9c6e89d1bda 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -90,7 +90,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='user_id']" position="replace">
-                    <field name="user_id"  required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)" options='{"no_open": true}'/>
+                    <field name="user_id"  required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
                 </xpath>
             </field>
         </record>
@@ -114,7 +114,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="/tree/field[@name='user_id']" position="replace">
-                    <field name="user_id"  required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)" options='{"no_open": true}'/>
+                    <field name="user_id"  required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 55c97760544..a61d5e21f3a 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -14,9 +14,9 @@
                 <form string="AuditTrail Rule" version="7.0">
                    <header>
                        <button string="_Subscribe" name="subscribe" icon="gtk-ok"
-                           type="object" states="draft" />
+                           type="object" states="draft"/>
                        <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
-                           type="object" states="subscribed" />
+                           type="object" states="subscribed"/>
                        <field name="state" widget="statusbar"/>
                    </header>
                  <sheet>
@@ -29,11 +29,11 @@
                         <field name="log_create"/>
                         <field name="log_action"/>
                         <field name="log_workflow"/>
-                        <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
-                        <field name="user_id" colspan="4" nolabel="1" options='{"no_open": true}'/>
+                        <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4"/>
+                        <field name="user_id" colspan="4" nolabel="1"/>
                         <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
-                   </sheet>  
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -44,15 +44,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state == 'subscribed'" string="AuditTrail Rules">
-                    <field name="name" />
+                    <field name="name"/>
                     <field name="object_id"/>
-                    <field name="log_read" />
-                    <field name="log_write" />
-                    <field name="log_unlink" />
-                    <field name="log_create" />
+                    <field name="log_read"/>
+                    <field name="log_write"/>
+                    <field name="log_unlink"/>
+                    <field name="log_create"/>
                     <field name="log_action"/>
                     <field name="log_workflow"/>
-                    <field name="state" />
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -97,7 +97,7 @@
                  <sheet>
                     <group col="4">
                         <field name="timestamp" required="1" readonly="1"/>
-                        <field name="user_id" readonly="1" options='{"no_open": true}'/>
+                        <field name="user_id" readonly="1"/>
                         <field name="method" readonly="1"/>
                         <field name="name" readonly="1"/>
                         <field name="res_id" readonly="1"/>
@@ -108,36 +108,36 @@
                         <form string="Log Lines" version="7.0">
                             <group col="4">
                             <field name="field_id" colspan="4"
-                                readonly="1" />
-                            <newline />
+                                readonly="1"/>
+                            <newline/>
                             <field name="field_description" colspan="4"
-                                readonly="1" />
-                            <newline />
+                                readonly="1"/>
+                            <newline/>
                             <separator string="Old Value : "
-                                colspan="2" />
+                                colspan="2"/>
                             <separator string="New Value : "
-                                colspan="2" />
-                            <newline />
+                                colspan="2"/>
+                            <newline/>
                             <field name="old_value" nolabel="1"
-                                colspan="2" readonly="1" />
+                                colspan="2" readonly="1"/>
                             <field name="new_value" nolabel="1"
-                                colspan="2" readonly="1" />
-                            <newline />
+                                colspan="2" readonly="1"/>
+                            <newline/>
                             <separator string="Old Value Text : "
-                                colspan="2" />
+                                colspan="2"/>
                             <separator string="New Value Text: "
-                                colspan="2" />
-                            <newline />
+                                colspan="2"/>
+                            <newline/>
                             <field name="old_value_text" nolabel="1"
-                                colspan="2" readonly="1" />
+                                colspan="2" readonly="1"/>
                             <field name="new_value_text" nolabel="1"
-                                colspan="2" readonly="1" />
+                                colspan="2" readonly="1"/>
                             </group>
                         </form>
                         <tree string="Log Lines">
-                            <field name="field_description" />
-                            <field name="old_value_text" />
-                            <field name="new_value_text" />
+                            <field name="field_description"/>
+                            <field name="old_value_text"/>
+                            <field name="new_value_text"/>
                         </tree>
                     </field>
                   </sheet>
@@ -151,11 +151,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="AuditTrail Logs">
-                    <field name="timestamp" />
-                    <field name="name" />
-                    <field name="object_id" />
-                    <field name="method" />
-                    <field name="user_id" />
+                    <field name="timestamp"/>
+                    <field name="name"/>
+                    <field name="object_id"/>
+                    <field name="method"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
@@ -185,7 +185,7 @@
             <field name="search_view_id" ref="view_audittrail_log_search"/>
         </record>
 
-        <menuitem id="menu_audit_logs" name="Audit Logs" parent="menu_audit" action="action_audittrail_log_tree" />
+        <menuitem id="menu_audit_logs" name="Audit Logs" parent="menu_audit" action="action_audittrail_log_tree"/>
 
     </data>
 </openerp>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 151d64f6370..0e12d835710 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -12,7 +12,7 @@
                     <header>
                         <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
                         <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
-                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                         <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
                         <field name="state" widget="statusbar"
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
@@ -20,36 +20,36 @@
                     <sheet>
 
                         <div class="oe_title">
-                            <label for="email" string="Invitation To" class="oe_edit_only" /> 
+                            <label for="email" string="Invitation To" class="oe_edit_only"/>
                             <h1>
-                                <field name="email" class="oe_inline" />
-                                (<field name="language" class="oe_inline" />)
+                                <field name="email" class="oe_inline"/>
+                                (<field name="language" class="oe_inline"/>)
                             </h1>
-                            
+
                             <h2>
-                                From <field name="event_date" class="oe_inline" />
+                                From <field name="event_date" class="oe_inline"/>
                                 to <field name="event_end_date" class="oe_inline"/>
                             </h2>
                         </div>
                         <group>
                             <group>
-                                <field name="sent_by_uid" string="Invitation From" />
-                                <field name="user_id" string="Invited User" options='{"no_open": true}'/>
-                                <field name="partner_id" string="Contact" />
+                                <field name="sent_by_uid" string="Invitation From"/>
+                                <field name="user_id" string="Invited User"/>
+                                <field name="partner_id" string="Contact"/>
                             </group>
                             <group>
-                                <field name="cutype" string="Invitation Type" />
-                                <field name="role" string="Role" />
-                                <field name="rsvp" />
+                                <field name="cutype" string="Invitation Type"/>
+                                <field name="role" string="Role"/>
+                                <field name="rsvp"/>
                                 <field name="ref" readonly="1"/>
                             </group>
                         </group>
                         <group>
                             <group string="Delegated From">
-                                <field name="parent_ids" readonly="1" nolabel="1" />
+                                <field name="parent_ids" readonly="1" nolabel="1"/>
                             </group>
                             <group string="Delegated To" >
-                                <field name="child_ids" readonly="1" nolabel="1" />
+                                <field name="child_ids" readonly="1" nolabel="1"/>
                             </group>
                         </group>
                     </sheet>
@@ -65,12 +65,12 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invitation details">
-                    <field name="sent_by_uid" string="Invitation From" />
+                    <field name="sent_by_uid" string="Invitation From"/>
                     <field name="role" string="My Role"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="cutype" string="Invitation Type"/>
-                    <field name="state" />
+                    <field name="state"/>
                     <field name="rsvp" string="Required to Join"/>
                 </tree>
             </field>
@@ -86,20 +86,20 @@
                 <search string="Search Invitations">
                     <field name="email" string="Email"/>
                     <field name="event_date"/>
-                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
-                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
-                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
-                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
+                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review"/>
+                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations"/>
+                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations"/>
+                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations"/>
                     <field name="user_id" string="Responsible"/>
                     <field name="cutype" string="Invitation type"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
-                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}" />
-                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}" />
-                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}" />
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}"/>
+                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}"/>
+                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
-                            domain="[]" context="{'group_by':'state'}" />
+                            domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
@@ -110,7 +110,7 @@
              <field name="res_model">calendar.attendee</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
+             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view"/>
              <field name="context">{'default_sent_by_uid': uid}</field>
          </record>
 
@@ -122,7 +122,7 @@
 
          <menuitem id="menu_attendee_invitations"
             parent="base.menu_calendar_configuration"
-            sequence="10" action="action_view_attendee_form" />
+            sequence="10" action="action_view_attendee_form"/>
 
         <!--        ALARM FORM VIEW-->
 
@@ -133,13 +133,13 @@
             <field name="arch" type="xml">
                 <form string="Reminder details" version="7.0">
                     <group col="4">
-                        <field name="name" />
-                        <field name="active" />
-                        <separator string="Reminder Details" colspan="4" />
-                        <field name="trigger_duration" />
-                        <field name="trigger_interval" />
-                        <field name="trigger_occurs" />
-                        <field name="trigger_related" />
+                        <field name="name"/>
+                        <field name="active"/>
+                        <separator string="Reminder Details" colspan="4"/>
+                        <field name="trigger_duration"/>
+                        <field name="trigger_interval"/>
+                        <field name="trigger_occurs"/>
+                        <field name="trigger_related"/>
                     </group>
                 </form>
             </field>
@@ -169,7 +169,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to setup a new alarm type. 
+                Click to setup a new alarm type.
               </p><p>
                 You can define a customized type of calendar alarm that may be
                 assigned to calendar events or meetings.
@@ -195,25 +195,25 @@
                 <header>
                     <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
                     <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
-                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object" />
+                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object"/>
                     <field name="state" widget="statusbar"
                         statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
                     <group col="6">
                         <field name="name" string="Summary"
-                            colspan="4" required="1" />
-                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" />
+                            colspan="4" required="1"/>
+                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)"/>
                         <newline/>
                         <field name="date" string="Start Date" required="1"
-                            on_change="onchange_dates(date,duration,False,allday)" />
+                            on_change="onchange_dates(date,duration,False,allday)"/>
                         <field name="duration" widget="float_time"
                             on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
                         <field name="date_deadline" string="End Date" required="1"
-                            on_change="onchange_dates(date,False,date_deadline)" />
-                        <field name="location" />
+                            on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="location"/>
                         <field name="alarm_id" string="Reminder"
-                            widget="selection" />
+                            widget="selection"/>
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
                            <field name="recurrency"/>
                         </group>
@@ -222,11 +222,11 @@
                     <page string="Event">
                         <group col="6" colspan="4">
                              <separator colspan="6" string="Visibility"/>
-                             <field name="user_id" string="Responsible User" options='{"no_open": true}'/>
+                             <field name="user_id" string="Responsible User"/>
                              <field name="show_as" string="Show Time as"/>
                              <field name="class" string="Privacy"/>
-                             <field name="recurrent_id" invisible="1" />
-                             <field name="recurrent_uid" invisible="1" />
+                             <field name="recurrent_id" invisible="1"/>
+                             <field name="recurrent_uid" invisible="1"/>
                         </group>
                         <separator string="Description"/>
                         <field name="description"/>
@@ -241,31 +241,31 @@
                             <tree string="Invitation details" editable="top">
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>
-                                <field name="email" />
-                                <field name="role" width="200" />
-                                <field name="state" />
+                                <field name="email"/>
+                                <field name="role" width="200"/>
+                                <field name="state"/>
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
                                     string="Uncertain" type="object"
-                                    icon="terp-crm" />
+                                    icon="terp-crm"/>
                                 <button name="do_accept" string="Accept"
                                     states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
+                                    type="object" icon="gtk-apply"/>
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
+                                    type="object" icon="gtk-cancel"/>
                                 <button
                                     name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                                     string="Delegate" type="action"
                                     icon="gtk-sort-descending"
                                     states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <group col="4">
-                                            <field name="email" />
+                                            <field name="email"/>
                                             <field name="rsvp"/>
                                             <field name="cutype"/>
                                             <field name="role"/>
@@ -276,24 +276,24 @@
                                                 states="needs-action,declined,accepted"
                                                 string="Uncertain"
                                                 type="object"
-                                                icon="terp-crm" />
+                                                icon="terp-crm"/>
                                             <button name="do_accept"
                                                 string="Accept"
                                                 states="needs-action,tentative,declined"
                                                 type="object"
-                                                icon="gtk-apply" />
+                                                icon="gtk-apply"/>
                                             <button name="do_decline"
                                                 string="Decline"
                                                 states="needs-action,tentative,accepted"
                                                 type="object"
-                                                icon="gtk-cancel" />
+                                                icon="gtk-cancel"/>
                                             <button
                                                 name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                                                 string="Delegate"
                                                 type="action"
                                                 icon="gtk-sort-descending"
                                                 states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                                         </group>
                                     </page>
                                     </notebook>
@@ -304,49 +304,49 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
-                                <field name="interval" />
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                                <field name="interval"/>
                                 <separator string="End of Recurrence" colspan="4"/>
-                                <field name="end_type" />
-                                <label string=" " colspan="2" />
-                                <newline />
+                                <field name="end_type"/>
+                                <label string=" " colspan="2"/>
+                                <newline/>
                                 <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
-                                <label string=" " colspan="2" />
-                                <newline />
+                                <label string=" " colspan="2"/>
+                                <newline/>
                                 <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
-                                <newline />
+                                <newline/>
 
 
                             </group>
                             <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                 <separator string="Choose day where repeat the meeting" colspan="8"/>
-                                <field name="mo" colspan="1" />
-                                <field name="tu" colspan="1" />
-                                <field name="we" colspan="1" />
-                                <field name="th" colspan="1" />
+                                <field name="mo" colspan="1"/>
+                                <field name="tu" colspan="1"/>
+                                <field name="we" colspan="1"/>
+                                <field name="th" colspan="1"/>
+                                <newline/>
+                                <field name="fr" colspan="1"/>
+                                <field name="sa" colspan="1" />
+                                <field name="su" colspan="1" />
                                 <newline/>
-                                <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  />
-                                <field name="su" colspan="1"  />
-                                <newline />
                             </group>
                             <group col="10" colspan="4"
                                 attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
                                 <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
                                 <group col="2" colspan="1">
-                                    <field name="select1" />
+                                    <field name="select1"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <field name="day"
                                         attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
+                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}"/>
                                 </group>
                                 <group col="3" colspan="1"
                                     attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
                                     <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
                                     <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
                                 </group>
                             </group>
                         </group>
@@ -366,11 +366,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Events">
-                    <field name="name" string="Subject" />
-                    <field name="date" string="Event Date" />
-                    <field name="location" />
-                    <field name="show_as" />
-                    <field name="class" string="Privacy" />
+                    <field name="name" string="Subject"/>
+                    <field name="date" string="Event Date"/>
+                    <field name="location"/>
+                    <field name="show_as"/>
+                    <field name="class" string="Privacy"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                 </tree>
@@ -404,16 +404,16 @@
                     <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
                     <field name="show_as"/>
                     <field name="class" string="Privacy"/>
-                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
+                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
                     <separator/>
-                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
+                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
-                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}"/>
+                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -435,7 +435,7 @@
 
         <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
-                sequence="15" action="action_view_event" />
+                sequence="15" action="action_view_event"/>
 
      </data>
  </openerp>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b0744f6a0c7..a97d2967ffa 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -91,7 +91,7 @@
                     <page string="Meeting Detail">
                         <group>
                             <group>
-                                <field name="user_id" options='{"no_open": true}'/>
+                                <field name="user_id"/>
                                 <field name="categ_ids" widget="many2many_tags"/>
                                 <field name="location"/>
                                 <field name="organizer" groups="base.group_no_one"/>
@@ -224,7 +224,7 @@
                                         <field name="role" />
                                     </group>
                                     <group>
-                                        <field name="user_id" options='{"no_open": true}'/>
+                                        <field name="user_id"/>
                                     </group>
                                 </group>
                             </form>
@@ -269,7 +269,7 @@
         <field name="arch" type="xml">
             <calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline" date_delay="duration">
                 <field name="name"/>
-                <field name="user_id" options='{"no_open": true}'/>
+                <field name="user_id"/>
             </calendar>
         </field>
     </record>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index eb89469ca19..a45a2231738 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -10,7 +10,7 @@
                 <form string="Calendar Collections" version="7.0">
                     <group col="4">
                         <field name="name" colspan="4"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="parent_id"/>
                         <field name="type"/>
                         <field name="calendar_collection"/>
@@ -84,7 +84,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="type"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="collection_id" required="1"/>
                         <field name="has_webcal" groups="base.group_no_one" />
                         <field name="calendar_color" groups="base.group_no_one" />
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index aedf601954f..fc20662a42a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -89,7 +89,7 @@
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to define a new sales tag. 
+                Click to define a new sales tag.
               </p><p>
                 Create specific tags that fit your company's activities
                 to better classify and analyse your leads and opportunities.
@@ -134,7 +134,7 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" type="object"  
+                    <button name="case_escalate" string="Escalate" type="object"
                             states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
                             states="cancel"/>
@@ -156,7 +156,7 @@
                     <group>
                         <group>
                             <field name="partner_name" string="Company Name"/>
-                            <field name="partner_id" string="Customer" 
+                            <field name="partner_id" string="Customer"
                                 on_change="on_change_partner(partner_id)" />
                             <label for="street" string="Address"/>
                             <div>
@@ -189,7 +189,7 @@
                             -->
                         </group>
                         <group>
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <field name="section_id"/>
                             <field name="type" invisible="1"/>
                         </group>
@@ -285,294 +285,280 @@
             </field>
         </record>
 
-    <!-- CRM Lead Kanban View  -->
-    <record model="ir.ui.view" id="crm_case_kanban_view_leads">
-        <field name="name">CRM - Leads Kanban</field>
-        <field name="model">crm.lead</field>
-        <field name="type">kanban</field>
-        <field name="arch" type="xml">
-            <kanban default_group_by="stage_id">
-                <field name="state" groups="base.group_no_one"/>
-                <field name="color"/>
-                <field name="priority"/>
-                <field name="planned_revenue" sum="Expected Revenues"/>
-                <field name="user_email"/>
-                <field name="user_id"/>
-                <field name="partner_address_email"/>
-                <field name="message_summary"/>
-                <field name="needaction_pending"/>
-                <templates>
-                    <t t-name="lead_details">
-                        <ul class="oe_kanban_tooltip">
-                            <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
-                            <li><b>Probability:</b> <field name="probability"/>%%</li>
-                            <li><b>Creation date:</b> <field name="create_date"/></li>
-                            <li t-if="record.date_deadline.raw_value"><b>Date Deadline:</b> <field name="date_deadline"/></li>
-                        </ul>
-                    </t>
-                    <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                <span class="oe_e">í</span>
-                                <ul class="oe_dropdown_menu">
-                                    <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
-                                    <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
-                                    <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
-                                    <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
-                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                </ul>
-                            </div>
-                            <div class="oe_kanban_content">
-                                <div>
-                                    <b><field name="name"/></b>
-                                    <t t-if="record.planned_revenue.raw_value">
-                                        - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
-                                        <field name="company_currency"/></b>
-                                    </t>
+        <!-- CRM Lead Kanban View  -->
+        <record model="ir.ui.view" id="crm_case_kanban_view_leads">
+            <field name="name">CRM - Leads Kanban</field>
+            <field name="model">crm.lead</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="stage_id">
+                    <field name="state" groups="base.group_no_one"/>
+                    <field name="color"/>
+                    <field name="priority"/>
+                    <field name="planned_revenue" sum="Expected Revenues"/>
+                    <field name="user_email"/>
+                    <field name="user_id"/>
+                    <field name="partner_address_email"/>
+                    <field name="message_summary"/>
+                    <field name="needaction_pending"/>
+                    <templates>
+                        <t t-name="lead_details">
+                            <ul class="oe_kanban_tooltip">
+                                <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
+                                <li><b>Probability:</b> <field name="probability"/>%%</li>
+                                <li><b>Creation date:</b> <field name="create_date"/></li>
+                                <li t-if="record.date_deadline.raw_value"><b>Date Deadline:</b> <field name="date_deadline"/></li>
+                            </ul>
+                        </t>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><a type="edit" >Edit...</a></li>
+                                        <li><a type="delete">Delete</a></li>
+                                        <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
+                                        <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
+                                        <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
                                 </div>
-                                <div>
-                                    <field name="partner_id"/>
-                                </div>
-                                <div style="padding-left: 0.5em">
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
-                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
-                                    <t t-if="record.date_action.raw_value"> : </t>
-                                    <field name="title_action"/>
-                                </div>
-                                <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
-                                    <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
-                                    <!--
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
-                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
-                                    -->
-                                    <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value and record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-                                </div>
-                                <div class="oe_kanban_footer_left">
-                                    <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
-                                    <t t-raw="record.message_summary.raw_value"/>
-                                </div>
-                            </div>
-                            <div class="oe_clear"></div>
-                        </div>
-                        <!--
-                            <div class="oe_kanban_right">
-                                <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
-                                <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
-                                <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
-                                <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
-                            </div>
-                        -->
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
-
-    <!-- CRM Lead Search View -->
-    <record id="view_crm_case_leads_filter" model="ir.ui.view">
-        <field name="name">CRM - Leads Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Leads">
-                <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
-                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                <field name="subjects"/>
-                <field name="create_date"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
-                <separator/>
-                <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
-                <separator/>
-                <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
-                <separator/>
-                <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
-                <field name="user_id"/>
-                <field name="section_id" context="{'invisible_section': False}"/>
-                <field name="country_id" context="{'invisible_country': False}"/>
-                <group expand="0" string="Group By...">
-                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                </group>
-                <group string="Display">
-                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
-                </group>
-           </search>
-        </field>
-    </record>
-
-
-    <!--
-        OPPORTUNITY
-        -->
-
-    <!-- Opportunities Form View -->
-    <record model="ir.ui.view" id="crm_case_form_view_oppor">
-        <field name="name">Opportunities</field>
-        <field name="model">crm.lead</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Opportunities" version="7.0">
-                <header>
-                    <button name="case_mark_won" string="Mark Won" type="object"
-                            states="open" class="oe_highlight"/>
-                    <button name="case_mark_won" string="Mark Won" type="object"
-                            states="draft,pending"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="open" />
-                    <button name="case_mark_lost" string="Mark Lost" type="object"
-                            states="draft,open"/>
-                    <button name="case_cancel" string="Cancel" type="object"
-                            states="draft"/>
-                    <field name="stage_id" widget="statusbar" clickable="True"/>
-                </header>
-                <sheet>
-                    <div class="oe_right oe_button_box">
-                        <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d"
-                            type="action"/>
-                        <button string="Meeting"
-                            name="action_makeMeeting"
-                            type="object"
-                            context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
-                            />
-                    </div>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="planned_revenue" class="oe_edit_only"/>
-                        <h2>
-                            <field name="planned_revenue" class="oe_inline"/>
-                            <field name="company_currency" class="oe_inline"/> at 
-                            <field name="probability" class="oe_inline" widget="integer"/>%% success rate
-                        </h2>
-                    </div>
-                    <group>
-                        <group>
-                            <field name="partner_id"
-                                on_change="onchange_partner_id(partner_id, email_from)"
-                                string="Customer"
-                                context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
-                            <field name="email_from" string="Email"/>
-                            <field name="phone"/>
-                        </group>
-
-                        <group>
-                            <label for="title_action"/>
-                            <div>
-                                <field name="date_action" nolabel="1"/> <label string="-" attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}"/>
-                                <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/>
-                            </div>
-                            <field name="date_deadline"/>
-                            <field name="priority"/>
-                        </group>
-
-                        <group>
-                            <field name="user_id" options='{"no_open": true}'/>
-                            <field name="section_id" colspan="1" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="categ_ids"
-                                string="Categories" widget="many2many_tags"
-                                domain="[('object_id.model', '=', 'crm.lead')]"/>
-
-                        </group>
-                    </group>
-
-                                    <!--<button string="Mail"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail':'new', 'model': 'crm.lead'}"
-                                        icon="terp-mail-message-new" type="action" />-->
-
-                    <notebook colspan="4">
-                    <page string="Internal Notes">
-                        <field name="description"/>
-                    </page>
-                    <page string="Lead">
-                        <group>
-                            <group>
-                                <field name="partner_name"/>
-                                <label for="street" string="Address"/>
-                                <div>
-                                    <field name="street" placeholder="Street..."/>
-                                    <field name="street2"/>
-                                    <div class="address_format">
-                                        <field name="city" placeholder="City" style="width: 40%%"/>
-<<<<<<< TREE
-                                        <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%" options='{"no_open": true}'/>
-=======
-                                        <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
->>>>>>> MERGE-SOURCE
-                                        <field name="zip" placeholder="ZIP" style="width: 34%%"/>
+                                <div class="oe_kanban_content">
+                                    <div>
+                                        <b><field name="name"/></b>
+                                        <t t-if="record.planned_revenue.raw_value">
+                                            - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
+                                            <field name="company_currency"/></b>
+                                        </t>
+                                    </div>
+                                    <div>
+                                        <field name="partner_id"/>
+                                    </div>
+                                    <div style="padding-left: 0.5em">
+                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                        <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                        <t t-if="record.date_action.raw_value"> : </t>
+                                        <field name="title_action"/>
+                                    </div>
+                                    <div class="oe_kanban_bottom_right">
+                                        <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+                                        <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
+                                        <!--
+                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
+                                        <span t-attf-class="oe_kanban_status #{red}"> </span>
+                                        -->
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value and record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                    </div>
+                                    <div class="oe_kanban_footer_left">
+                                        <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
+                                        <t t-raw="record.message_summary.raw_value"/>
                                     </div>
-                                    <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
                                 </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                            <!--
+                                <div class="oe_kanban_right">
+                                    <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
+                                    <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
+                                    <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
+                                    <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
+                                </div>
+                            -->
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <!-- CRM Lead Search View -->
+        <record id="view_crm_case_leads_filter" model="ir.ui.view">
+            <field name="name">CRM - Leads Search</field>
+            <field name="model">crm.lead</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Leads">
+                    <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
+                    <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
+                    <field name="subjects"/>
+                    <field name="create_date"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
+                    <separator/>
+                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
+                    <separator/>
+                    <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                    <field name="user_id"/>
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="country_id" context="{'invisible_country': False}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    </group>
+                    <group string="Display">
+                        <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+
+
+        <!--
+            OPPORTUNITY
+            -->
+
+        <!-- Opportunities Form View -->
+        <record model="ir.ui.view" id="crm_case_form_view_oppor">
+            <field name="name">Opportunities</field>
+            <field name="model">crm.lead</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <form string="Opportunities" version="7.0">
+                    <header>
+                        <button name="case_mark_won" string="Mark Won" type="object"
+                                states="open" class="oe_highlight"/>
+                        <button name="case_mark_won" string="Mark Won" type="object"
+                                states="draft,pending"/>
+                        <button name="case_escalate" string="Escalate" type="object"
+                                states="open" />
+                        <button name="case_mark_lost" string="Mark Lost" type="object"
+                                states="draft,open"/>
+                        <button name="case_cancel" string="Cancel" type="object"
+                                states="draft"/>
+                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_right oe_button_box">
+                            <button string="Schedule/Log Call"
+                                name="%(opportunity2phonecall_act)d"
+                                type="action"/>
+                            <button string="Meeting"
+                                name="action_makeMeeting"
+                                type="object"
+                                context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
+                                />
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name"/></h1>
+                            <label for="planned_revenue" class="oe_edit_only"/>
+                            <h2>
+                                <field name="planned_revenue" class="oe_inline"/>
+                                <field name="company_currency" class="oe_inline"/> at
+                                <field name="probability" class="oe_inline" widget="integer"/>%% success rate
+                            </h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="partner_id"
+                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    string="Customer"
+                                    context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
+                                <field name="email_from" string="Email"/>
+                                <field name="phone"/>
                             </group>
 
                             <group>
-                                <label for="contact_name" />
+                                <label for="title_action"/>
                                 <div>
-                                    <field name="contact_name" class="oe_inline"/>
-<<<<<<< TREE
-                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline oe_no_button" options='{"no_open": true}'/>
-=======
-                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
->>>>>>> MERGE-SOURCE
+                                    <field name="date_action" nolabel="1"/> <label string="-" attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}"/>
+                                    <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/>
                                 </div>
-                                <field name="function" />
-                                <field name="mobile"/>
-                                <field name="fax"/>
+                                <field name="date_deadline"/>
+                                <field name="priority"/>
                             </group>
 
-                            <group string="Categorization">
-                                <field name="type_id" widget="selection"/>
-                                <field name="channel_id" widget="selection"/>
+                            <group>
+                                <field name="user_id"/>
+                                <field name="section_id" colspan="1" widget="selection"/>
                             </group>
-                            <group string="Mailings">
-                                <field name="opt_out" />
-                            </group>
-                            <group string="Misc">
-                                <field name="active"/>
-                                <field name="day_open" groups="base.group_no_one"/>
-                                <field name="day_close" groups="base.group_no_one"/>
-                                <field name="referred"/>
-                                <field name="state" groups="base.group_no_one"/>
-                                <field name="type" invisible="1"/>
-                            </group>
-                            <group string="References">
-                                <field name="ref"/>
-                                <field name="ref2"/>
+                            <group>
+                                <field name="categ_ids"
+                                    string="Categories" widget="many2many_tags"
+                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
+
                             </group>
                         </group>
-                    </page>
-                    <page string="Fund Raising" groups="crm.group_fund_raising">
-                        <group>
-                            <field name="payment_mode" widget="selection"/>
-                            <field name="planned_cost"/>
-                        </group>
-                    </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
+
+                        <notebook colspan="4">
+                        <page string="Internal Notes">
+                            <field name="description"/>
+                        </page>
+                        <page string="Lead">
+                            <group>
+                                <group>
+                                    <field name="partner_name"/>
+                                    <label for="street" string="Address"/>
+                                    <div>
+                                        <field name="street" placeholder="Street..."/>
+                                        <field name="street2"/>
+                                        <div class="address_format">
+                                            <field name="city" placeholder="City" style="width: 40%%"/>
+                                            <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                            <field name="zip" placeholder="ZIP" style="width: 34%%"/>
+                                        </div>
+                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                    </div>
+                                </group>
+
+                                <group>
+                                    <label for="contact_name" />
+                                    <div>
+                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
+                                    </div>
+                                    <field name="function" />
+                                    <field name="mobile"/>
+                                    <field name="fax"/>
+                                </group>
+
+                                <group string="Categorization">
+                                    <field name="type_id" widget="selection"/>
+                                    <field name="channel_id" widget="selection"/>
+                                </group>
+                                <group string="Mailings">
+                                    <field name="opt_out" />
+                                </group>
+                                <group string="Misc">
+                                    <field name="active"/>
+                                    <field name="day_open" groups="base.group_no_one"/>
+                                    <field name="day_close" groups="base.group_no_one"/>
+                                    <field name="referred"/>
+                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="type" invisible="1"/>
+                                </group>
+                                <group string="References">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Fund Raising" groups="crm.group_fund_raising">
+                            <group>
+                                <field name="payment_mode" widget="selection"/>
+                                <field name="planned_cost"/>
+                            </group>
+                        </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
 
         <!-- Opportunities Tree View -->
         <record model="ir.ui.view" id="crm_case_tree_view_oppor">
@@ -604,48 +590,48 @@
         </record>
 
 
-    <!-- Opportunities Search View -->
-    <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
-        <field name="name">CRM - Opportunities Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Opportunities">
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
-                <separator/>
-                <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
-                <separator/>
-                <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
-                <separator/>
-                <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
-                <field name="user_id"/>
-                <field name="country_id"/>
-                <field name="partner_id"/>
-                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
-                <group expand="0" string="Group By..." colspan="16">
-                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                    <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                    <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                    <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
-                </group>
-                <group string="Display">
-                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
-                </group>
-            </search>
-        </field>
-    </record>
+        <!-- Opportunities Search View -->
+        <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
+            <field name="name">CRM - Opportunities Search</field>
+            <field name="model">crm.lead</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Opportunities">
+                    <field name="name" string="Opportunity / Customer"
+                        filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
+                    <separator/>
+                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
+                    <separator/>
+                    <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
+                            help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                    <field name="user_id"/>
+                    <field name="country_id"/>
+                    <field name="partner_id"/>
+                    <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <group expand="0" string="Group By..." colspan="16">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
+                    </group>
+                    <group string="Display">
+                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 1dfd4cc0857..a0bd8326562 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -14,9 +14,9 @@
     <record id="action_crm_phonecall_unread" model="ir.values">
         <field name="name">action_crm_phonecall_unread</field>
         <field name="action_id" ref="actions_server_crm_phonecall_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_unread'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_unread'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall" />
+        <field name="model_id" ref="model_crm_phonecall"/>
         <field name="model">crm.phonecall</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -32,9 +32,9 @@
     <record id="action_crm_phonecall_read" model="ir.values">
         <field name="name">action_crm_phonecall_read</field>
         <field name="action_id" ref="actions_server_crm_phonecall_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_read'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_read'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall" />
+        <field name="model_id" ref="model_crm_phonecall"/>
         <field name="model">crm.phonecall</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -82,10 +82,10 @@
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
                     icon="gtk-index"
-                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                 <button string="Meeting"
                     states="open,pending" icon="gtk-redo"
-                     name="action_make_meeting" type="object" />
+                     name="action_make_meeting" type="object"/>
                 <field name="state"/>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
@@ -115,14 +115,14 @@
                 <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}" />
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}"/>
                 <button string="Convert to Opportunity" class="oe_highlight"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}" />
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}"/>
                 <button string="Schedule Other Call"
                         name="%(phonecall_to_phonecall_act)d"
-                        type="action"  />
+                        type="action"/>
                 <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending"/>
@@ -131,28 +131,28 @@
             <sheet string="Phone Call">
                   <div class="oe_title">
                       <div class="oe_edit_only">
-                          <label for="name" string="Title"/> 
+                          <label for="name" string="Title"/>
                       </div>
                       <h1><field name="name" required="1"/></h1>
                       <div class="oe_edit_only">
-                        <label for="partner_phone" string="Phone" />
+                        <label for="partner_phone" string="Phone"/>
                       </div>
                       <h2><field name="partner_phone"/></h2>
                   </div>
                  <group col="4">
-                    <field name="date" />
-                    <field name="user_id" options='{"no_open": true}'/>
-                    <field name="duration" widget="float_time" />
-                    <field name="section_id" colspan="1" widget="selection" />
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="duration" widget="float_time"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                     <field name="categ_id" widget="selection"
                         domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="partner_mobile" />
+                    <field name="partner_mobile"/>
                     <field name="priority"/>
                     <field name="opportunity_id"/>
                 </group>
 
-                <field name="description" placeholder="Description..." />
+                <field name="description" placeholder="Description..."/>
             </sheet>
             <div class="oe_chatter">
                 <field name="message_ids" widget="mail_thread"/>
@@ -186,15 +186,15 @@
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
-                    type="action"  />
+                    type="action"/>
                 <button string="Meeting"
                      icon="gtk-redo"
-                     name="action_make_meeting" type="object" />
+                     name="action_make_meeting" type="object"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
                     icon="gtk-index"
-                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
             </tree>
         </field>
     </record>
@@ -230,15 +230,15 @@
                <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="Phone Calls that are assigned to me or to my team(s)" />
+                       help="Phone Calls that are assigned to me or to my team(s)"/>
                <field name="partner_id"/>
                <field name="user_id"/>
                <field name="section_id" string="Sales Team"/>
                <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'}" />
-                   <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" />
+                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                   <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                   <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>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 8d6f37340f5..eaed4564424 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -120,7 +120,7 @@
             <form string="Cases by Team and Stage">
                 <field name="name"/>
                 <field name="month"/>
-                <field name="user_id" options='{"no_open": true}'/>
+                <field name="user_id"/>
                 <field name="section_id"  widget="selection"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
@@ -204,7 +204,7 @@
             <form string="Cases by Section, Category and Stage">
                 <field name="name"/>
                 <field name="month"/>
-                <field name="user_id" options='{"no_open": true}'/>
+                <field name="user_id"/>
                 <field name="section_id"  widget="selection"/>
                 <field name="categ_id"/>
                 <field name="stage_id"/>
@@ -289,7 +289,7 @@
             <form string="Cases by Section, Category and Type">
                 <field name="name"/>
                 <field name="month"/>
-                <field name="user_id" options='{"no_open": true}'/>
+                <field name="user_id"/>
                 <field name="section_id"  widget="selection"/>
                 <field name="categ_id"/>
                 <field name="category2_id"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b1da9746aac..d2a5c78729e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -91,7 +91,7 @@
                         </group>
                         
                         <group>
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <field name="resource_calendar_id"/>
                             <field name="active"/>
                         </group>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 6098fe0779a..3e7b1dc0bab 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,5 +1,7 @@
+<?xml version="1.0"?>
 <openerp>
     <data>
+
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
             <field name="name">crm.lead2opportunity.partner.form</field>
             <field name="model">crm.lead2opportunity.partner</field>
@@ -16,20 +18,20 @@
                     <separator string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}"/>
                     <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
                         <tree>
-                            <field name="name" />
-                            <field name="partner_id" />
-                            <field name="user_id" options='{"no_open": true}'/>
-                            <field name="section_id" />
+                            <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="user_id"/>
+                            <field name="section_id"/>
                         </tree>
                     </field>
                     <footer>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
-        </record> 
+        </record>
 
         <record id="view_crm_lead2opportunity_partner_mass" model="ir.ui.view">
             <field name="name">crm.lead2opportunity.partner.mass.form</field>
@@ -40,18 +42,18 @@
                     <field name="action"/>
                     <field name="name" colspan="4"/>
                     <group string="Assigned Opportunities to">
-                        <field name="section_id" />
+                        <field name="section_id"/>
                     </group>
                     <separator string="Select Salesman"/>
                     <field name="user_ids">
                         <tree>
-                            <field name="name" />
+                            <field name="name"/>
                         </tree>
                     </field>
                     <footer>
                         <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
@@ -65,13 +67,13 @@
             <field name="view_id" ref="view_crm_lead2opportunity_partner"/>
             <field name="target">new</field>
         </record>
-           
-          <act_window id="action_crm_send_mass_convert"
+
+        <act_window id="action_crm_send_mass_convert"
             multi="True"
             key2="client_action_multi" name="Convert opportunities"
             res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
-            view_id="view_crm_lead2opportunity_partner_mass"/> 
+            view_id="view_crm_lead2opportunity_partner_mass"/>
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 6bc4feff3b6..e10272a1635 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -13,16 +13,16 @@
                     <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
-                            <field name="name" />
-                            <field name="partner_id" />
-                            <field name="user_id" options='{"no_open": true}'/>
-                            <field name="section_id" />
+                            <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="user_id"/>
+                            <field name="section_id"/>
                         </tree>
                     </field>
                     <footer>
                         <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
@@ -43,7 +43,7 @@
             multi="True"
             key2="client_action_multi" name="Merge Opportunities"
             res_model="crm.merge.opportunity" src_model="crm.lead"
-            view_mode="form" target="new" view_type="form" />
+            view_mode="form" target="new" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 92ecfa312e3..ccabcde88fe 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -23,7 +23,7 @@
                             domain="[('object_id.model', '=', 'crm.phonecall')]"
                             groups="base.group_no_one"/>
                             <field name="phone"/>
-                            <field name="user_id" attrs="{'invisible': [('action','=','log')]}" options='{"no_open": true}'/>
+                            <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
                             <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
                         </group>
                     </group>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 4fb54d731d4..dd8006c7990 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -15,7 +15,7 @@
                         <field name="name"/>
                         <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                         <field name="partner_id" readonly="True"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="section_id"/>
                     </group>
                     <footer>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index da3d20424a7..930c08408cd 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -131,7 +131,7 @@
                         <field name="date"/>
                     </group>
                     <group colspan="4" col="6">
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="section_id" widget="selection"/>
                         <field name="state" groups="base.group_no_one"/>
                         <newline/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index c23ca566f9f..0fb0cbf825f 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -50,7 +50,7 @@
                     <group col="4" class="oe_header">
                         <field name="name" string="Query"/>
                         <field name="section_id" widget="selection"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="date"/>
                         <field name="date_deadline"/>
                     </group>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 8c89297f8ec..f15f104f1c1 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -2,27 +2,26 @@
 <openerp>
     <data>
 
-
         <record model="ir.ui.view" id="crm_lead_forward_to_partner_form">
             <field name="name">crm_lead_forward_to_partner</field>
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <separator string="Forward to Partner" colspan="4" />
+                    <separator string="Forward to Partner" colspan="4"/>
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
-                        <field name="send_to" colspan="2" />
+                        <field name="send_to" colspan="2"/>
                         <group col="2" colspan="2" attrs="{ 'invisible' : [('send_to','!=','user')]}">
                             <field name="user_id"
                                 attrs="{ 'required' : [('send_to','=','user')]}"
-                                on_change="on_change_email(user_id)" options='{"no_open": true}'/>
+                                on_change="on_change_email(user_id)"/>
                         </group>
                         <group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
-                            <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
+                            <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2"/>
                         </group>
                     </group>
-                    <separator string="" colspan="4" />
+                    <separator string="" colspan="4"/>
                     <group col="6" colspan="4">
                         <field name="email_from" colspan="4" required="1"/>
                         <field name="email_to" colspan="4" required="1"/>
@@ -44,7 +43,7 @@
                     <footer>
                         <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
@@ -60,7 +59,7 @@
         </record>
 
 
-        
+
         <act_window id="action_crm_send_mass_forward"
             multi="True"
             key2="client_action_multi" name="Mass forward to partner"
@@ -68,7 +67,7 @@
             view_mode="form" target="new" view_type="form"
             context="{'mail.compose.message.mode' : 'mass_mail'}"
             view_id="crm_lead_forward_to_partner_form"
-        />
+       />
 
 
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 3a9963c56c2..92d07751e24 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <openerp>
 <data>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/>
@@ -11,7 +12,7 @@
                 <group col="4">
                     <field name="name" colspan="4"/>
                     <field name="type"/>
-                    <field name="user_id" options='{"no_open": true}'/>
+                    <field name="user_id"/>
                     <field name="online"/>
                     <field name="readonly"/>
                 </group>
@@ -73,7 +74,7 @@
                     <field name="name"/>
                     <field name="parent_id"/>
                     <field name="storage_id"/>
-                    <field name="user_id" options='{"no_open": true}'/>
+                    <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <notebook colspan="4">
@@ -235,7 +236,7 @@
         <field name="inherit_id" ref="base.view_attachment_form"/>
         <field name="arch" type="xml">
             <field name="url" position="after">
-                <field name="user_id" options='{"no_open": true}'/>
+                <field name="user_id"/>
             </field>
             <field name="company_id" position="before">
                 <field name="parent_id"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 02f996c6aac..f3a0c5b321e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -477,7 +477,7 @@
                             </group>
                             <group>
                                 <field name="nb_register"/>
-                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}" options='{"no_open": true}'/>
+                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                             </group>
                             <group groups="base.group_no_one">
                                 <field name="create_date"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ff789c55c5a..5d34d428726 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -43,7 +43,7 @@
                                     <group>
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
                                         <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                        <field name="user_id" on_change="onchange_user(user_id)" options='{"no_open": true}'/>
+                                        <field name="user_id" on_change="onchange_user(user_id)"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 70a272009fc..6d54e6278b1 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -180,7 +180,7 @@
                                     <group>
                                         <field name="survey_id"/>
                                         <field name="user_to_review_id"/>
-                                        <field name="user_id" string="Interviewer" options='{"no_open": true}'/>
+                                        <field name="user_id" string="Interviewer"/>
                                     </group>
                                     <group>              
                                         <field name="date_deadline"/>
@@ -289,7 +289,7 @@
                             <group>
                                 <field name="survey_id"/>
                                 <field name="user_to_review_id"/>
-                                <field name="user_id" string="Interviewer" options='{"no_open": true}'/>
+                                <field name="user_id" string="Interviewer"/>
                             </group>
                             <group>
                                 <field name="date_deadline"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index cfeac11ebff..d72db953fd1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -144,7 +144,7 @@
                         <field name="type_id" placeholder="Degree"/>
                     </group>
                     <group>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <label for="title_action"/>
                         <div>
                             <field name="date_action"/> -
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 08ff71b24fa..895474e9d7f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -31,7 +31,7 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": true}'/>
+                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
                         </group>
                         <group>
                             <field name="date" on_change="on_change_date(date)"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index be9df2cbc1a..5048f2c9193 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -100,7 +100,7 @@
                 <form string="Timesheet by user">
                     <field name="name"/>
                     <field name="month"/>
-                    <field name="user_id" options='{"no_open": true}'/>
+                    <field name="user_id"/>
                 </form>
             </field>
         </record>
@@ -177,7 +177,7 @@
                 <form string="Timesheet by invoice">
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="manager_id"/>
-                    <field name="user_id" options='{"no_open": true}'/>
+                    <field name="user_id"/>
                 </form>
             </field>
         </record>
@@ -256,7 +256,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="user_id" options='{"no_open": true}'/>
+                    <field name="user_id"/>
                     <field name="quantity"/>
                 </form>
             </field>
@@ -322,7 +322,7 @@
                     <field name="name"/>
                     <field name="month"/>
                     <field name="account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="user_id" options='{"no_open": true}'/>
+                    <field name="user_id"/>
                     <field name="quantity"/>
                 </form>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 45cee05de2e..aa81b715e55 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -71,7 +71,7 @@
                             <field name="total_attendance" widget="float_time"/>
                             <field name="total_timesheet" widget="float_time"/>
                             <field name="total_difference" widget="float_time"/>
-                            <field name="user_id" invisible="1" options='{"no_open": true}'/>
+                            <field name="user_id" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -130,7 +130,7 @@
                                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
                                     <field name="amount"/>
                                     <field name="general_account_id"/>
-                                    <field name="user_id" required="1" options='{"no_open": true}'/>
+                                    <field name="user_id" required="1"/>
                                 </form>
                             </field>
                         </page>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index cccbb6913da..d953dfbd1a9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -38,7 +38,7 @@
                             <field name="category"/>
                         </group>
                         <group>
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <field name="cashmove"/>
                             <field name="date"/>
                         </group>
@@ -352,7 +352,7 @@
                 <form string="Box Amount by User" version="7.0">
                  <sheet>
                     <group col="4">
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="box"/>
                         <field name="amount"/>
                     </group>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 5acfdee1852..b967035bec3 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -30,7 +30,7 @@
                         <group>
                             <group>
                                 <field name="subject"/>
-                                <field name="user_id" options='{"no_open": true}'/>
+                                <field name="user_id"/>
                                 <field name="date"/>
                                 <field name="type"/>
                                 <field name="content_subtype"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 25c17be2b63..708e60e818b 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -690,7 +690,7 @@
                             <field name="origin"/>
                         </group>
                         <group>
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">
                                 <field name="product_uos_qty" class="oe_inline"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 17551b4ee3c..958d1465a6f 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -84,7 +84,7 @@
                             <group string="General Information">
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="shop_id" widget="selection"/>
-                                <field name="user_id" options='{"no_open": true}'/>
+                                <field name="user_id"/>
                                 <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
                                 <field name="picking_id" readonly="1"/>
                             </group>
@@ -260,7 +260,7 @@
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="journal_id"/>
                         <field name="jl_id"/>
                         <field name="date_create" widget="date"/>
@@ -356,7 +356,7 @@
                         <field name="date_order" widget="date"/>
                         <field name="qty"/>
                         <field name="amount"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                     </group>
                 </form>
             </field>
@@ -424,7 +424,7 @@
                         <field name="date_order" widget="date"/>
                         <field name="qty"/>
                         <field name="amount"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                     </group>
                 </form>
             </field>
@@ -489,7 +489,7 @@
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="product_name"/>
                         <field name="date_order" widget="date"/>
                         <field name="qty"/>
@@ -558,7 +558,7 @@
             <field name="arch" type="xml">
                 <form string="POS " version="7.0">
                     <group col="4">
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="product_name"/>
                         <field name="date_order" widget="date"/>
                         <field name="qty"/>
@@ -916,8 +916,8 @@
                             <button name="open_frontend_cb" type="object" string="Open Point Of Sale" states="opened" />
             			</group>
                         <newline/>
-                        <field name="user_id" options='{"no_open": true}'/>
-                        <field name="name" />
+                        <field name="user_id"/>
+                        <field name="name"/>
                         <newline/>
                         <field name="start_at" attrs="{'insivible' : [('state', '=', 'opening_control')]}"/>
                         <field name="stop_at" attrs="{'insivible' : [('state', '=', 'opening_control')]}"/>
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 09da7641f3a..23ee2b92aaa 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -13,16 +13,16 @@
                     <field name="journal_id"/>
                     <field name="product_id"/>
                     <field name="amount"/>
-                    <field name="session_id" />
+                    <field name="session_id"/>
                     <field name="name"/>
-                    <field name="user_id" invisible="1" options='{"no_open": true}'/>
+                    <field name="user_id" invisible="1"/>
                     <separator colspan="4"/>
                     <group colspan="4" col="4">
                         <group col="2" colspan="2"/>
                          <button icon="gtk-stop" special="cancel"
-                            string="Cancel" />
+                            string="Cancel"/>
                         <button name="get_in" string="Put Money"
-                            colspan="1" type="object" icon="gtk-apply" />
+                            colspan="1" type="object" icon="gtk-apply"/>
                     </group>
                 </form>
             </field>
@@ -34,7 +34,7 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
-            id="action_box_entries" />
+            id="action_box_entries"/>
 
         <act_window name="Put Money In"
             res_model="pos.box.entries"
@@ -42,7 +42,7 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
-            id="action_pos_session_box_entries" />
+            id="action_pos_session_box_entries"/>
 
 
     </data>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index d2076e2d55b..1fed5b567b0 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -15,7 +15,7 @@
                     <field name="amount"/>
                     <field name="session_id" />
                     <field name="name"/>
-                    <field name="user_id" invisible="1" options='{"no_open": true}'/>
+                    <field name="user_id" invisible="1" />
                     <separator colspan="4"/>
                     <group colspan="4" col="4">
                         <group col="2" colspan="2"/>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
index dacc68d19f3..850ae6729a6 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Sale by User" version="7.0">
                     <group>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                     </group>
                     <footer>
                         <button name="print_report" string="Print Report" type="object" icon="gtk-print" class="oe_highlight"/>
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index 676851a3e2c..74299505567 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -17,7 +17,7 @@
                     <group col="4">
                         <field name="date_start"/>
                         <field name="date_end"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 015394c1822..f65c8acf9f0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -88,7 +88,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" options='{"no_open": true}'/>
+                            <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
                             <field name="privacy_visibility"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 562cc05b5a9..4bd7e4b5b1d 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -18,7 +18,7 @@
                             <field name="new_task_description" colspan="2" nolabel="1"/>
                         </group>
                         <group>
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <separator string="Validation Task" colspan="2"/>
                             <field name="prefix" string="Validation Task Title"/>
                             <field name="planned_hours_me"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c38856f4144..de52ec8d033 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -115,7 +115,7 @@
                     <h1><field name="name"/></h1>
                     <group>
                         <group>
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
                         </group>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 89b65443b9e..3b814cbab6e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -36,7 +36,7 @@
             <field name="arch" type="xml">
                 <form string="Project User Allocation" version="7.0">
                     <group col="4">
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="phase_id"/>
                         <field name="project_id"/>
                         <field name="date_start"/>
@@ -172,7 +172,7 @@
                                   </tree>
                                   <form string="Project Users" version="7.0">
                                       <group col="4">
-                                          <field name="user_id" options='{"no_open": true}'/>
+                                          <field name="user_id"/>
                                           <field name="date_start"/>
                                           <field name="date_end"/>
                                       </group>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index fdd7cdc9333..797494e9442 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -51,7 +51,7 @@
                 </h1>
                 <group>
                     <group>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="exclusive"/>
                     </group>
                     <group>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 377db8992ed..5b388469f3c 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -170,7 +170,7 @@
                    <group>
                       <group>
                         <field name="name"/>
-                        <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}" options='{"no_open": true}'/>
+                        <field name="user_id" attrs="{'required':[('resource_type','=','user')], 'readonly':[('resource_type','=','material')]}"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="active"/>
                        </group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4ffcf844fdd..2257240dd10 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -315,7 +315,7 @@
                                     <field name="invoice_quantity" invisible="True"/>
                                 </group>
                                 <group groups="base.group_user">
-                                    <field name="user_id" options='{"no_open": true}'/>
+                                    <field name="user_id"/>
                                     <field groups="base.group_no_one" name="origin"/>
                                 </group>
                                 <group name="sale_pay">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8f4b90e2bb5..ff9a295ff04 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1728,7 +1728,7 @@
                 <form string="Stock Journal" version="7.0">
                     <group>
                         <field name="name"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index ff1d6fe1eaa..8c1cb0d2c80 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -103,7 +103,7 @@
                             <field name="active_uom" invisible = "True" />
                         </group>
                         <group colspan = "2" col="2" >
-                            <field name="user_id" options='{"no_open": true}'/>
+                            <field name="user_id"/>
                             <field name="product_amt" on_change="product_amt_change(product_amt, product_uom, product_id)" />
                             <field name="product_qty"  />
                         </group>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index c5157f7286b..8b9be319ea6 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -20,7 +20,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="partner_id"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id"/>
                         <field name="active"/>
                     </group>
                     <notebook>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index d4145bd6e8d..19f2139d187 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -235,7 +235,7 @@
                                 </tree>
                                 <form string="History">
                                     <field name="date"/>
-                                    <field name="user_id" options='{"no_open": true}'/>
+                                    <field name="user_id"/>
                                 </form>
                            </field>
                         </page>
@@ -1034,7 +1034,7 @@
                 <form string="Survey Answer">
                     <field name="survey_id"/>
                     <field name="date_create"/>
-                    <field name="user_id" options='{"no_open": true}'/>
+                    <field name="user_id"/>
                     <field name="response_type"/>
                     <field name="question_ids" nolabel="1" colspan="4" />
                     <field name="state"/>
@@ -1153,7 +1153,7 @@
                     <group class="oe_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
-                    <field name="user_id" on_change="on_change_user(user_id)" options='{"no_open": true}'/>
+                    <field name="user_id" on_change="on_change_user(user_id)"/>
                      <field name="response" readonly="1"/>
                     </group>
                     </sheet>