diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 4c6faae9e19..50e431935bc 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -19,26 +19,26 @@
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
           </xpath>
-		  <xpath expr="//button[@string='Install Modules']" position="attributes">
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
                 <attribute name="string">Configure</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>23</attribute>
               <attribute name='string'></attribute>
-	      </xpath>
-	      <group colspan="8">
-	      <group colspan="4" height="450" width="600">
+          </xpath>
+          <group colspan="8">
+          <group colspan="4" height="450" width="600">
             <field name="charts"/>
              <group colspan="4">
-            	<separator col="4" colspan="4" string="Configure Fiscal Year"/>
+                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                 <field name="date_stop"/>
                 <field name="period" colspan="4"/>
             </group>
              <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-            	<separator col="4" colspan="4" string="Bank and Cost Account"/>
-            	 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-            	 	<form string="">
+                <separator col="4" colspan="4" string="Bank and Cost Account"/>
+                 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+                     <form string="">
                       <field name="acc_name"/>
                       <field name="account_type"/>
                       <field name="currency_id" widget="selection"/>
@@ -51,15 +51,15 @@
                   </field>
             </group>
             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-            	<field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
-            	<field name="purchase_tax" colspan="2" />
+                <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
+                <field name="purchase_tax" colspan="2" />
             </group>
             <group colspan="4" groups="base.group_extended">
-            	<separator col="4" colspan="4" string="Install Extra Account Module"/>
-            	<field name="account_analytic_plans"/>
-            	<field name="account_payment"/>
-            	<field name="account_followup"/>
-            	<field name="account_asset"/>
+                <separator col="4" colspan="4" string="Install Extra Account Module"/>
+                <field name="account_analytic_plans"/>
+                <field name="account_payment"/>
+                <field name="account_followup"/>
+                <field name="account_asset"/>
             </group>
           </group>
           </group>
@@ -88,12 +88,12 @@
         <field name="name">account_installer_action_replace</field>
         <field name="type">tree</field>
         <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-  		<field name="arch" type="xml">
-  		  <xpath expr="//button[@string='Launch']" position="replace">
-        	<button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+          <field name="arch" type="xml">
+            <xpath expr="//button[@string='Launch']" position="replace">
+            <button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
       </xpath>
         </field>
-	</record>
+    </record>
 
   </data>
 </openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2fdb2c5fd07..1b9e166ac81 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1496,7 +1496,7 @@
 
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
-		<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>
@@ -1752,17 +1752,17 @@
                   <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
                 </form>
                 <separator string="title" position="attributes">
-            	<attribute name="string"
+                <attribute name="string"
                        >Generate Chart of Accounts from a Chart Template</attribute>
-          		</separator>
-          		<xpath expr="//label[@string='description']" position="attributes">
-            		<attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
-            		<attribute name="width">150</attribute>
-          		</xpath>
-          		<xpath expr='//separator[@string="vsep"]' position='attributes'>
-              			<attribute name='rowspan'>15</attribute>
-              			<attribute name='string'></attribute>
-	      		</xpath>
+                  </separator>
+                  <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
+                    <attribute name="width">150</attribute>
+                  </xpath>
+                  <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                          <attribute name='rowspan'>15</attribute>
+                          <attribute name='string'></attribute>
+                  </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="company_id"  widget="selection"
                          />
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a86a3e662d1..56e45c9ccf9 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -103,7 +103,7 @@
                        separator="1" help="Declined Invitations" />
                    <separator orientation="vertical"/>
                    <field name="email" select='1'/>
-                   <field name="sent_by_uid" select="1" widget="selection"/>
+                   <field name="sent_by_uid" select="1"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
@@ -391,7 +391,7 @@
                            <field name="name" select="1" string="Summary"/>
                            <field name="location" select="1" string="Location"/>
                            <separator orientation="vertical"/>
-                           <field name="user_id" select="1" widget="selection"/>
+                           <field name="user_id" select="1"/>
                            <separator orientation="vertical"/>
                            <field name="show_as" select="1"/>
                            <field name="class" select="1"/>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index 2d6b400d2c5..5ec9be53d76 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -10,45 +10,45 @@
           <form position="attributes">
             <attribute name="string">Main Company Setup</attribute>
           </form>
-		  <xpath expr="//label[@string='description']" position="attributes">
-	            <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
-	      </xpath>
-	      <xpath expr='//separator[@string="title"]' position='attributes'>
-	          	  <attribute name='string'>Configure Your Company</attribute>
-	      </xpath>
-	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>25</attribute>
-	          	  <attribute name='string'></attribute>
-	      </xpath>
+          <xpath expr="//label[@string='description']" position="attributes">
+                <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="title"]' position='attributes'>
+                    <attribute name='string'>Configure Your Company</attribute>
+          </xpath>
+          <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                    <attribute name='rowspan'>25</attribute>
+                    <attribute name='string'></attribute>
+          </xpath>
           <group string="res_config_contents" position="replace">
-          	<group colspan="5">
-          		<group colspan="2">
-	            	<field name="company_id" invisible="1"/>
-		            <field name="name" required="True"/><field name="account_no"/>
-		            <field name="currency" widget="selection"/><field name="street"/>
-		            <field name="zip"/>
-		            <field name="street2"/>
-		            <field name="country_id"/>
-		            <field name="state_id"/>
-		            <field name="city"/>
-		            <field name="email"/>
-		            <field name="phone"/>
-		            <field name="website"/>
-				</group>
-				<newline/>
-				<group colspan="2" groups="base.group_extended">
-		            <separator string="Report Information" colspan="4"/>
-		            <field name="rml_header1" colspan="5"/>
-		            <field name="rml_footer1" colspan="5"/>
-		            <field name="rml_footer2" colspan="5"/>
+              <group colspan="5">
+                  <group colspan="2">
+                    <field name="company_id" invisible="1"/>
+                    <field name="name" required="True"/><field name="account_no"/>
+                    <field name="currency" widget="selection"/><field name="street"/>
+                    <field name="zip"/>
+                    <field name="street2"/>
+                    <field name="country_id"/>
+                    <field name="state_id"/>
+                    <field name="city"/>
+                    <field name="email"/>
+                    <field name="phone"/>
+                    <field name="website"/>
+                </group>
+                <newline/>
+                <group colspan="2" groups="base.group_extended">
+                    <separator string="Report Information" colspan="4"/>
+                    <field name="rml_header1" colspan="5"/>
+                    <field name="rml_footer1" colspan="5"/>
+                    <field name="rml_footer2" colspan="5"/>
 
-		            <separator colspan="4"
-		                       string="Your Logo - Use a size of about 450x150 pixels."/>
-		            <field colspan="5" name="logo" widget="image"
-		                   nolabel="1"/>
-		          </group>
-	        </group>
-	       </group>
+                    <separator colspan="4"
+                               string="Your Logo - Use a size of about 450x150 pixels."/>
+                    <field colspan="5" name="logo" widget="image"
+                           nolabel="1"/>
+                  </group>
+            </group>
+           </group>
 
           <xpath expr='//button[@name="action_skip"]' position='replace'/>
         </data>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7765ba8fbe8..c33339047d8 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -298,7 +298,7 @@
                 <separator orientation="vertical"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
-                <field name="user_id" widget="selection">
+                <field name="user_id">
                     <filter icon="terp-personal-"
                         domain="[('user_id','=', False)]"
                         help="Unassigned Leads" />
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index cd3b7866a89..34bdafe1c58 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-	<!-- CRM Meetings Categories Form View -->
+    <!-- CRM Meetings Categories Form View -->
 
     <record id="crm_meeting_categ_action" model="ir.actions.act_window">
         <field name="name">Meeting Categories</field>
@@ -16,7 +16,7 @@
      <menuitem action="crm_meeting_categ_action" name="Categories"
         id="menu_crm_case_meeting-act" parent="menu_crm_config_meeting" />
 
-	<!-- CRM Meetings Form View -->
+    <!-- CRM Meetings Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_meet">
         <field name="name">CRM - Meetings Form</field>
@@ -26,7 +26,7 @@
             <form string="Meetings">
                 <group col="6" colspan="4">
                     <field name="name" select="1" string="Summary"
-                    	required="1" colspan="2" />
+                        required="1" colspan="2" />
                     <field name="categ_id" widget="selection"
                         string="Meeting Type"
                         groups="base.group_extended"
@@ -51,9 +51,9 @@
                                name="open_meeting" icon="gtk-edit"
                                type="object" />
                            <button string="ExRule"
-       		name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
-       		context="{'model' : 'crm.meeting'}"
-       		attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
+               name="%(base_calendar.action_base_calendar_set_exrule)d" icon="gtk-zoom-out"  type="action"
+               context="{'model' : 'crm.meeting'}"
+               attrs="{'invisible':[('rrule_type','in', ('none', False))]}"/>
                     </group>
                 </group>
                 <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
@@ -133,7 +133,7 @@
                         <button name="case_close" string="Done"
                             states="open" type="object"
                             icon="gtk-jump-to" />
