diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index c39cff04bd9..52f935a0760 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -6,7 +6,7 @@
              <field name="model">product.product</field>
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
-                <field name="purchase_ok" position="after">
+                <field name="purchase_ok" position="before">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
                     <label for="event_ok"/>
                 </field>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 8049255afbf..d9efa612c0b 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -195,8 +195,11 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-            <field name="purchase_ok" position="after">
-            <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
+            <field name="purchase_ok" position="before">
+                <div>
+                    <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
+                    <label for="hr_expense_ok"/>
+                </div>
             </field>
             </field>
         </record>
diff --git a/addons/product/product.py b/addons/product/product.py
index 8bc0789d44b..d04f308bc4b 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -743,6 +743,14 @@ class product_product(osv.osv):
         else:
             return super(product_product, self).copy(cr, uid, id, default=default,
                     context=context)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context and context.get('search_default_categ_id', False):
+            args.append((('categ_id', 'child_of', context['search_default_categ_id'])))
+        return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False)
+
 product_product()
 
 class product_packaging(osv.osv):
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 5ae76a87695..9808fa732e9 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -7,7 +7,11 @@
         <record id="product_category_all" model="product.category">
             <field name="name">All products</field>
         </record>
-
+        <record id="product_category_1" model="product.category">
+            <field name="parent_id" ref="product_category_all"/>
+            <field name="name">Saleable</field>
+        </record>
+        
         <record id="product_uom_categ_unit" model="product.uom.categ">
             <field name="name">Unit</field>
         </record>
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 97d6e03205c..66b86fc7b63 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -9,11 +9,7 @@
         <!--
     Resource: product.category
     -->
-
-        <record id="product_category_1" model="product.category">
-            <field name="parent_id" ref="product.product_category_all"/>
-            <field name="name">Saleable</field>
-        </record>
+ 
         <record id="product_category_2" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Internal</field>
@@ -23,27 +19,27 @@
             <field name="name">Other Products</field>
         </record>
         <record id="product_category_4" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Computers</field>
         </record>
         <record id="product_category_5" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Services</field>
         </record>
         <record id="product_category_6" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">External Devices</field>
         </record>
         <record id="product_category_7" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Accessories</field>
         </record>
         <record id="product_category_8" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Components</field>
         </record>
         <record id="product_category_9" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Softwares</field>
         </record>
         <record id="product_category_10" model="product.category">
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 9d23e97b385..dc222a42398 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -2,7 +2,7 @@
 <document filename="Request for Quotation.pdf">
   <template title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
+      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 888488dc586..a4094cb9afc 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -46,7 +46,7 @@ class stock_config_settings(osv.osv_memory):
                 manage product manufacturing chains, manage default locations per product,
                 define routes within your warehouse according to business needs, etc.
                 This installs the module stock_location."""),
-        'group_uom': fields.boolean("Manage different units of measure per products",
+        'group_uom': fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
         'group_uos': fields.boolean("Invoice products in a different unit of measure than the sale order",