diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index d654e337e67..ff01528d5f7 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -133,6 +133,18 @@ mrp_operations_operation_code()
 
 class mrp_operations_operation(osv.osv):
     _name="mrp_operations.operation"
+    
+    def _order_date_search_production(self,cr,uid,ids):
+        operation_ids=self.pool.get('mrp_operations.operation').search(cr,uid,[('production_id','=',ids[0])])
+        return operation_ids
+        
+    def _get_order_date(self, cr, uid, ids, field_name, arg, context):
+        res={}
+        operation_obj=self.browse(cr, uid, ids, context=context)
+        for operation in operation_obj:
+                res[operation.id]=operation.production_id.date_planned
+        return res
+    
     def create(self, cr, uid, vals, context=None):
         wf_service = netsvc.LocalService('workflow')
         code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
@@ -154,6 +166,9 @@ class mrp_operations_operation(osv.osv):
         'production_id':fields.many2one('mrp.production','Production',required=True),
         'workcenter_id':fields.many2one('mrp.workcenter','Workcenter',required=True),
         'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
+        'date_start': fields.datetime('Start Date'),
+        'date_finished': fields.datetime('End Date'),
+        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(['date_planned'],_order_date_search_production)}),
         }
 
 mrp_operations_operation()
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9cd3ae93053..d1aade98cbb 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -145,6 +145,9 @@
 				<field name="production_id"/>
 				<field name="workcenter_id"/>
 				<field name="code_id"/>
+				<field name="date_start"/>
+				<field name="date_finished"/>
+				<field name="order_date"/>
 			</tree>
 		</field>
 	</record>
@@ -167,11 +170,25 @@
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp_operations.operation</field>
 		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar,form</field>
 		<field name="view_id" ref="mrp_production_operation_tree_view"/>
 	</record>
-
 	<menuitem name="Operations" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_operation_action" action="mrp_production_operation_action"/>
-
+	
+	<record model="ir.ui.view" id="operation_calendar_view">
+			<field name="name">mrp.perations.calendar</field>
+			<field name="model">mrp_operations.operation</field>
+			<field name="type">calendar</field>
+			<field name="priority" eval="2"/>
+			<field name="arch" type="xml">
+				<calendar string="Calendar View" date_start="order_date" color="workcenter_id">
+					<field name="code_id"/>
+					<field name="production_id"/>
+					<field name="date_start"/>
+					<field name="date_finished"/>
+				</calendar>
+			</field>
+	</record>
 
 </data>
 </terp>