diff --git a/addons/stock_account/wizard/stock_valuation_history.py b/addons/stock_account/wizard/stock_valuation_history.py
index 1d61d29faf4..a56726bb1c6 100644
--- a/addons/stock_account/wizard/stock_valuation_history.py
+++ b/addons/stock_account/wizard/stock_valuation_history.py
@@ -21,7 +21,8 @@ class wizard_valuation_history(osv.osv_memory):
         data = self.read(cr, uid, ids, context=context)[0]
         ctx = context.copy()
         ctx['history_date'] = data['date']
-        ctx['group_by'] = ['product_id']
+        ctx['search_default_group_by_product'] = True
+        ctx['search_default_group_by_location'] = True
         return {
             'domain': "[('date', '<=', '" + data['date'] + "')]",
             'name': _('Stock Value At Date'),
diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml
index 9d45903f766..273e77aebff 100644
--- a/addons/stock_account/wizard/stock_valuation_history_view.xml
+++ b/addons/stock_account/wizard/stock_valuation_history_view.xml
@@ -38,7 +38,7 @@
         <field name="name">Stock Value At Date</field>
         <field name="model">stock.history</field>
         <field name="arch" type="xml">
-            <tree string="Stock Value At Date">
+            <tree string="Stock Value At Date" create="0">
                 <field name="location_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="move_id"/>
@@ -60,7 +60,7 @@
                 <group expand="1" string="Group By...">
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}" name='group_by_product'/>
                     <filter string="Product Category" icon="terp-accessories-archiver" context="{'group_by':'product_categ_id'}"/>
-                    <filter string="Location" icon="terp-accessories-archiver" context="{'group_by':'location_id'}"/>
+                    <filter string="Location" icon="terp-accessories-archiver" context="{'group_by':'location_id'}" name='group_by_location'/>
                     <filter string="Move" icon="terp-accessories-archiver" context="{'group_by':'move_id'}"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                  </group>