-						<button name="case_reset" string="Reset to Unconfirmed"
+                        <button name="case_reset" string="Reset to Unconfirmed"
                             states="open,done,cancel" type="object"
                             icon="gtk-convert" />
                         <button name="case_open" string="Confirm"
@@ -204,7 +204,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Tree View  -->
+    <!-- CRM Meeting Tree View  -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_meet">
         <field name="name">CRM - Meetings Tree</field>
@@ -222,7 +222,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Calendar -->
+    <!-- CRM Meeting Calendar -->
 
     <record model="ir.ui.view" id="crm_case_calendar_view_meet">
         <field name="name">CRM - Meetings Calendar</field>
@@ -238,7 +238,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Gantt  -->
+    <!-- CRM Meeting Gantt  -->
 
     <record id="crm_case_gantt_view_meet" model="ir.ui.view">
         <field name="name">CRM - Meetings Gantt</field>
@@ -254,7 +254,7 @@
         </field>
     </record>
 
-	<!-- CRM Meeting Search View  -->
+    <!-- CRM Meeting Search View  -->
 
     <record id="view_crm_case_meetings_filter" model="ir.ui.view">
         <field name="name">CRM - Meetings Search</field>
@@ -274,29 +274,29 @@
                                    domain="[('section_id','=',context.get('section_id',False))]"
                                    help="My Sale Team" />
                            </field>
-                           <field name="user_id" select="1" widget="selection"/>
+                           <field name="user_id" select="1"/>
                        </group>
                        <newline/>
-					   	<group expand="0" string="Group By...">
-							<filter string="Date" icon="terp-go-month"
-						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Privacy" icon="terp-locked"
-						        domain="[]" context="{'group_by':'class'}" />
-						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-personal" domain="[]"
-						        context="{'group_by':'user_id'}" />
-						    <filter string="Partner" icon="terp-personal" domain="[]"
-						        context="{'group_by':'partner_id'}" />
-						    <separator orientation="vertical" />
-						    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-						        context="{'group_by':'state'}" />
-						    <separator orientation="vertical" />
-						</group>
+                           <group expand="0" string="Group By...">
+                            <filter string="Date" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'date'}" />
+                            <filter string="Privacy" icon="terp-locked"
+                                domain="[]" context="{'group_by':'class'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Responsible" icon="terp-personal" domain="[]"
+                                context="{'group_by':'user_id'}" />
+                            <filter string="Partner" icon="terp-personal" domain="[]"
+                                context="{'group_by':'partner_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}" />
+                            <separator orientation="vertical" />
+                        </group>
                 </search>
             </field>
         </record>
 
-		<!-- Calendar Attendee Form View -->
+        <!-- Calendar Attendee Form View -->
 
         <record id="attendee_form_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.form.inherit</field>
@@ -310,7 +310,7 @@
                 </field>
         </record>
 
-		<!-- Calendar Attendee Tree View -->
+        <!-- Calendar Attendee Tree View -->
 
         <record id="attendee_tree_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.tree.inherit</field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 9f1b7904448..4b618e352ce 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -317,7 +317,7 @@
                         />
                         <separator orientation="vertical"/>
                         <field name="name" string="Opportunity"/>
-                        <field name="user_id" widget="selection">
+                        <field name="user_id">
                             <filter icon="terp-personal-"
                                 domain="[('user_id','=', False)]"
                                 help="Unassigned Opportunities" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index db8adda789c..59b8013b167 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -261,7 +261,7 @@
                <separator orientation="vertical"/>
                <field name="name" string="Call Summary"/>
                <field name="partner_id"/>
-               <field name="user_id" widget="selection">
+               <field name="user_id">
                    <filter icon="terp-personal-"
                        domain="[('user_id','=',False)]"
                        help="Unassigned Phonecalls" />
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index aa37b4472ad..56d96d916ca 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -238,19 +238,19 @@
                     help="less 1 month modified/created attachments"
                     domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
                 />
-                    <separator orientation="vertical"/>
-                  <field name="user_id" widget="selection">
+                 <separator orientation="vertical"/>
+                 <field name="user_id">
                     <filter icon="terp-personal"
                         domain="[('user_id','=', False)]"
                         help="Filter on my Attachment" />
-                    </field>
-                    <field name="partner_id" widget="selection"/>
-                    <newline/>
-                 <group expand="0" string="Group By...">
+                 </field>
+                <field name="partner_id"/>
+                <newline/>
+                <group expand="0" string="Group By...">
                     <filter string="Partner" icon="terp-personal" domain="[]"
                        context="{'group_by':'partner_id'}" />
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                 </group>
+                </group>
               </search>
              </field>
          </record>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 977cc22f005..b329fce97dc 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -51,7 +51,7 @@
                 <search string="Departments">
                     <group col='4' colspan='2'>
                         <field name="name" />
-                        <field name="manager_id" widget="selection"/>
+                        <field name="manager_id"/>
                     </group>
                 </search>
              </field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5e862781408..07612615086 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,18 +30,18 @@
             <field name="arch" type="xml">
                 <form string="Employee">
                     <group colspan="4" col="8">
-	                    <group colspan="6" col="6">
-	                        <field colspan="6" name="name" select="1"/>
-	                        <field name="user_id"/>
-	                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-	                        <field name="active" groups="base.group_extended"/>
-	                        <newline/>
+                        <group colspan="6" col="6">
+                            <field colspan="6" name="name" select="1"/>
+                            <field name="user_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active" groups="base.group_extended"/>
+                            <newline/>
                             <field name="parent_id" />
                             <field name="coach_id" />
-	                    </group>
-	                    <group colspan="2" col="1">
-	                        <field name="photo" widget='image' nolabel="1"/>
-	                    </group>
+                        </group>
+                        <group colspan="2" col="1">
+                            <field name="photo" widget='image' nolabel="1"/>
+                        </group>
                     </group>
                     <notebook colspan="6">
                         <page string="Personal Information">
@@ -113,7 +113,7 @@
                     <field name="name"/>
                     <field name="department_id" widget="selection"/>
                     <field name="job_id" widget="selection"/>
-                    <field name="parent_id" widget="selection" />
+                    <field name="parent_id"/>
                     <newline />
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 84cc82ebe8b..40cebb98ef2 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -133,17 +133,17 @@
             </field>
         </record>
 
-		<record id="hr_contract_view_search" model="ir.ui.view">
+        <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                   		<field name="name"/>
-                      	<field name="employee_id"/>
-                       	<field name="date_start"/>
-                       	<field name="date_end"/>
+                           <field name="name"/>
+                          <field name="employee_id"/>
+                           <field name="date_start"/>
+                           <field name="date_end"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
@@ -217,7 +217,7 @@
             <field name="search_view_id" ref="hr_contract_view_search"/>
         </record>
 
-		<record id="hr_contract_type_view_form" model="ir.ui.view">
+        <record id="hr_contract_type_view_form" model="ir.ui.view">
             <field name="name">hr.contract.type.view.form</field>
             <field name="model">hr.contract.type</field>
             <field name="type">form</field>
@@ -228,7 +228,7 @@
             </field>
         </record>
 
-		 <record id="hr_contract_type_view_tree" model="ir.ui.view">
+         <record id="hr_contract_type_view_tree" model="ir.ui.view">
             <field name="name">hr.contract.type.view.tree</field>
             <field name="model">hr.contract.type</field>
             <field name="type">tree</field>
@@ -250,7 +250,7 @@
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4"/>
 
         <!-- Contracts Button on Employee Form -->
-		<act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
+        <act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/>
 
 
     </data>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index a3e4cac2a5f..cbb4c796c90 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -257,7 +257,7 @@
                         />
 
                         <separator orientation="vertical"/>
-                        <field name="employee_id" widget="selection" select="1"/>
+                        <field name="employee_id" select="1"/>
                         <field name="plan_id" widget="selection" select="1"/>
                         </group>
                         <newline/>
@@ -349,8 +349,8 @@
                         <separator orientation="vertical"/>
                         <filter icon="terp-gnome-cpu-frequency-applet+" string="Late" domain="[('date_deadline','&lt;',current_date)]"/>
                         <separator orientation="vertical"/>
-                        <field name="user_to_review_id" widget="selection"/>
-                        <field name="user_id" string="Interviewer" widget="selection"/>
+                        <field name="user_to_review_id"/>
+                        <field name="user_id" string="Interviewer"/>
                    </group>
                </search>
             </field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 35ffc931831..1b73f7b3ebd 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -145,8 +145,8 @@
                       <separator orientation="vertical"/>
                       <field name="name" select='1'/>
                       <field name="date" select='1'/>
-                      <field name="user_id" select="1" widget="selection" string="User">
-                      		<filter icon="terp-personal+"
+                      <field name="user_id" select="1" string="User">
+                      <filter icon="terp-personal+"
                             domain="[('department_id','=',context.get('department_id',False))]"
                             string="Expenses of My Department"/>
                       </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index fc9626d831d..1a310a55100 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -13,7 +13,7 @@
                         <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+" help="My Department Holidays"
                                 domain="[('department_id.manager_id','=',uid)]"
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 99647cd2406..ef5fcd3387f 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -13,12 +13,12 @@
     # ------------------------------------------------------
 
     <record id="hr_job_categ_action" model="ir.actions.act_window">
