diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 3049fbb17b2..31ddb5df1f1 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -5,8 +5,8 @@
         <menuitem icon="terp-administration" id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
         <menuitem id="next_id_4" name="Low Level Objects"
             parent="base.menu_administration" sequence="3"
-            groups="base.group_extended"/>
-        <menuitem id="menu_low_workflow" name="Workflow Items" parent="base.next_id_4"/>
+            groups="base.group_extended,base.group_no_one"  />
+        <menuitem id="menu_low_workflow" name="Workflows" parent="base.next_id_4"/>
         <menuitem id="menu_custom" name="Customization"
             parent="base.menu_administration" sequence="2"
             groups="base.group_extended"/>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 86b17249680..5ecbebef4f2 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -10,17 +10,41 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Connect Events to Actions">
-                    <field name="name" required="1"/>
-                    <field name="model_id" on_change="onchange_object_id(model_id)"/>
-                    <field name="action_id" on_change="onchange_action_id(action_id)"/>
-                    <field name="key2" required="1"/>
-                    <field name="object" readonly="1"/>
-                    <field name="res_id"/>
-                    <field name="value_unpickle"/>
-                    <field name="meta_unpickle"/>
+                   <field name="name" required="1"/>
+                   <newline/>
+                    <group col="2" colspan="2">
+                        <separator string="Action Source" colspan="2"/>
+                        <field name="model_id" on_change="onchange_object_id(model_id)"/>
+                        <field name="res_id"/>
+                        <field name="key2" required="1"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Action To Launch" colspan="2"/>
+                        <field name="action_id" on_change="onchange_action_id(action_id)"/>
+
+                        <field name="object" readonly="1"/>
+
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Values for Event Type" colspan="2"/>
+                        <label string="client_action_multi, client_action_relate" colspan="2"/>
+                        <label string="tree_but_action, client_print_multi"  colspan="2"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Value"/>
+                         <field name="value_unpickle" nolabel="1" colspan="4"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Metadata"/>
+                        <field name="meta_unpickle" nolabel="1"/>
+                    </group>
+                    <group col="2" colspan="2">
+                    <separator colspan="2" string=""/>
                     <field name="user_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                </form>
+                    </group>
+              </form>
+
             </field>
         </record>
 
@@ -47,12 +71,17 @@
                     <field name="name"/>
                     <field name="model"/>
                     <field name="key2"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'key2'}"/>
+                    </group>
                 </search>
             </field>
         </record>
 
         <record id="act_values_form_action" model="ir.actions.act_window">
-            <field name="name">Client Actions</field>
+            <field name="name">Client Events</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.values</field>
             <field name="view_type">form</field>
@@ -63,20 +92,20 @@
         </record>
 
         <record model="ir.actions.act_window.view" id="action_values_tree_view">
-	        <field name="sequence" eval="1"/>
-	        <field name="view_mode">tree</field>
-	        <field name="view_id" ref="values_view_tree_action"/>
-	        <field name="act_window_id" ref="act_values_form_action"/>
-	    </record>
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="values_view_tree_action"/>
+            <field name="act_window_id" ref="act_values_form_action"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_values_form_view">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="values_view_form_action"/>
+            <field name="act_window_id" ref="act_values_form_action"/>
+        </record>
 
-	    <record model="ir.actions.act_window.view" id="action_values_form_view">
-	        <field name="sequence" eval="2"/>
-	        <field name="view_mode">form</field>
-	        <field name="view_id" ref="values_view_form_action"/>
-	        <field name="act_window_id" ref="act_values_form_action"/>
-	    </record>
 
-        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="base.menu_custom_action"/>
 
 
         <!-- Values -->
@@ -254,7 +283,7 @@
         </record>
 
         <record id="ir_sequence_type" model="ir.actions.act_window">
-            <field name="name">Sequence Types</field>
+            <field name="name">Sequence Codes</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.sequence.type</field>
             <field name="view_type">form</field>
