Merge branch 'crm/crm_16.6' into debug

controllers/roadshow/report.go

@@ -782,7 +782,7 @@ func (this *CalendarController) ReportCalendarList() {
 	}
 
 	if englishCompany > 0 {
-		condition += ` and n.english_company = ? `
+		condition += ` and b.english_company = ? `
 		pars = append(pars, englishCompany)
 	}