From d17c7415cbaa1bfa87b3542fc53fd916d3044a2b Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Tue, 19 Feb 2013 15:08:40 +0530
Subject: [PATCH] fixes in editable calendar

---
 public/js/wn/views/calendar.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/js/wn/views/calendar.js b/public/js/wn/views/calendar.js
index 4bcd481aef..f746af0b55 100644
--- a/public/js/wn/views/calendar.js
+++ b/public/js/wn/views/calendar.js
@@ -115,8 +115,10 @@ wn.views.Calendar = Class.extend({
 			},
 			eventClick: function(event, jsEvent, view) {
 				// edit event description or delete
-				if(wn.model.can_read(me.doctype))
-					wn.set_route("Form", me.doctype, event.name);
+				var doctype = event.doctype || me.doctype;
+				if(wn.model.can_read(doctype)) {
+					wn.set_route("Form", doctype, event.name);
+				}
 			},
 			eventDrop: function(event, dayDelta, minuteDelta, allDay, revertFunc) {
 				me.update_event(event, revertFunc);
@@ -160,19 +162,20 @@ wn.views.Calendar = Class.extend({
 		var me = this;
 		$.each(events, function(i, d) {
 			d.id = d.name;
-			d.editable = wn.model.can_write(d.doctype || this.doctype);
+			d.editable = wn.model.can_write(d.doctype || me.doctype);
 			
 			// do not allow submitted/cancelled events to be moved / extended
-			if(d.docstatus && d.docstatus > 0)
+			if(d.docstatus && d.docstatus > 0) {
 				d.editable = false;
-			
+			}
+				
 			$.each(me.field_map, function(target, source) {
 				d[target] = d[source];
 			});
 			
 			if(!me.field_map.allDay) 
 				d.allDay = 1;
-			
+				
 			if(d.status) {
 				if(me.style_map) {
 					$.extend(d, me.styles[me.style_map[d.status]] || {});