@@ -312,6 +341,7 @@
         </record>
         <menuitem id="next_id_6" name="Actions" parent="base.next_id_4"/>
         <menuitem action="ir_sequence_actions" id="menu_ir_sequence_actions" parent="next_id_6"/>
+        <menuitem action="act_values_form_action" id="menu_values_form_action" parent="next_id_6"/>
 
         <!--Filters form view-->
 
@@ -321,7 +351,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Filters">
-                    <group colspan="4" >
+                    <group colspan="4" col="6" >
                         <field name="name"/>
                         <field name="user_id"/>
                         <field name="model_id"/>
@@ -362,13 +392,14 @@
             <field name="arch" type="xml">
                 <search string="Filters">
                     <group colspan="4" col="10">
-		              <field name="name"/>
-		              <field name="user_id"/>
-		            </group>
-		            <newline/>
-		            <group expand="0" string="Group By" colspan="4">
-		              <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-		            </group>
+                      <field name="name"/>
+                      <field name="user_id"/>
+                      <field name="model_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By" colspan="4">
+                      <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -424,16 +455,12 @@
                         <field name="name"/>
                         <field name="type"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Group By" colspan="4">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
-                    </group>
                 </search>
            </field>
         </record>
 
         <record id="ir_action_report_custom" model="ir.actions.act_window">
-            <field name="name">Report Custom</field>
+            <field name="name">Custom Reports</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.actions.report.custom</field>
             <field name="view_type">form</field>
@@ -525,7 +552,7 @@
         </record>
 
         <record id="ir_action_report_xml" model="ir.actions.act_window">
-            <field name="name">Report Xml</field>
+            <field name="name">XML Reports</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">ir.actions.report.xml</field>
             <field name="view_type">form</field>
@@ -600,8 +627,6 @@
                             </group>
                         </page>
                         <page string="Security">
-                            <separator colspan="4" string="Select Users" />
-                            <field colspan="4" name="default_user_ids" nolabel="1"/>
                             <separator colspan="4" string="Select Groups" />
                             <field name="groups_id" nolabel="1" colspan="4" />
                         </page>
@@ -668,10 +693,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Wizards">
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="wiz_name"/>
-                    <field name="multi"/>
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="type"/>
+                        <field name="wiz_name"/>
+                    </group>
+                    <group colspan="2" col="4">
+                        <field name="multi"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Security">
                             <field colspan="4" name="groups_id" nolabel="1"/>
@@ -830,7 +859,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Parent" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'parent_id'}"/>
-                	</group>
+                    </group>
                 </search>
             </field>
         </record>
@@ -851,21 +880,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Views">
-                    <group colspan="2" col="2">
-                        <separator string="General" colspan="2"/>
-                        <field name="name" select="1"/>
+                   <separator string="General" colspan="4"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1" colspan="6"/>
                         <field name="type" select="1"/>
                         <field name="model" select="1"/>
                         <field name="priority"/>
                     </group>
-                    <group colspan="2" col="2">
-                        <separator string="Advanced" colspan="2"/>
-                        <field name="field_parent"/>
-                        <field name="inherit_id" select="1"/>
-                        <field name="xml_id" select="1"/>
-                    </group>
-                    <separator string="View architecture" colspan="4"/>
-                    <field colspan="4" nolabel="1" name="arch"/>
+                    <notebook colspan="4">
+                        <page string="Architecture">
+                            <field colspan="4" nolabel="1" name="arch"/>
+                        </page>
+                        <page string="Extra Info">
+                            <separator string="Advanced" colspan="4"/>
+                            <newline/>
+                            <field name="field_parent"/>
+                            <field name="inherit_id" select="1"/>
+                            <field name="xml_id" select="1"/>
+                        </page>
+
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -892,6 +926,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Views">
+                    <filter icon="terp-stock_zoom"
+                        string="Search"
+                        domain="[('type', '=', 'search')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="gtk-indent"
+                        string="Tree"
+                        domain="[('type', '=', 'tree')]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="gtk-new"
+                        string="Form"
+                        domain="[('type', '=','form')]"/>
+                    <newline/>
                     <field name="name"/>
                     <field name="type"/>
                     <field name="model"/>
