diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 8ff87c68c82..de79d96fde4 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -35,9 +35,9 @@
                             <field name="amount" attrs="{'invisible':[('free_if_more_than','=',False)]}"/>
                         </group>
                         <newline/>
-						<field name="use_detailed_pricelist"/>
+						<field name="use_detailed_pricelist" />
                     </group>
-						<field name="pricelist_ids" nolabel="1"/>
+						<field name="pricelist_ids" nolabel="1" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}"/>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index caaaef12f01..8ac7ecfcb2f 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -7,7 +7,7 @@
             <field name="standard_price">30.0</field>
             <field name="uom_id" ref="product.uom_hour"/>
             <field name="uom_po_id" ref="product.uom_hour"/>
-            <field name="name">Service on Timesheet</field>
+            <field name="name">consultant</field>
             <field name="categ_id" ref="product.cat0"/>
             <field name="type">service</field>
             <field eval="False" name="purchase_ok"/>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 76d2413488b..7e9859557c9 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -24,14 +24,22 @@
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
                 <form string="Order">
-                    <group colspan="2" col="4">
+                    <group col="4" colspan="4">
                         <field name="user_id" select="1"/>
                         <field name="date" select="1"/>
-                        <field name="product" select="1" on_change="onchange_product(product)"/>
-                        <field name="category"/>
+                    </group>
+                    <group col="4" colspan="4">
+                         <field name="product" select="1" on_change="onchange_product(product)"/>
+                         <field name="category"/>
+                         <field name="cashmove"/>
                         <field name="descript"/>
+                     </group>
+                    <group col="4" colspan="6" >
                         <field name="price"/>
-                        <field name="cashmove"/>
+                        <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok"/>
+                        <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
+                    </group>
+                    <group col="2" colspan="4">
                         <field name="state"/>
                     </group>
                 </form>
@@ -187,7 +195,6 @@
                 <search string="Search CashMove">
                     <filter icon="terp-go-today" name="Today" string="Today" domain="[('create_date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59'))]"/>
                     <separator orientation="vertical"/>
-                    <field name="name"/>
                     <field name="user_cashmove"/>
                     <field name="create_date"/>
                     <newline/>
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index e50f4ad222c..9566f6833f7 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -30,11 +30,6 @@
            <field name="view_id" ref="view_lunch_order_cancel"/>
            <field name="target">new</field>
         </record>
-
-        <act_window id="action_lunch_order_cancel_values"
-    		key2="client_action_multi" name="Cancel Order"
-    		res_model="lunch.order.cancel" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form"/>
-
+        
     </data>
 </openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index eba7d12c846..9772f2ceea3 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -33,10 +33,5 @@
            <field name="target">new</field>
         </record>
 
-        <act_window id="action_lunch_order_confirm_values"
-    		key2="client_action_multi" name="Confirm Order"
-    		res_model="lunch.order.confirm" src_model="lunch.order"
-    		view_mode="form" target="new" view_type="form"/>
-
     </data>
 </openerp>
diff --git a/addons/users_ldap/__init__.py b/addons/users_ldap/__init__.py
index be78d7ff6c1..81aa713d8c2 100644
--- a/addons/users_ldap/__init__.py
+++ b/addons/users_ldap/__init__.py
@@ -19,5 +19,6 @@
 ##############################################################################
 
 import users_ldap
+import installer
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index 71ed399c5da..752db262e7c 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -40,6 +40,7 @@ This module only works with Unix/Linux.
     ],
     "update_xml" : [
         "users_ldap_view.xml",
+        "user_ldap_installer.xml",
     ],
     "active": False,
     "installable": True,