-		<field name="name">Applicant Categories</field>
-		<field name="res_model">crm.case.categ</field>
-		<field name="view_type">form</field>
-		<field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-		<field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
-		<field name="context">{'object_id':'hr.applicant'}</field>
+        <field name="name">Applicant Categories</field>
+        <field name="res_model">crm.case.categ</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
+        <field name="domain">[('object_id.model', '=', 'hr.applicant')]</field>
+        <field name="context">{'object_id':'hr.applicant'}</field>
     </record>
     # ------------------------------------------------------
     # Stage
@@ -83,9 +83,9 @@
                     </group>
                     <newline/>
                     <group colspan="3" col="6">
-	                  	<field name="partner_name"/>
-	                   	<field name="job_id" on_change="onchange_job(job_id)"/>
-	                   	<button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
+                          <field name="partner_name"/>
+                           <field name="job_id" on_change="onchange_job(job_id)"/>
+                           <button string="Schedule a Phone Call" name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/>
                      </group>
                     <newline/>
                     <group colspan="3" col="6">
@@ -95,7 +95,7 @@
                     </group>
                     <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
-            	</group>
+                </group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="2" colspan="2">
@@ -186,9 +186,9 @@
                                 </tree>
                             </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(crm.action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'hr.applicant'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(crm.action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'hr.applicant'}"
+                               icon="gtk-go-forward" type="action" />
                  </page>
                 </notebook>
             </form>
@@ -236,7 +236,7 @@
                <field name="partner_name"/>
                <field name="email_from"/>
                <field name="job_id" widget="selection"/>
-               <field name="user_id" widget="selection">
+               <field name="user_id">
                     <filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="terp-personal-" separator="1"/>
                </field>
                <field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
@@ -281,56 +281,56 @@
 
 <!-- Stage Tree View -->
 
-	<record model="ir.ui.view" id="hr_recruitment_stage_tree">
-	    <field name="name">hr.recruitment.stage.tree</field>
-	    <field name="model">hr.recruitment.stage</field>
-	    <field name="type">tree</field>
-	    <field name="arch" type="xml">
-	        <tree string="Stages">
-	            <field name="sequence"/>
-	            <field name="name"/>
-	        </tree>
-	    </field>
-	</record>
+    <record model="ir.ui.view" id="hr_recruitment_stage_tree">
+        <field name="name">hr.recruitment.stage.tree</field>
+        <field name="model">hr.recruitment.stage</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Stages">
+                <field name="sequence"/>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
 
 <!-- Stage Form View -->
 
-	<record model="ir.ui.view" id="hr_recruitment_stage_form">
-	    <field name="name">hr.recruitment.stage.form</field>
-	    <field name="model">hr.recruitment.stage</field>
-	    <field name="type">form</field>
-	    <field name="arch" type="xml">
-	        <form string="Stage">
-	            <separator string="Stage Definition" colspan="4"/>
-	            <field name="name" select="1"/>
-	            <field name="sequence"/>
-	            <separator string="Requirements" colspan="4"/>
-	            <field name="requirements" nolabel="1" colspan="4"/>
-	        </form>
-	    </field>
-	</record>
+    <record model="ir.ui.view" id="hr_recruitment_stage_form">
+        <field name="name">hr.recruitment.stage.form</field>
+        <field name="model">hr.recruitment.stage</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Stage">
+                <separator string="Stage Definition" colspan="4"/>
+                <field name="name" select="1"/>
+                <field name="sequence"/>
+                <separator string="Requirements" colspan="4"/>
+                <field name="requirements" nolabel="1" colspan="4"/>
+            </form>
+        </field>
+    </record>
 
 <!-- Stage Action -->
 
-	<record id="hr_recruitment_stage_act" model="ir.actions.act_window">
-	    <field name="name">Stages</field>
-	    <field name="res_model">hr.recruitment.stage</field>
-	    <field name="view_type">form</field>
-	    <field name="view_id" ref="hr_recruitment_stage_tree"/>
-	</record>
+    <record id="hr_recruitment_stage_act" model="ir.actions.act_window">
+        <field name="name">Stages</field>
+        <field name="res_model">hr.recruitment.stage</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="hr_recruitment_stage_tree"/>
+    </record>
 
-	<menuitem
-	    id="menu_hr_recruitment_recruitment"
-	    name="Recruitment"
-	    parent="hr.menu_hr_configuration"
-	    />
+    <menuitem
+        id="menu_hr_recruitment_recruitment"
+        name="Recruitment"
+        parent="hr.menu_hr_configuration"
+        />
 
-	<menuitem
-		id="menu_hr_recruitment_stage"
-		name="Stages"
-		parent="menu_hr_recruitment_recruitment"
-		action="hr_recruitment_stage_act"
-		sequence="1"/>
+    <menuitem
+        id="menu_hr_recruitment_stage"
+        name="Stages"
+        parent="menu_hr_recruitment_recruitment"
+        action="hr_recruitment_stage_act"
+        sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index a603cc3f24e..b56ecd75769 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -20,7 +20,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_account_analytic_account_form" model="ir.ui.view">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
@@ -32,7 +32,7 @@
                 </field>
             </field>
         </record>
-            
+
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
@@ -117,9 +117,9 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
         </record>
-        <menuitem 
-            action="action_hr_analytic_timesheet_open_tree" 
-            id="menu_hr_analytic_timesheet_tree" 
+        <menuitem
+            action="action_hr_analytic_timesheet_open_tree"
+            id="menu_hr_analytic_timesheet_tree"
             parent="account.menu_finance_periodical_processing"/>
 
         <record id="action_hr_analytic_timesheet_tree_invoiced" model="ir.actions.act_window">
@@ -178,9 +178,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_hr_timesheet_invoice_factor_tree"/>
         </record>
-        <menuitem 
-            action="action_hr_timesheet_invoice_factor_form" 
-            id="hr_timesheet_invoice_factor_view" 
+        <menuitem
+            action="action_hr_timesheet_invoice_factor_form"
+            id="hr_timesheet_invoice_factor_view"
             parent="account.account_analytic_def_account"/>
 
     </data>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f686daf575e..51edeea837b 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -195,7 +195,7 @@
                         <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
                         <filter icon="terp-gtk-go-back-rtl" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id" select="1"/>
                         <field name="date_from"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-personal+"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 90ee35d21e2..ca46b31ace8 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -68,8 +68,8 @@
         action="action_idea_category_tree"/>
 
     <menuitem name="Give Vote" parent="menu_ideas1"
-    	id="menu_give_vote"
-    	action="action_idea_select"/>
+        id="menu_give_vote"
+        action="action_idea_select"/>
 
 
     <!-- Open Ideas Action  -->
@@ -128,11 +128,11 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
         <form string="Votes">
-        	<group colspan="4">
-	            <field name="user_id" select="1" />
-	            <field name="date"/>
-	            <newline/>
-	            <field name="score"/>
+            <group colspan="4">
+                <field name="user_id" select="1" />
+                <field name="date"/>
+                <newline/>
+                <field name="score"/>
             </group>
             <separator string="Comments:" colspan="4"/>
             <field name="comment" colspan="4" nolabel="1"/>
@@ -147,18 +147,18 @@
         <field name="model">idea.vote</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-	        <search string="Ideas vote">
-	        	<group col="10" colspan="4">
-		            <field name="idea_id" widget="selection"/>
-		            <field name="user_id" widget="selection"/>
-				</group>
-				<newline/>
-	            <group expand="0" string="Group By..." colspan="14">
-	            	<filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-	                <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
-	                <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-	            </group>
-	        </search>
+            <search string="Ideas vote">
+                <group col="10" colspan="4">
+                    <field name="idea_id" widget="selection"/>
+                    <field name="user_id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Group By..." colspan="14">
+                    <filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
+                    <filter string="User" name="user" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                </group>
+            </search>
         </field>
     </record>
 
@@ -270,7 +270,7 @@
                     <separator orientation="vertical"/>
                     <field name="title" select="1"/>
                     <field name="category_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="12" col="10">
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 293c8d58aa9..6aad379efcb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -250,7 +250,7 @@
                         <newline/>
                         <field name="product_uom"/>
                         <field name="product_qty"/>
-                        <field name="routing_id" widget="selection" groups="base.group_extended"/>
+                        <field name="routing_id" groups="base.group_extended"/>
                         <newline/>
                         <field name="product_uos" groups="product.group_uos,base.group_extended" widget="selection"/>
                         <field name="product_uos_qty" groups="product.group_uos,base.group_extended" />
@@ -283,7 +283,7 @@
             </field>
         </record>
 
-		<record id="view_mrp_bom_filter" model="ir.ui.view">
+        <record id="view_mrp_bom_filter" model="ir.ui.view">
             <field name="name">mrp.bom.select</field>
             <field name="model">mrp.bom</field>
            <field name="type">search</field>
@@ -291,9 +291,9 @@
                 <search string="Search Bill Of Material">
                     <group col='4' colspan='4'>
                       <field name="name"/>
-	                    <field name="code" string="Reference"/>
-	                    <field name="product_id"/>
-	                    <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="code" string="Reference"/>
+                        <field name="product_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4" col="8" groups="base.group_extended">
@@ -402,26 +402,26 @@
             </field>
         </record>
 
-		<!--
+        <!--
         Procurement
         -->
 
-		<menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
-        		  parent="mrp.menu_mrp_manufacturing" sequence="2" />
+        <menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action"
+                  parent="mrp.menu_mrp_manufacturing" sequence="2" />
 <!--        <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"-->
-<!--        		  parent="mrp.menu_mrp_control" sequence="1" />-->
+<!--                  parent="mrp.menu_mrp_control" sequence="1" />-->
 
-     	<menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
+         <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/>
         <menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/>
 
-		<!--
-		Order Point
-		-->
-		<menuitem action="procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
+        <!--
+        Order Point
+        -->
+        <menuitem action="procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/>
 
         <!--
-	    Production Management
-	    -->
+        Production Management
+        -->
 
         <record id="mrp_production_tree_view" model="ir.ui.view">
             <field name="name">mrp.production.tree</field>
@@ -515,9 +515,9 @@
                     <notebook colspan="4">
                         <page string="Consumed Products">
                             <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" />
-                            <field name="routing_id" groups="base.group_extended" select="1" widget="selection"/>
-                            <field name="location_src_id" domain="[('usage','=','internal')]" widget="selection" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]" widget="selection"/>
+                            <field name="routing_id" groups="base.group_extended" select="1"/>
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
 
                             <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