@@ -899,7 +945,7 @@
                     <field name="xml_id"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Object" icon="terp-stage" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                 </search>
@@ -921,10 +967,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Attachments">
-                    <group colspan="4" col="4">
-                        <field name="name" select="1" />
-                        <field name="type"/>
-                    </group>
+                    <field name="name" />
+                    <field name="type"/>
                     <notebook colspan="4">
                     <page string="Attachment">
                     <group col="4" colspan="4">
@@ -1210,12 +1254,26 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Model Description">
+                    <filter icon="terp-camera_test"
+                        string="In Memory"
+                        domain="[('osv_memory', '=', True)]"/>
+                    <separator orientation="vertical"/>
+
+                    <filter icon="terp-stock_align_left_24"
+                        string="Custom"
+                        domain="[('state', '=', 'manual')]"/>
+                    <separator orientation="vertical"/>
+
+                    <filter icon="terp-translate"
+                        string="Base"
+                        domain="[('state', '=', 'base')]"/>
+
+                    <separator orientation="vertical"/>
+
                     <field name="name"/>
                     <field name="model"/>
-                    <field name="osv_memory"/>
-                    <field name="state"/>
-                    <field name="access_ids"/>
-                    <field name="info"/>
+
+                    <newline/>
                 </search>
             </field>
         </record>
@@ -1227,12 +1285,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fields">
-                    <group colspan="4" col="4">
-                        <field name="name" select="1"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1" />
                         <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
                         <field name="field_description"/>
                         <field name="state"/>
-                    </group>
+                          </group>
                     <notebook colspan="4">
                         <page string="Properties">
                             <group colspan="2" col="2">
@@ -1282,12 +1340,29 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Fields">
+                    <filter icon="terp-camera_test"
+                        string="Required"
+                        domain="[('required', '=', True)]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-stock_align_left_24"
+                        string="Readonly"
+                        domain="[('readonly', '=', True)]"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-translate"
+                        string="Translate"
+                        domain="[('translate', '=', True)]"/>
+                    <newline/>
                     <field name="name"/>
                     <field name="field_description"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
                     <field name="required"/>
                     <field name="readonly"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                    </group>
+
                 </search>
             </field>
         </record>
@@ -1330,6 +1405,10 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Module Data">
+                    <filter icon="terp-camera_test"
+                        string="Updatable"
+                        domain="[('noupdate', '=', False)]"/>
+                    <separator orientation="vertical"/>
                     <field name="module"/>
                     <field name="name"/>
                     <field name="model"/>
@@ -1337,8 +1416,8 @@
                     <field name="noupdate"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="Module" icon="terp-stage" domain="[]" context="{'group_by':'module'}"/>
-                        <filter string="Object" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'model'}"/>
+                        <filter string="Module" icon="terp-folder-blue" domain="[]" context="{'group_by':'module'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
                     </group>
                 </search>
             </field>
@@ -1403,13 +1482,13 @@
                     <field name="name"/>
                     <field name="res_id"/>
                     <group colspan="2" col="2">
-		               <separator string="Source Term" colspan="2"/>
-		               <field name="src" nolabel="1" height="400"/>
-	                </group>
-	                <group colspan="2" col="2">
-		               <separator string="Tranlsation" colspan="2"/>
-		               <field name="value" nolabel="1" height="400"/>
-		            </group>
+                       <separator string="Source Term" colspan="2"/>
+                       <field name="src" nolabel="1" height="400"/>
+                    </group>
+                    <group colspan="2" col="2">
+                       <separator string="Tranlsation" colspan="2"/>
+                       <field name="value" nolabel="1" height="400"/>
+                    </group>
 
                 </form>
             </field>
