diff --git a/mrp_operations_extension/models/mrp_production.py b/mrp_operations_extension/models/mrp_production.py
index 453274471..fd5f75b6f 100644
--- a/mrp_operations_extension/models/mrp_production.py
+++ b/mrp_operations_extension/models/mrp_production.py
@@ -10,6 +10,9 @@ class MrpProduction(models.Model):
     _inherit = 'mrp.production'
 
     workcenter_lines = fields.One2many(readonly=False)
+    date_planned = fields.Datetime(states={'draft': [('readonly', False)],
+                                           'confirmed': [('readonly', False)],
+                                           'ready': [('readonly', False)]})
 
     def _get_minor_sequence_operation(self, operations):
         return min(operations, key=lambda x: x.sequence)
@@ -119,6 +122,31 @@ class MrpProductionWorkcenterLine(models.Model):
     def force_assign(self):
         self.move_lines.force_assign()
 
+    @api.multi
+    def _load_mo_date_planned(self, production, date_planned):
+        if date_planned < production.date_planned:
+            production.write({'date_planned': date_planned})
+
+    @api.model
+    def create(self, vals):
+        production_obj = self.env['mrp.production']
+        dp = vals.get('date_planned', False)
+        production_id = vals.get('production_id', False)
+        if dp and production_id:
+            production = production_obj.browse(production_id)
+            self._load_mo_date_planned(production, dp)
+        return super(MrpProductionWorkcenterLine, self).create(vals)
+
+    @api.multi
+    def write(self, vals, update=False):
+        if vals.get('date_planned', False):
+            dp = vals.get('date_planned')
+            self._load_mo_date_planned(self.production_id, dp)
+            update = True
+        res = super(MrpProductionWorkcenterLine, self).write(vals,
+                                                             update=update)
+        return res
+
     def check_minor_sequence_operations(self):
         seq = self.sequence
         for operation in self.production_id.workcenter_lines:
diff --git a/mrp_operations_extension/views/mrp_production_view.xml b/mrp_operations_extension/views/mrp_production_view.xml
index a8d7a1b72..4650f8260 100644
--- a/mrp_operations_extension/views/mrp_production_view.xml
+++ b/mrp_operations_extension/views/mrp_production_view.xml
@@ -225,5 +225,19 @@
                 </field>
             </field>
         </record>
+
+    <record id="workcenter_line_future_calendar" model="ir.ui.view">
+        <field name="name">mrp.production.workcenter.line.future.calendar</field>
+        <field name="model">mrp.production.workcenter.line</field>
+        <field name="priority" eval="10"/>
+        <field name="arch" type="xml">
+            <calendar color="production_id" date_stop="date_planned_end" date_start="date_planned" string="Operations">
+                <field name="workcenter_id"/>
+                <field name="production_id"/>
+                <field name="product"/>
+            </calendar>
+        </field>
+    </record>
+
     </data>
 </openerp>