@@ -807,19 +807,19 @@
         </record>
 
         <!--
-        	Procurements
+            Procurements
         -->
 
         <record id="view_procurement_form_inherit" model="ir.ui.view">
-        	<field name="name">procurement.order.form.inherit</field>
-        	<field name="model">procurement.order</field>
-        	<field name="inherit_id" ref="procurement.procurement_form_view"/>
-        	<field name="type">form</field>
-        	<field name="arch" type="xml">
-        		<xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
-        			<field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
-        		</xpath>
-        	</field>
+            <field name="name">procurement.order.form.inherit</field>
+            <field name="model">procurement.order</field>
+            <field name="inherit_id" ref="procurement.procurement_form_view"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_id']" position="before">
+                    <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+                </xpath>
+            </field>
         </record>
 
         <act_window
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index e00589b3012..22e46933365 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -93,7 +93,7 @@
                             <group colspan="4">
                                 <separator string="Invoicing" colspan="4"/>
                                 <field name="sale_journal" domain="[('type','=','sale'),('company_id','=',company_id)]"/>
-                                <field name="pricelist_id" domain="[('type','=','sale')]" widget="selection"/>
+                                <field name="pricelist_id" domain="[('type','=','sale')]"/>
                                 <field name="invoice_id"/>
                                 <group colspan="2" col="3">
                                     <button name="invoice" string="Create _Invoice" states="paid"/>
@@ -159,7 +159,7 @@
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1e2a0be260f..f7c5a834d1e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -242,7 +242,7 @@
                         <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                         <field name="total_hours" widget="float_time"/>
                         <field name="date_deadline"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id" select="1"/>
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -417,10 +417,10 @@
                         <filter string="Deadlines" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name" select="1"/>
-                        <field name="project_id" select="1" widget="selection">
+                        <field name="project_id" select="1">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
-                        <field name="user_id" select="1" widget="selection">
+                        <field name="user_id" select="1">
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -549,7 +549,7 @@
           <field eval="18" name="priority"/>
           <field name="arch" type="xml">
               <field name="password" position="after">
-               <field name="context_project_id" completion="1" widget="selection"/>
+               <field name="context_project_id" completion="1"/>
               </field>
           </field>
      </record>
@@ -562,7 +562,7 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <page string="Current Activity" position="inside">
-                <field name="context_project_id" completion="1" widget="selection" context="{'user_prefence':True}"/>
+                <field name="context_project_id" completion="1" context="{'user_prefence':True}"/>
             </page>
        </field>
     </record>
@@ -611,9 +611,8 @@
                        <filter domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" icon="terp-go-today" string="Today" />
                        <separator orientation="vertical"/>
                        <field name="subject"/>
-                       <field name="project_id" select="1" widget="selection"/>
-                       <field name="user_id" select="1" widget="selection">
-                       </field>
+                       <field name="project_id" select="1"/>
+                       <field name="user_id" select="1"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
diff --git a/addons/project_caldav/project_caldav_view.xml b/addons/project_caldav/project_caldav_view.xml
index 541cc3c396e..885878cfcd8 100644
--- a/addons/project_caldav/project_caldav_view.xml
+++ b/addons/project_caldav/project_caldav_view.xml
@@ -2,100 +2,100 @@
 <openerp>
     <data>
 
-    	<record id="view_project_caldav_task_form" model="ir.ui.view">
-			<field name="name">project.task.caldav.form</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<notebook position="inside">
-					<page string="Assignees Detail">
-            			<button string="Assign Task"
-            				name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-            				icon="terp-partner" type="action"
-            				context="{'model' : 'project.task'}" colspan="2"/>
-            			<field name="attendee_ids" colspan="4"
-            				nolabel="1" widget="one2many" mode="tree,form">
-            				<tree string="Assignees details"
-            					editable="top">
-            					<field name="email" />
-            					<field name="role" select="1" />
-            					<field name="state" />
-            				</tree>
-            				<form string="Assignees details">
-            					<notebook colspan="4">
-            						<page string="Details">
-            							<field name="email" />
-            							<field name="rsvp" select="1" />
-            							<field name="cutype" select="1" />
-            							<field name="role" select="1" />
-            							<separator colspan="4"
-            								string="" />
-            							<field name="state" />
-            						</page>
-            						<page string="Other">
-            							<field name="user_id"
-            								select="1" />
-            							<field name="partner_address_id"
-            								select="1" />
-            							<newline />
-            						</page>
-            					</notebook>
-            				</form>
-            			</field>
-					</page>
-				</notebook>
-			</field>
-		</record>
+        <record id="view_project_caldav_task_form" model="ir.ui.view">
+            <field name="name">project.task.caldav.form</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Assignees Detail">
+                        <button string="Assign Task"
+                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                            icon="terp-partner" type="action"
+                            context="{'model' : 'project.task'}" colspan="2"/>
+                        <field name="attendee_ids" colspan="4"
+                            nolabel="1" widget="one2many" mode="tree,form">
+                            <tree string="Assignees details"
+                                editable="top">
+                                <field name="email" />
+                                <field name="role" select="1" />
+                                <field name="state" />
+                            </tree>
+                            <form string="Assignees details">
+                                <notebook colspan="4">
+                                    <page string="Details">
+                                        <field name="email" />
+                                        <field name="rsvp" select="1" />
+                                        <field name="cutype" select="1" />
+                                        <field name="role" select="1" />
+                                        <separator colspan="4"
+                                            string="" />
+                                        <field name="state" />
+                                    </page>
+                                    <page string="Other">
+                                        <field name="user_id"
+                                            select="1" />
+                                        <field name="partner_address_id"
+                                            select="1" />
+                                        <newline />
+                                    </page>
+                                </notebook>
+                            </form>
+                        </field>
+                    </page>
+                </notebook>
+            </field>
+        </record>
 
-		<record id="view_project_caldav_task_form1" model="ir.ui.view">
-			<field name="name">project.task.caldav.form1</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2"/>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="sequence" position="after">
-					<field name="class" />
-				</field>
-			</field>
-		</record>
+        <record id="view_project_caldav_task_form1" model="ir.ui.view">
+            <field name="name">project.task.caldav.form1</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="sequence" position="after">
+                    <field name="class" />
+                </field>
+            </field>
+        </record>
 
-		<record id="view_project_caldav_task_form2" model="ir.ui.view">
-			<field name="name">project.task.caldav.form2</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="progress" position="after">
-					<group colspan="2" col="3">
-<!--						<field name="rrule_type" string="Recurrency"
-							on_change="onchange_rrule_type(rrule_type)" colspan="1" />
--->						<field name="rrule_type" string="Recurrency"
-							colspan="1" />
-						<button string="Custom" name="101"
-							icon="gtk-save-as" type="action"
-							context="{'model' : 'project.task'}"
-							attrs="{'readonly': [('rrule_type','!=','custom')]}" />
-					</group>
-				</field>
-			</field>
-		</record>
+        <record id="view_project_caldav_task_form2" model="ir.ui.view">
+            <field name="name">project.task.caldav.form2</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="progress" position="after">
+                    <group colspan="2" col="3">
+<!--                        <field name="rrule_type" string="Recurrency"
+                            on_change="onchange_rrule_type(rrule_type)" colspan="1" />
+-->                        <field name="rrule_type" string="Recurrency"
+                            colspan="1" />
+                        <button string="Custom" name="101"
+                            icon="gtk-save-as" type="action"
+                            context="{'model' : 'project.task'}"
+                            attrs="{'readonly': [('rrule_type','!=','custom')]}" />
+                    </group>
+                </field>
+            </field>
+        </record>
 
