diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 2e4f333b840..8f2c7c46c71 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -48,6 +48,14 @@ class stock_period(osv.osv):
     _defaults = {
         'state': 'draft'
     }
+    
+    def button_open(self, cr, uid, ids, context):
+        self.write(cr, uid, ids, {'state': 'open'})
+        return True
+    
+    def button_close(self, cr, uid, ids, context):
+        self.write(cr, uid, ids, {'state': 'close'})
+        return True
 
 stock_period()
 
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 10297a8ef81..1c761a2a21c 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -13,10 +13,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock and Sales Periods">
-                    <field name="name"/>
+                    <field name="name" colspan="2"/>
+                    <newline/>
                     <field name="date_start"/>
-                    <field name="state" select="1"/>
                     <field name="date_stop"/>
+                    <separator string="State" colspan="4"/>
+                    <group col="4" colspan="4">
+                        <field name="state" select="1" readonly="1"/>
+                        <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
+                        <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -26,7 +32,7 @@
             <field name="model">stock.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Stock and Sales Period" editable="bottom">
+                <tree string="Stock and Sales Period" editable="bottom" colors="gray:state == 'close';black:state in ('draft','open')">
                     <field name="name"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
@@ -34,12 +40,29 @@
                 </tree>
             </field>
         </record>
+        
+        <record id="view_stock_period_search" model="ir.ui.view">
+            <field name="name">stock.period.search</field>
+            <field name="model">stock.period</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Stock and Sales Period">
+                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
+                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
+                    <separator orientation="vertical"/>
+                    <field name="name"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
+                </search>
+            </field>
+        </record>
 
         <record id="action_stock_period_form" model="ir.actions.act_window">
             <field name="name">Stock and Sales Periods</field>
             <field name="res_model">stock.period</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_stock_period_search"/>
         </record>
 
         <menuitem
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods.py b/addons/stock_planning/wizard/stock_planning_create_periods.py
index fe953806dcc..9a860beb564 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods.py
+++ b/addons/stock_planning/wizard/stock_planning_create_periods.py
@@ -44,8 +44,8 @@ class stock_period_createlines(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Period Name', size=64),
-        'date_start': fields.date('Start Date', required=True),
-        'date_stop': fields.date('End Date', required=True),
+        'date_start': fields.date('Start Date', required=True, help="Starting date for planning period."),
+        'date_stop': fields.date('End Date', required=True, help="Ending date for planning period."),
         'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
     }
     _defaults={