Merge branch 'develop'

webnotes · Mar 6, 2014 · 3530d78 · 3530d78
2 parents f079faa + 424e49e
commit 3530d78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.9.6", 
+ "framework_version": "3.9.7", 
  "modules": {
   "Calendar": {
    "color": "#2980b9", 

diff --git a/public/js/wn/views/grid_report.js b/public/js/wn/views/grid_report.js
@@ -587,6 +587,7 @@ wn.views.GridReport = Class.extend({
 		var date_diff = dateutil.get_diff(this.to_date, this.from_date);
 
 		me.column_map = {};
+		me.last_date = null;
 
 		var add_column = function(date) {
 			me.columns.push({