-	<record id="view_project_caldav_task_form3" model="ir.ui.view">
-			<field name="name">project.task.caldav.form3</field>
-			<field name="model">project.task</field>
-			<field name="inherit_id" ref="project.view_task_form2" />
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="partner_id" position="after">
-					<field name="vtimezone" colspan="2" />
-					<field name="location" colspan="2" />
-					<field name="alarm_id" string="Reminder" widget="selection" />
-					<field name="base_calendar_url" widget="url" />
-					<field name="rrule" invisible="1"/>
-				</field>
-			</field>
-		</record>
+    <record id="view_project_caldav_task_form3" model="ir.ui.view">
+            <field name="name">project.task.caldav.form3</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2" />
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="vtimezone" colspan="2" />
+                    <field name="location" colspan="2" />
+                    <field name="alarm_id" string="Reminder" widget="selection" />
+                    <field name="base_calendar_url" widget="url" />
+                    <field name="rrule" invisible="1"/>
+                </field>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a5009b7eb47..673f4239971 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -106,9 +106,9 @@
                                 </tree>
                            </field>
                            <button colspan="4" string="Send New Email"
-                           	name="%(crm.action_crm_send_mail)d"
-                           	context="{'mail':'new', 'model': 'project.issue'}"
-                           	icon="gtk-go-forward" type="action" />
+                               name="%(crm.action_crm_send_mail)d"
+                               context="{'mail':'new', 'model': 'project.issue'}"
+                               icon="gtk-go-forward" type="action" />
                         </page>
                            <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">
@@ -187,10 +187,10 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-						<filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
+                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
-						<separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
@@ -201,31 +201,31 @@
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
                             />
-                    	<separator orientation="vertical"/>
+                        <separator orientation="vertical"/>
                         <field name="name" string="Name"/>
-                        <field name="user_id" widget="selection"/>
-                        <field name="project_id" widget="selection" string="Project"/>
+                        <field name="user_id"/>
+                        <field name="project_id" string="Project"/>
                         <field name="state"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
-	                    <filter string="Project"  icon="terp-folder-blue" domain="[]"
+                        <filter string="Project"  icon="terp-folder-blue" domain="[]"
                             context="{'group_by':'project_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="Version" icon="terp-gtk-jump-to-rtl"
-	                        domain="[]" context="{'group_by':'type_id'}" />
-	                    <separator orientation="vertical" />
-	                    <filter string="Partner" icon="terp-personal" domain="[]"
-	                        context="{'group_by':'partner_id'}" />
-	                    <filter string="Salesman" icon="terp-personal"
-	                        domain="[]" context="{'group_by':'user_id'}" />
-						<separator orientation="vertical" />
-						<filter string="Month" icon="terp-go-month"
-	                        domain="[]" context="{'group_by':'create_date'}" />
-                	</group>
+                        <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="Version" icon="terp-gtk-jump-to-rtl"
+                            domain="[]" context="{'group_by':'type_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Partner" icon="terp-personal" domain="[]"
+                            context="{'group_by':'partner_id'}" />
+                        <filter string="Salesman" icon="terp-personal"
+                            domain="[]" context="{'group_by':'user_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Month" icon="terp-go-month"
+                            domain="[]" context="{'group_by':'create_date'}" />
+                    </group>
                 </search>
             </field>
         </record>
@@ -298,12 +298,12 @@
                     <separator orientation="vertical"/>
                     <group>
                         <field name="name" select='1' string="Feature description"/>
-                        <field name="user_id" select="1" widget="selection"/>
+                        <field name="user_id" select="1"/>
                         <field name="state" select="1">
                             <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
                             <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                         </field>
-                        <field name="project_id" select="1" widget="selection" string="Project"/>
+                        <field name="project_id" select="1" string="Project"/>
 
                     </group>
                 </search>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index cd76382b5d2..cafaefa9633 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-	<menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
+    <menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/>
 
     # ------------------------------------------------------
     # Project Resource Allocation
@@ -29,7 +29,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Project Resource Allocation">
                     <field name="resource_id"/>
-					<field name="phase_id"/>
+                    <field name="phase_id"/>
                     <field name="useability"/>
                 </tree>
             </field>
@@ -42,8 +42,8 @@
             <field name="arch" type="xml">
                 <search string="Resource Allocations">
                     <group colspan="4" col="20">
-                        <field name="resource_id" widget="selection"/>
-                        <field name="phase_id" widget="selection"/>
+                        <field name="resource_id"/>
+                        <field name="phase_id"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="20">
@@ -59,7 +59,7 @@
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
- 			<field name="context">{'search_default_resource': 1} </field>
+             <field name="context">{'search_default_resource': 1} </field>
             <!--<field name="search_view_id" ref="view_project_phase_search"/>-->
         </record>
 
@@ -156,7 +156,7 @@
                                     </notebook>
                                   </form>
                              </field>
-                           	<button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                               <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
@@ -222,10 +222,10 @@
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" widget="selection">
+                        <field name="project_id">
                             <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
                         </field>
-                        <field name="responsible_id" widget="selection"/>
+                        <field name="responsible_id"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
@@ -244,7 +244,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid}</field>
+             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 
@@ -294,7 +294,7 @@
             groups="base.group_extended"
             id="menu_project_phase" parent="menu_project_long_term" sequence="4"/>
 
-		<menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
+        <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
             name="Resource Allocations" parent="menu_project_long_term" />
 
         <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>-->
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index fd9d586f21e..d7d2880714c 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -164,10 +164,10 @@
                     <group col="8" colspan="4">
                         <filter icon="terp-check" string="Current Plannings" domain="[('date_from','&lt;=',time.strftime('%%Y-%%m-%%d')),('date_to','&gt;=',time.strftime('%%Y-%%m-%%d'))]" help="Current Plannings"/>
                         <separator orientation="vertical"/>
-                        <field name="name" select="1"/>
-                        <field name="code" select="1"/>
-                        <field name="user_id" widget="selection" select="1"/>
-                        <field name="state" select="1"/>
+                        <field name="name">
+                        <field name="code">
+                        <field name="user_id">
+                        <field name="state">
                     </group>
                 </search>
             </field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8d3402804a9..0327e2d017c 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -159,7 +159,7 @@
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
                     <field name="product_id" select="1"/>
-                    <field name="create_uid" select="1" widget="selection"/>
+                    <field name="create_uid" select="1"/>
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
@@ -289,7 +289,7 @@
                 <search string="Search Purchase Order">
                         <group>
                         <field name='order_id'/>
-                        <field name="product_id" widget="selection" />
+                        <field name="product_id"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 186815c9bc3..172be8c06e8 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -39,7 +39,7 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="origin"/>
-					<field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
 
                 <notebook colspan="4">
@@ -52,41 +52,41 @@
                             </tree>
                             <form string="Products" editable="bottom">
                                 <field name="product_id" />
-								<field name="product_qty"/>
+                                <field name="product_qty"/>
                                 <field name="product_uom_id" />
-								<field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </form>
 
                         </field>
-					<separator colspan="4"/>
-	                <group col="8" colspan="4">
-	                    <field name="state" select="1" readonly ="1"/>
-						<button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
-	                    <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-						<button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-						<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
-	                </group>
+                    <separator colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state" select="1" readonly ="1"/>
+                        <button name="tender_in_progress" states="draft" string="Confirm" type="object" icon="gtk-apply" />
+                        <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
+                        <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
+                        <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
+                    </group>
                     </page>
                     <page string="Quotations">
-						<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
-							<tree string="Purchase Order">
-			                    <field name="name" string="Reference"/>
-			                    <field name="date_order" string="Order Date"/>
-			                    <field name="partner_id"/>
-			                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-			                    <field name="location_id"/>
-			                    <field name="minimum_planned_date"/>
-			                    <field name="origin"/>
-			                    <field name="state"/>
-			                    </tree>
-                     	</field>
-						<separator colspan="4" string=""/>
-                     	<group col="8" colspan="4">
-                     	 <label colspan="6"  string=""/>
-						<button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
-                    	</group>
+                        <field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
+                            <tree string="Purchase Order">
+                                <field name="name" string="Reference"/>
+                                <field name="date_order" string="Order Date"/>
+                                <field name="partner_id"/>
+                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                <field name="location_id"/>
+                                <field name="minimum_planned_date"/>
+                                <field name="origin"/>
+                                <field name="state"/>
+                                </tree>
+                         </field>
+                        <separator colspan="4" string=""/>
+                         <group col="8" colspan="4">
+                          <label colspan="6"  string=""/>
+                        <button name="%(action_purchase_requisition_partner)d" string="Requests for Quotation" type="action" icon="gtk-execute" />
+                        </group>
                    </page>
-					<page string="Notes">
+                    <page string="Notes">
                         <field name="description" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
@@ -110,7 +110,7 @@
         </field>
     </record>
 
-	<record id="view_purchase_requisition_filter" model="ir.ui.view">
+    <record id="view_purchase_requisition_filter" model="ir.ui.view">
             <field name="name">purchase.requisition.list.select</field>
             <field name="model">purchase.requisition</field>
             <field name="type">search</field>