@@ -1496,9 +1575,9 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Groups">
-		                    <field name="groups_id" colspan="4" nolabel="1"/>
-		                </page>
-		            </notebook>
+                            <field name="groups_id" colspan="4" nolabel="1"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -1509,11 +1588,11 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Menu">
-	                <field name="name" string="Menu" />
-	                <field name="parent_id"/>
-	            </search>
-	        </field>
-	    </record>
+                    <field name="name" string="Menu" />
+                    <field name="parent_id"/>
+                </search>
+            </field>
+        </record>
 
         <record id="grant_menu_access" model="ir.actions.act_window">
             <field name="name">Menu Items</field>
@@ -1569,7 +1648,8 @@
                         <separator string="Action to Trigger" colspan="4"/>
                         <field name="model" groups="base.group_extended"/>
                         <field name="function"/>
-                        <field colspan="4" name="args"/>
+                        <separator string="Arguments" colspan="4"/>
+                        <field colspan="4" name="args" nolabel="1"/>
                     </page>
                     </notebook>
                 </form>
@@ -1588,8 +1668,8 @@
                     <field name="active"/>
                     <newline/>
                     <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal-" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Next Call" icon="terp-go-month"
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Execution" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'nextcall'}" />
                     </group>
                 </search>
@@ -1618,7 +1698,7 @@
             <field name="view_id" ref="ir_cron_view_tree"/>
         </record>
 
-        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_config"/>
+        <menuitem id="next_id_10" name="Scheduler" parent="base.menu_config"  groups="base.group_extended"/>
         <menuitem action="ir_cron_act" id="menu_ir_cron_act" parent="next_id_10"/>
 
 
@@ -1645,17 +1725,17 @@
             <field name="arch" type="xml">
                 <form string="Access Controls">
                     <group col="6" colspan="4">
-	                    <field name="name"/>
-	                    <field name="model_id"/>
-	                    <field name="group_id"/>
-	                </group>
-	                <separator string="Access" colspan="4"/>
-		                <group col="4" colspan="4">
-							<field name="perm_read"/>
-			                <field name="perm_write"/>
-			                <field name="perm_create"/>
-			                <field name="perm_unlink"/>
-			           </group>
+                        <field name="name"/>
+                        <field name="model_id"/>
+                        <field name="group_id"/>
+                    </group>
+                    <separator string="Access" colspan="4"/>
+                        <group col="4" colspan="4">
+                            <field name="perm_read"/>
+                            <field name="perm_write"/>
+                            <field name="perm_create"/>
+                            <field name="perm_unlink"/>
+                       </group>
                 </form>
             </field>
         </record>
@@ -1666,21 +1746,21 @@
             <field name="arch" type="xml">
                 <search string="Access Controls">
                 <group>
-                		<filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
+                        <filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
                         <separator orientation="vertical"/>
                         <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
                         <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
                         <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
-	                    <separator orientation="vertical"/>
-                		<field name="name"/>
-	          			<field name="model_id"/>
-	            		<field name="group_id"/>
-	            </group>
-	            <newline/>
-	            <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                          <field name="model_id"/>
+                        <field name="group_id"/>
+                </group>
+                <newline/>
+                <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                      <filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
                      <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
-               	</group>
+                   </group>
                 </search>
             </field>
         </record>
@@ -1758,21 +1838,21 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Record rules">
-                	<group>
+                    <group>
                         <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
                         <separator orientation="vertical"/>
                         <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
                         <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
                         <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="model_id"/>
-	                    <field name="global"/>
-	                    <field name="groups"/>
-	                </group>
+                        <separator orientation="vertical"/>
+                        <field name="model_id"/>
+                        <field name="global"/>
+                        <field name="groups"/>
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
                         <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
-                	</group>
+                    </group>
                 </search>
             </field>
         </record>
@@ -1895,13 +1975,13 @@
             <field name="arch" type="xml">
                 <search string="Server Actions">
                     <group col="10" colspan="4">
-	                    <field name="name"/>
-	                    <field name="state"/>
-	                    <field name="model_id"/>
-	                </group>
+                        <field name="name"/>
+                        <field name="state"/>
+                        <field name="model_id"/>
+                    </group>
                     <newline/>
                     <group expand="0" string="Group By" colspan="4" col="4">
