Merge branch 'master' of github.com:webnotes/erpnext

selling/doctype/lead/lead_list.js

@@ -4,7 +4,8 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
 		this.fields = this.fields.concat([
 			'tabLead.lead_name',
 			'tabLead.status',
-			'tabLead.source'
+			'tabLead.source',
+			'tabLead.modified_by'
 		]);
 		this.stats = this.stats.concat(['status', 'source', 'rating', 'company']);
 	},
@@ -25,7 +26,7 @@ wn.doclistviews['Lead'] = wn.views.ListView.extend({
 
 	columns: [
 		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
+		{width: '5%', content:'avatar_modified'},
 		{width: '30%', content:'lead_name'},
 		{width: '12%', content:'status_html'},
 		{width: '38%', content:'lead_status+tags', css: {color:'#222'}},

selling/page/sales_analytics/sales_analytics.js

@@ -23,6 +23,8 @@ wn.pages['sales-analytics'].onload = function(wrapper) {
 	new erpnext.SalesAnalytics(wrapper);
 }
 
+wn.require("lib/js/wn/views/grid_report.js");
+
 erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
 	init: function(wrapper) {
 		this._super({