@@ -118,22 +118,22 @@
                 <search string="Search Purchase Requisition">
                  <group col='10' colspan='4'>
                     <filter icon="terp-check" string="Current" domain="[('state','=','draft,in_progress')]" separator="1" help="Current Purchaes Requisition"/>
-					<filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
+                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]" separator="1" help="Current Purchaes Requisition"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Requisition Reference"/>
                     <field name="purchase_ids" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                     <field name="exclusive" select="1" />
                     <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                 </group>
                 <newline/>
                   <group expand="0" string="Group By..." colspan="4" col="10" groups="base.group_extended">
                     <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-  					<separator orientation="vertical"/>
+                      <separator orientation="vertical"/>
                     <filter string="Date Start" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
                     <filter string="Date End" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'date_end'}"/>
                     <separator orientation="vertical"/>
-					<filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
+                    <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
                 </group>
               </search>
             </field>
@@ -145,8 +145,8 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">purchase.requisition</field>
         <field name="view_type">form</field>
-		<field name="view_mode">tree,form</field>
-		<field name="context">{"search_default_user_id":uid}</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{"search_default_user_id":uid}</field>
         <field name="search_view_id" ref="view_purchase_requisition_filter"/>
     </record>
 
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index df0974fd9ed..d00074cf54e 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -12,7 +12,7 @@
                 <search string="Search Resource">
                    <group col='15' colspan='4'>
                        <field name="name"/>
-                       <field name="user_id" string="User" widget="selection"/>
+                       <field name="user_id" string="User"/>
                        <field name="resource_type"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -35,7 +35,7 @@
                 <search string="Search Working Period">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
-                       <field name="manager" widget="selection"/>
+                       <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
                </search>
@@ -52,7 +52,7 @@
                        <field name="name" string="Name"/>
                        <field name="company_id" string="Company" widget="selection" />
                        <field name="calendar_id" string="Working Time" widget="selection"/>
-                       <field name="resource_id" string="Resource" widget="selection"/>
+                       <field name="resource_id" string="Resource"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 6d8b1b9b740..eb2674defc7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -258,7 +258,7 @@
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
                     <field name="partner_id" select="1"/>
-                    <field name="user_id" select="1" widget="selection"/>
+                    <field name="user_id" select="1"/>
                     <field name="date_order" select="1" string="Order date" />
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
@@ -426,7 +426,7 @@
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>
-                    <field name="salesman_id" widget="selection">
+                    <field name="salesman_id">
                         <filter icon="terp-dolar" domain="[('salesman_id','=',uid)]" help="My Sale Order Lines"/>
                         <filter icon="terp-personal+" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                     </field>
@@ -512,16 +512,16 @@
                   <attribute name="string">Sales Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-            	<attribute name="string"
+                <attribute name="string"
                        >Configure Sale Order Logistic</attribute>
-          		</separator>
-          		<xpath expr="//label[@string='description']" position="attributes">
-            		<attribute name="string">Setup your sales workflow and default values.</attribute>
-          		</xpath>
+                  </separator>
+                  <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">Setup your sales workflow and default values.</attribute>
+                  </xpath>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
-          			<attribute name='rowspan'>15</attribute>
-          			<attribute name='string'></attribute>
-	      		</xpath>
+                      <attribute name='rowspan'>15</attribute>
+                      <attribute name='string'></attribute>
+                  </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="picking_policy" groups="base.group_extended"/>
                   <newline/>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 7e4cc33b283..5b3d2de5652 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -3,467 +3,467 @@
 
    <!--  sale journal invoice Type's Form  view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
-	        <field name="name">sale_journal.invoice.type.form</field>
-	        <field name="model">sale_journal.invoice.type</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Invoice Type">
-	                <field name="name" select="1"/>
-	                <field name="active" select="1"/>
-	                <field name="invoicing_method" select="1"/>
-	                <newline/>
-	                <field name="note" colspan="4"/>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
+            <field name="name">sale_journal.invoice.type.form</field>
+            <field name="model">sale_journal.invoice.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Invoice Type">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="invoicing_method" select="1"/>
+                    <newline/>
+                    <field name="note" colspan="4"/>
+                </form>
+            </field>
+        </record>
 
-	  <!--  sale journal invoice Type's tree  view -->
+      <!--  sale journal invoice Type's tree  view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
-	        <field name="name">sale_journal.invoice.type.tree</field>
-	        <field name="model">sale_journal.invoice.type</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Invoice Type">
-	                <field name="name"/>
-	                <field name="invoicing_method"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
+            <field name="name">sale_journal.invoice.type.tree</field>
+            <field name="model">sale_journal.invoice.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Invoice Type">
+                    <field name="name"/>
+                    <field name="invoicing_method"/>
+                </tree>
+            </field>
+        </record>
 
-	  <!-- Action for sale journal invoice Type -->
+      <!-- Action for sale journal invoice Type -->
 
-	    <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
-	        <field name="res_model">sale_journal.invoice.type</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	    </record>
+        <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+            <field name="res_model">sale_journal.invoice.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
 
-	<!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
+    <!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/> -->
 
-	<!-- sale journal Form view  -->
+    <!-- sale journal Form view  -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_form">
-	        <field name="name">sale_journal.sale.journal.form</field>
-	        <field name="model">sale_journal.sale.journal</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Sales Journals">
-					<group colspan="4"	col="6">
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="user_id" select="1"/>
-	                    <field name="date" select="1"/>
-	                    <field name="date_created" select="1"/>
-	                    <field name="date_validation" select="1"/>
-	                </group>
-					<notebook colspan="4">
-		                <page string="Sales">
-		                    <field name="sale_stats_ids" colspan="4" nolabel="1">
-		                        <tree string="Sales">
-		                            <field name="name"/>
-		                            <field name="quantity"/>
-		                            <field name="price_total"/>
-		                            <field name="price_average"/>
-		                            <field name="count"/>
-		                            <field name="state"/>
-		                        </tree>
-		                    </field>
-		                </page>
-		                <page string="Notes">
-		                    <field name="note" colspan="4" nolabel="1"/>
-		                </page>
-	                </notebook>
-	                <field name="state"/>
-	                    <group col="6" colspan="2">
-	                        <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-	                        <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
-	                        <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
-	                        <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
-	                    	<button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
-	                    </group>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_form">
+            <field name="name">sale_journal.sale.journal.form</field>
+            <field name="model">sale_journal.sale.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales Journals">
+                    <group colspan="4"    col="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                        <field name="date_created" select="1"/>
+                        <field name="date_validation" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Sales">
+                            <field name="sale_stats_ids" colspan="4" nolabel="1">
+                                <tree string="Sales">
+                                    <field name="name"/>
+                                    <field name="quantity"/>
+                                    <field name="price_total"/>
+                                    <field name="price_average"/>
+                                    <field name="count"/>
+                                    <field name="state"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <field name="state"/>
+                        <group col="6" colspan="2">
+                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
+                            <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
+                            <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
+                            <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
+                            <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
+                        </group>
+                </form>
+            </field>
+        </record>
 
   <!-- Sale journal tree view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_tree">
-	        <field name="name">sale_journal.sale.journal.tree</field>
-	        <field name="model">sale_journal.sale.journal</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Sales Journals">
-	                <field name="name" select="1"/>
-	                <field name="code" select="1"/>
-	                <field name="user_id" select="1"/>
-	                <field name="date" select="1"/>
-	                <field name="state"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_tree">
+            <field name="name">sale_journal.sale.journal.tree</field>
+            <field name="model">sale_journal.sale.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Sales Journals">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
-	<!-- Sale journal search view -->
+    <!-- Sale journal search view -->
 
-	    <record model="ir.ui.view" id="view_sale_journal_search">
-	        <field name="name">sale_journal.sale.journal.search</field>
-	        <field name="model">sale_journal.sale.journal</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Sales by Journal">
-	            	<group col="8" colspan="4">
-		            	<filter icon="terp-personal" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
-		               	<filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
-		               	<separator orientation="vertical"/>
-		                <field name="name" select="1"/>
-		                <field name="code" select="1"/>
-		                <field name="user_id" select="1"/>
-		                <field name="date" select="1"/>
-					</group>
-	            </search>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_sale_journal_search">
+            <field name="name">sale_journal.sale.journal.search</field>
+            <field name="model">sale_journal.sale.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Sales by Journal">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-personal" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
+                           <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
+                           <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
       <!-- Action for sale journal view -->
 
-	    <record model="ir.actions.act_window" id="action_definition_journal">
-	        <field name="res_model">sale_journal.sale.journal</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="search_view_id" ref="view_sale_journal_search"/>
-	    </record>
+        <record model="ir.actions.act_window" id="action_definition_journal">
+            <field name="res_model">sale_journal.sale.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_sale_journal_search"/>
+        </record>
 
-		<menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="base.menu_base_config"  action="action_definition_journal" sequence="60" />
 
-	<!-- Inherit sales order form view -->
+    <!-- Inherit sales order form view -->
 
