diff --git a/location.py b/location.py
index f0df4b1313..febf17ccc5 100644
--- a/location.py
+++ b/location.py
@@ -141,7 +141,7 @@ Party()
 
 
 class ChooseForecatsDateInit(WizardOSV):
-    _name = 'stock.choose_forecast_date.init'
+    _name = 'stock.location_forecast_date.init'
     forecast_date = fields.Date(
         'Forecast Date', help='Allow to compute expected '\
             'stock quantities for this date.\n'\
@@ -157,7 +157,7 @@ class OpenProduct(Wizard):
         'init': {
             'result': {
                 'type': 'form',
-                'object': 'stock.choose_forecast_date.init',
+                'object': 'stock.location_forecast_date.init',
                 'state': [
                     ('end', 'Cancel', 'tryton-cancel'),
                     ('open', 'Open', 'tryton-ok', True),
diff --git a/location.xml b/location.xml
index 5fa07f6c31..215c81cc87 100644
--- a/location.xml
+++ b/location.xml
@@ -169,6 +169,19 @@
             <field name="type">lost_found</field>
         </record>
 
+        <record model="ir.ui.view" id="stock.product_forecast_date_init_view_form">
+            <field name="model">stock.product_forecast_date.init</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <form string="Product Quantity.">
+                    <label name="forecast_date"/>
+                    <field name="forecast_date"/>
+                </form>
+                ]]>
+            </field>
+        </record>
+
         <record model="ir.property" id="property_supplier_location">
             <field name="name">supplier_location</field>
             <field name="field"
diff --git a/product.py b/product.py
index 4be356deeb..99f1f53f20 100644
--- a/product.py
+++ b/product.py
@@ -174,6 +174,15 @@ class Product(OSV):
 Product()
 
 
+class ChooseForecatsDateInit(WizardOSV):
+    _name = 'stock.product_forecast_date.init'
+    forecast_date = fields.Date(
+        'Forecast Date', help='Allow to compute expected '\
+            'stock quantities for this date.\n'\
+            '* An empty value is an infinite date in the future.\n'\
+            '* A date in the past will provide historical values.')
+ChooseForecatsDateInit()
+
 class OpenLocation(Wizard):
     'Products by Locations'
     _name = 'stock.location.open'
@@ -181,7 +190,7 @@ class OpenLocation(Wizard):
         'init': {
             'result': {
                 'type': 'form',
-                'object': 'stock.choose_forecast_date.init',
+                'object': 'stock.product_forecast_date.init',
                 'state': [
                     ('end', 'Cancel', 'tryton-cancel'),
                     ('open', 'Open', 'tryton-ok', True),
diff --git a/product.xml b/product.xml
index 1f2cb4fd78..dee577de4e 100644
--- a/product.xml
+++ b/product.xml
@@ -51,7 +51,7 @@
         </record>
         <record model="ir.action.keyword"
                 id="act_location_quantity_keyword1">
-            <field name="keyword">form_action</field>
+            <field name="keyword">form_relate</field>
             <field name="model">product.product,0</field>
             <field name="action" ref="wizard_open_location"/>
         </record>