-	                   <filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
+                       <filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -1917,7 +1997,7 @@
             <field name="search_view_id" ref="view_server_action_search"/>
             <field name="context">{'key':'server_action'}</field>
         </record>
-        <menuitem action="action_server_action" id="menu_server_action" parent="base.menu_custom_action"/>
+        <menuitem action="action_server_action" id="menu_server_action" parent="base.next_id_6"/>
 
         <record id="ir_actions_todo_tree" model="ir.ui.view">
             <field name="model">ir.actions.todo</field>
@@ -1966,8 +2046,8 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Actions">
-                	<filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
-                	<separator orientation="vertical"/>
+                    <filter string="To Do" name="todo" icon="terp-camera_test" domain=" ['|',('state','=','open'),'&amp;',('state','=','skip'),('restart','=','onskip')]" help="Todo State Or (Skip State And Onskip Restart)"/>
+                    <separator orientation="vertical"/>
                     <field name="state"/>
                     <field name="restart"/>
                 </search>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 4b9d59743cb..09469e33450 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -36,7 +36,7 @@ class actions(osv.osv):
     _table = 'ir_actions'
     _columns = {
         'name': fields.char('Action Name', required=True, size=64),
-        'type': fields.char('Action Type', required=True, size=32),
+        'type': fields.char('Action Type', required=True, size=32,readonly=True),
         'usage': fields.char('Action Usage', size=32),
     }
     _defaults = {
diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py
index 6b96333b5d5..c4d4e72260f 100644
--- a/bin/addons/base/ir/ir_cron.py
+++ b/bin/addons/base/ir/ir_cron.py
@@ -47,15 +47,15 @@ class ir_cron(osv.osv, netsvc.Agent):
         'name': fields.char('Name', size=60, required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
         'active': fields.boolean('Active'),
-        'interval_number': fields.integer('Interval Number'),
+        'interval_number': fields.integer('Interval Number',help="Repeat every x."),
         'interval_type': fields.selection( [('minutes', 'Minutes'),
             ('hours', 'Hours'), ('work_days','Work Days'), ('days', 'Days'),('weeks', 'Weeks'), ('months', 'Months')], 'Interval Unit'),
         'numbercall': fields.integer('Number of Calls', help='Number of time the function is called,\na negative number indicates that the function will always be called'),
-        'doall' : fields.boolean('Repeat Missed'),
-        'nextcall' : fields.datetime('Next Execution Date', required=True),
-        'model': fields.char('Object', size=64),
-        'function': fields.char('Function', size=64),
-        'args': fields.text('Arguments'),
+        'doall' : fields.boolean('Repeat Missed',help="Select this if you want to run the scheduler for the missed occurencs."),
+        'nextcall' : fields.datetime('Next Execution Date', required=True,help="Date when this schedular will call next time"),
+        'model': fields.char('Object', size=64,help="Name of object whose function will be called when this scheduler will run. e.g. 'res.partener'"),
+        'function': fields.char('Function', size=64,help="Name of the function to be called by this scheduler. "),
+        'args': fields.text('Arguments',help="Arguments to be passed to the function. e.g. (uid,)"),
         'priority': fields.integer('Priority', help='0=Very Urgent\n10=Not urgent')
     }
 
diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py
index 2821d0c94b7..8f9869a6922 100644
--- a/bin/addons/base/ir/ir_filters.py
+++ b/bin/addons/base/ir/ir_filters.py
@@ -42,7 +42,7 @@ class ir_filters(osv.osv):
         'user_id':fields.many2one('res.users', 'User', help='False means for every user'),
         'domain': fields.text('Domain Value', required=True),
         'context': fields.text('Context Value', required=True),
-        'model_id': fields.selection(_list_all_models, 'Model', required=True),
+        'model_id': fields.selection(_list_all_models, 'Object', required=True),
     }
 
 ir_filters()