-	    <record model="ir.ui.view" id="sale_journal_sale_order">
-	        <field name="name">sale.order.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">sale.order</field>
-	        <field name="inherit_id" ref="sale.view_order_form" />
-	        <field name="arch" type="xml">
-	            <field name="user_id" position="after">
+        <record model="ir.ui.view" id="sale_journal_sale_order">
+            <field name="name">sale.order.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form" />
+            <field name="arch" type="xml">
+                <field name="user_id" position="after">
                     <separator string="Journal" colspan="4"/>
-	                <field name="journal_id" select="1" widget="selection"/>
-	                <field name="invoice_type_id" select="1" widget="selection"/>
-	            </field>
-	        </field>
-	    </record>
+                    <field name="journal_id" select="1" widget="selection"/>
+                    <field name="invoice_type_id" select="1" widget="selection"/>
+                </field>
+            </field>
+        </record>
 
-	    <!-- Inherit sales order tree view-->
+        <!-- Inherit sales order tree view-->
 
-	    <record model="ir.ui.view" id="sale_journal_sale_order_tree">
-	        <field name="name">sale.order.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">sale.order</field>
-	        <field name="inherit_id" ref="sale.view_order_tree" />
-	        <field name="arch" type="xml">
-	            <field name="state" position="after">
-	                <field name="invoice_type_id"/>
-	                <field name="journal_id"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_sale_order_tree">
+            <field name="name">sale.order.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_tree" />
+            <field name="arch" type="xml">
+                <field name="state" position="after">
+                    <field name="invoice_type_id"/>
+                    <field name="journal_id"/>
+                </field>
+            </field>
+        </record>
 
 <!--  Inherit stock picking's form view  -->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
 <!--  Inherit stock picking's tree view  -->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.vpicktree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.vpicktree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	<!--  Inherit stock picking delivery's form  view.-->
+    <!--  Inherit stock picking delivery's form  view.-->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_del">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_delivery_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_del">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_delivery_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	<!--  Inherit stock picking delivery's tree  view.-->
+    <!--  Inherit stock picking delivery's tree  view.-->
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_in">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_in_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_in">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_in_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_in_tree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_in_tree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_out">
-	        <field name="name">stock.picking.journal.view.form</field>
-	        <field name="type">form</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_out_form" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_out">
+            <field name="name">stock.picking.journal.view.form</field>
+            <field name="type">form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
-	        <field name="name">stock.picking.journal.view.tree</field>
-	        <field name="type">tree</field>
-	        <field name="model">stock.picking</field>
-	        <field name="inherit_id" ref="stock.view_picking_out_tree" />
-	        <field name="arch" type="xml">
-	            <field name="origin" position="after">
-	                <field name="journal_id" select="1"/>
-	                <field name="invoice_type_id" select="1"/>
-	                <field name="sale_journal_id" select="1"/>
-	            </field>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
+            <field name="name">stock.picking.journal.view.tree</field>
+            <field name="type">tree</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_out_tree" />
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="journal_id" select="1"/>
+                    <field name="invoice_type_id" select="1"/>
+                    <field name="sale_journal_id" select="1"/>
+                </field>
+            </field>
+        </record>
 
-	    <!-- Action of sale journal report in sale journal  -->
+        <!-- Action of sale journal report in sale journal  -->
 
-	    <act_window name="Monthly sales"
-	        domain="[('journal_id', '=', active_id)]"
-	        res_model="sale.journal.report"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
+        <act_window name="Monthly sales"
+            domain="[('journal_id', '=', active_id)]"
+            res_model="sale.journal.report"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
 
-	   <!-- Action  of stock picking  in picking journal  -->
+       <!-- Action  of stock picking  in picking journal  -->
 
-	    <act_window name="Assigned picking"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
-	        res_model="stock.picking"
-	        src_model="sale_journal.picking.journal"
-	        id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
+        <act_window name="Assigned picking"
+            domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
+            res_model="stock.picking"
+            src_model="sale_journal.picking.journal"
+            id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
 
-	  <!-- Action  of stock picking  in picking journal  -->
+      <!-- Action  of stock picking  in picking journal  -->
 
-	    <act_window name="Confirmed picking"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
-	        res_model="stock.picking"
-	        src_model="sale_journal.picking.journal"
-	        id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
+        <act_window name="Confirmed picking"
+            domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
+            res_model="stock.picking"
+            src_model="sale_journal.picking.journal"
+            id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
 
-	 <!-- Action  of stock picking  in sale journal  -->
+     <!-- Action  of stock picking  in sale journal  -->
 
-	    <act_window name="Assigned picking"
-        	domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
-        	res_model="stock.picking"
-        	src_model="sale_journal.sale.journal"
-        	id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
+        <act_window name="Assigned picking"
+            domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
+            res_model="stock.picking"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
 
     <!-- Action  of stock picking in sale journal -->
 
-	    <act_window name="Confirmed picking"
-	        domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
-	        res_model="stock.picking"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
+        <act_window name="Confirmed picking"
+            domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
+            res_model="stock.picking"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
 
-	<!-- Action of sale order in sale journal -->
+    <!-- Action of sale order in sale journal -->
 
-	    <act_window name="Draft sales"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
-	        res_model="sale.order"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_sale_order_draft"/>
+        <act_window name="Draft sales"
+            domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
+            res_model="sale.order"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_sale_order_draft"/>
 
-	  <!-- Action  of sale order in sale journal -->
+      <!-- Action  of sale order in sale journal -->
 
-	    <act_window name="Approved sales"
-	        domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
-	        res_model="sale.order"
-	        src_model="sale_journal.sale.journal"
-	        id="act_sale_journal_sale_journal_2_sale_order_approved"/>
+        <act_window name="Approved sales"
+            domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
+            res_model="sale.order"
+            src_model="sale_journal.sale.journal"
+            id="act_sale_journal_sale_journal_2_sale_order_approved"/>
 
-	    <record id="view_partner_property_form" model="ir.ui.view">
-	        <field name="name">res.partner.journal.property.form.inherit</field>
-	        <field name="model">res.partner</field>
-	        <field name="type">form</field>
-	        <field name="inherit_id" ref="base.view_partner_form"/>
-	        <field name="arch" type="xml">
-	            <page string="Sales &amp; Purchases" position="inside">
-	                <field name="property_invoice_type"/>
-	            </page>
-	        </field>
-	    </record>
+        <record id="view_partner_property_form" model="ir.ui.view">
+            <field name="name">res.partner.journal.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <page string="Sales &amp; Purchases" position="inside">
+                    <field name="property_invoice_type"/>
+                </page>
+            </field>
+        </record>
 
-	<!--=====================================================-->
-	<!-- picking journal view-->
-	<!--=====================================================    -->
+    <!--=====================================================-->
+    <!-- picking journal view-->
+    <!--=====================================================    -->
 
-	    <record model="ir.ui.view" id="view_picking_journal_form">
-	        <field name="name">sale_journal.picking.journal.form</field>
-	        <field name="model">sale_journal.picking.journal</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Picking Journal">
-					<group colspan="4" col="6">
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="user_id" select="1"/>
-	                    <newline/>
-	                    <field name="date" select="1"/>
-	                    <field name="date_created" select="1"/>
-	                    <field name="date_validation" select="1"/>
-	                </group>
-					<notebook colspan="4">
-		                <page string="Picking">
-		                    <field name="picking_stats_ids" colspan="4" nolabel="1"/>
-		                </page>
-		                <page string="Notes">
-		                    <field name="note" colspan="4" nolabel="1"/>
-		                </page>
-	                </notebook>
-	                <field name="state"/>
-	                    <group col="6" colspan="2">
-	                        <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-	                        <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
-	                        <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
-	                        <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
-	                    </group>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_picking_journal_form">
+            <field name="name">sale_journal.picking.journal.form</field>
+            <field name="model">sale_journal.picking.journal</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Picking Journal">
+                    <group colspan="4" col="6">
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <newline/>
+                        <field name="date" select="1"/>
+                        <field name="date_created" select="1"/>
+                        <field name="date_validation" select="1"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Picking">
+                            <field name="picking_stats_ids" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Notes">
+                            <field name="note" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
+                    <field name="state"/>
+                        <group col="6" colspan="2">
+                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
+                            <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
+                            <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
+                            <button string="Cancel Picking" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
+                        </group>
+                </form>
+            </field>
+        </record>
 
-	    <record model="ir.ui.view" id="view_picking_journal_tree">
-	        <field name="name">sale_journal.picking.journal.tree</field>
-	        <field name="model">sale_journal.picking.journal</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Picking Journal">
-	                <field name="name" select="1"/>
-	                <field name="code" select="1"/>
-	                <field name="user_id" select="1"/>
-	                <field name="date" select="1"/>
-	                <field name="state"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_picking_journal_tree">
+            <field name="name">sale_journal.picking.journal.tree</field>
+            <field name="model">sale_journal.picking.journal</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Picking Journal">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="date" select="1"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
 
        <!-- Picking journal tree view  -->
 
-	    <record model="ir.ui.view" id="view_picking_journal_search">
-	        <field name="name">sale_journal.picking.journal.search</field>
-	        <field name="model">sale_journal.picking.journal</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Picking Journals">
-	                <group col="8" colspan="4">
-	                    <filter icon="terp-personal" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
-	                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	                    <field name="code" select="1"/>
-	                    <field name="user_id" select="1" widget="selection"/>
-	                    <field name="date" select="1"/>
-	                </group>
-	            </search>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="view_picking_journal_search">
+            <field name="name">sale_journal.picking.journal.search</field>
+            <field name="model">sale_journal.picking.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Picking Journals">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-personal" string="My Picking Journals" domain="[('user_id','=',uid)]" help="My Picking Journals"/>
+                        <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="user_id" select="1"/>
+                        <field name="date" select="1"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
 <!-- Action of Picking journals -->
 
-	    <record model="ir.actions.act_window" id="action_definition_picking_journal">
-	        <field name="name">Picking Journals</field>
-	        <field name="res_model">sale_journal.picking.journal</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="search_view_id" ref="view_picking_journal_search"/>
-	    </record>
+        <record model="ir.actions.act_window" id="action_definition_picking_journal">
+            <field name="name">Picking Journals</field>
+            <field name="res_model">sale_journal.picking.journal</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_picking_journal_search"/>
+        </record>
 
-	    <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
+        <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
 
-	    <record model="ir.actions.act_window" id="action_invoice_type_tree">
-	        <field name="name">Picking by invoice_method</field>
-	        <field name="res_model">sale_journal.invoice.type</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">tree</field>
-	    </record>
+        <record model="ir.actions.act_window" id="action_invoice_type_tree">
+            <field name="name">Picking by invoice_method</field>
+            <field name="res_model">sale_journal.invoice.type</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">tree</field>
+        </record>
 
-	    <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
-	        <field name="name">Picking to invoice</field>
-	        <field name="res_model">stock.picking</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">tree,form</field>
-	        <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
-	    </record>
+        <record model="ir.actions.act_window" id="action_invoice_type_picking_open">
+            <field name="name">Picking to invoice</field>
+            <field name="res_model">stock.picking</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','done'),('invoice_state','=','2binvoiced'),('invoice_type_id','=',active_id)]</field>
+        </record>
 
-	    <record model="ir.values" id="ir_open_invoice_type">
-	        <field name="key2">tree_but_open</field>
-	        <field name="model">sale_journal.invoice.type</field>
-	        <field name="name">Picking to invoice</field>
-	        <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
-	        <field name="object" eval="True"/>
-	    </record>
+        <record model="ir.values" id="ir_open_invoice_type">
+            <field name="key2">tree_but_open</field>
+            <field name="model">sale_journal.invoice.type</field>
+            <field name="name">Picking to invoice</field>
+            <field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
+            <field name="object" eval="True"/>
+        </record>
 
    </data>
 </openerp>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index be16ecfa7e5..70c3e82ee56 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -137,8 +137,8 @@
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" widget="selection"/>
-                        <field name="sprint_id" widget="selection" domain="[('state','in',('draft','open'))]">
+                        <field name="project_id"/>
+                        <field name="sprint_id" domain="[('state','in',('draft','open'))]">
                             <filter icon="terp-project"
                                 string="Sprints"
                                 domain="[('sprint_id.state','=','open')]"
@@ -148,7 +148,7 @@
                                 domain="[('sprint_id','=',False)]"
                                 help="Backlogs Not Assigned To Sprints."/>
                         </field>
-                        <field name="user_id" widget="selection"/>
+                        <field name="user_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
@@ -184,7 +184,7 @@
             <field name="model">scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
+                <tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="scrum_master_id"/>
@@ -266,8 +266,8 @@
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="project_id" widget="selection"/>
-                        <field name="scrum_master_id" widget="selection"/>
+                        <field name="project_id"/>
+                        <field name="scrum_master_id"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
@@ -352,10 +352,10 @@
                     <group col="10" colspan="4">
                         <filter name="scrum_daily" icon="terp-go-today" string="Daily" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Daily Meetings"/>
                         <separator orientation="vertical"/>
-                        <field name="sprint_id" widget="selection">
+                        <field name="sprint_id">
                             <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
                         </field>
-                        <field name="project_id" widget="selection"/>
+                        <field name="project_id"/>
                         <field name="date"/>
                     </group>
                     <newline/>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 70968f73b9b..9ba4073e2e2 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -14,8 +14,8 @@
         <page string="Sales &amp; Purchases" position="inside">
           <group colspan="2" col="2" groups="base.group_extended">
             <separator string="Inventory Properties" colspan="2"/>
-            <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" groups="base.group_extended" />
-            <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
+            <field name="property_stock_customer" domain="[('usage','=','customer')]" groups="base.group_extended" />
+            <field name="property_stock_supplier" domain="[('usage','=','supplier')]" groups="base.group_extended"/>
           </group>
         </page>
       </field>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 4f6ede6c460..da9f0567ad1 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -8,8 +8,8 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
-                   <field name="pricelist_id" widget="selection" position="before">
-                       <field name="location_id" widget="selection" context="{'location': self}" />
+                   <field name="pricelist_id" position="before">
+                       <field name="location_id" context="{'location': self}" />
                        <separator orientation="vertical"/>
                    </field>
             </field>
@@ -43,9 +43,9 @@
                  <page position="after" string="Information">
                     <page string="Properties">
                         <separator string="Counter-Part Locations Properties" colspan="4"/>
-                        <field name="property_stock_procurement"  widget="selection"/>
-                        <field name="property_stock_production"  widget="selection"/>
-                        <field name="property_stock_inventory"  widget="selection"/>
+                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production" domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory" domain="[('usage','=','inventory')]"/>
                         <separator string="Accounting Entries" colspan="4"/>
                         <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
@@ -115,9 +115,9 @@
                 <group name="store" position="after">
                     <group col="2" colspan="2" name="store" groups="base.group_extended">
                         <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" widget="selection"/>
-                        <field name="property_stock_inventory" widget="selection"/>
+                        <field name="property_stock_procurement" domain="[('usage','=','procurement')]"/>
+                        <field name="property_stock_production"  domain="[('usage','=','production')]"/>
+                        <field name="property_stock_inventory"  domain="[('usage','=','inventory')]"/>
                     </group>
                 </group>
             </field>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index e4861120270..7eb19f8863c 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -95,7 +95,7 @@
                 <form string="Stock and Sales Forecasts">
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
-                    <field name="period_id1" widget="selection"/>
+                    <field name="period_id1"/>
                     <newline/>
                     <field name="warehouse_id1" domain = "[('company_id','=',company_id)] "/>
                     <newline/>
@@ -240,11 +240,11 @@
                 <search string="Search Stock and Sales Forecast">
                  <group col='10' colspan='4'>
                     <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" separator="1"/>
-                    <field name="company_id" select="1" widget="selection"/>
-                    <field name="warehouse_id" select="1" widget="selection"/>
-                    <field name="period_id" select="1" widget="selection"/>
-                    <field name="product_id" select="1" widget="selection"/>
-                    <field name="create_uid" select="1" widget="selection"/>
+                    <field name="company_id" widget="selection"/>
+                    <field name="warehouse_id" widget="selection"/>
+                    <field name="period_id" widget="selection"/>
+                    <field name="product_id"/>
+                    <field name="create_uid"/>
                 </group>
               </search>
             </field>
@@ -388,7 +388,7 @@
                     <field name="company_id" widget="selection"/>
                     <field name="warehouse_id" widget="selection"/>
                     <field name="period_id" widget="selection"/>
-                    <field name="product_id" widget="selection"/>
+                    <field name="product_id"/>
                  </group>
               </search>
             </field>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index a604b7c7c37..bd3f257c756 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -260,8 +260,8 @@
                         <separator orientation="vertical"/>
                         <field name="title" select="1"/>
                         <field name="type" select="1" widget="selection"/>
-                        <field name="responsible_id" select="1" widget="selection" default="1">
-                        <filter string="MY" icon="terp-partner" domain="[('responsible_id','=',uid)]"/>
+                        <field name="responsible_id" select="1" default="1">
+                            <filter string="MY" icon="terp-partner" domain="[('responsible_id','=',uid)]"/>
                         </field>
                    </group>
                </search>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index ca0eaccb449..8f07148fd52 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -160,16 +160,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Wiki">
-                        <filter icon="terp-check" string="Need Review" domain="[('review','=',True)]"/>
-                        <separator orientation="vertical"/>
-                        <field name="section" select="1"/>
-                        <field name="name" select="1"/>
-                        <field name="group_id" select="1"/>
-                        <field name="write_uid" select="1"/>
-                        <field name="write_date" select="1"/>
-                        <field name="review" select="1"/>
-<!--                        <field name="create_uid" widget="selection" select="1"/>-->
-                        <newline/>
+                    <filter icon="terp-check" string="Need Review" domain="[('review','=',True)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="section" select="1"/>
+                    <field name="name" select="1"/>
+                    <field name="group_id" select="1"/>
+                    <field name="write_uid" select="1"/>
+                    <field name="write_date" select="1"/>
+                    <field name="review" select="1"/>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="8" col="6">
                         <filter icon="terp-check" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
                         <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>