diff --git a/bin/addons/base/module/wizard/base_module_configuration_view.xml b/bin/addons/base/module/wizard/base_module_configuration_view.xml
index 7f11eced7d4..e5ad8f720bd 100644
--- a/bin/addons/base/module/wizard/base_module_configuration_view.xml
+++ b/bin/addons/base/module/wizard/base_module_configuration_view.xml
@@ -26,7 +26,7 @@
 
         <menuitem name="Start Configuration"
             action="action_start_configurator"
-            id="menu_view_base_module_configuration" parent="next_id_11"
+            id="menu_view_base_module_configuration" parent="base.menu_config"
             type="server" icon="STOCK_EXECUTE" sequence="100" />
 
         <record model="ir.values" id="action_todo_config">
@@ -38,6 +38,6 @@
             <field name="key">action</field>
             <field name="model">ir.actions.todo</field>
         </record>
-    
+
     </data>
 </openerp>
diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index f5a951d0c29..399cac47136 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -73,7 +73,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="ir_property_view_tree"/>
         </record>
-        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config"/>
+        <menuitem id="next_id_15" name="Parameters" parent="base.menu_config" groups="base.group_extended" />
         <menuitem action="ir_property_form" id="menu_ir_property_form_all" parent="base.next_id_15"/>
     </data>
 </openerp>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index 3e83f6c3e96..2b1195df51c 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    	<menuitem name="Requests" id="menu_resquest_ref" parent="base.next_id_4" sequence="1"/>
+
         <record id="res_request_tree-view" model="ir.ui.view">
             <field name="name">res.request.tree</field>
             <field name="model">res.request</field>
@@ -40,9 +42,9 @@
                             <field colspan="4" name="body" nolabel="1"/>
                             <group col="5" colspan="4">
                                 <field name="state"/>
-                                <button name="request_close" states="waiting,draft,active" string="End of Request" type="object"/>
-                                <button name="request_send" states="draft,active" string="Send" type="object"/>
-                                <button name="request_reply" states="waiting" string="Reply" type="object"/>
+                                <button name="request_close" states="waiting,draft,active" string="Close" type="object" icon="gtk-stop"/>
+                                <button name="request_send" states="draft,active" string="Send" type="object" icon="terp-camera_test"/>
+                                <button name="request_reply" states="waiting" string="Reply" type="object" icon="gtk-undo"/>
                             </group>
                         </page>
                         <page string="References" groups="base.group_extended">
@@ -75,12 +77,15 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Requests">
-                    <group colspan="4" col="10">
-	                    <field name="act_from"/>
-	                    <field name="act_to" select="1"/>
-	                    <field name="name"/>
-	                    <field name="state"/>
-	                </group>
+                    <filter string="Current" icon="terp-camera_test" domain="['|',('state','=','draft'),('state','=','active')]"
+                    help="Draft and Active"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state','=','waiting')]"/>
+                    <separator orientation="vertical"/>
+                    <field name="act_from"/>
+                    <field name="act_to" select="1"/>
+                    <field name="name"/>
+                    <field name="state"/>
 	                <newline/>
 	                <group expand="0" string="Group By" colspan="4">
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
@@ -108,7 +113,7 @@
             <field name="search_view_id" ref="res_request_search_view"/>
             <field name="context">{"search_default_act_to":uid}</field>
         </record>
-        <menuitem action="res_request-act" id="menu_res_request_act" parent="base.next_id_4" sequence="1"/>
+        <menuitem action="res_request-act" id="menu_res_request_act" parent="menu_resquest_ref" />
 
         <record id="res_request_link-view" model="ir.ui.view">
             <field name="name">res.request.link.form</field>
@@ -146,14 +151,16 @@
         </record>
 
         <record id="res_request_link-act" model="ir.actions.act_window">
-            <field name="name">References Link</field>
+            <field name="name">Request Reference Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.request.link</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="res_request_link_search_view"/>
         </record>
-        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_4" sequence="4"/>
+        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="menu_resquest_ref" />
+
+
 
 
         <record id="res_request_history_tree-view" model="ir.ui.view">