lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
This commit is contained in:
Laurent Destailleur 2017-11-28 12:18:01 +01:00
commit 3b98a06ebb
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/mailings/fraise.modules.php
View File

@ -64,7 +64,7 @@ class mailing_fraise extends MailingTargets
*/ */
function getSqlArrayForStats() function getSqlArrayForStats()
{ {
global $conf,$langs; global $langs;
$langs->load("members"); $langs->load("members");
@ -88,7 +88,6 @@ class mailing_fraise extends MailingTargets
*/ */
function getNbOfRecipients($sql='') function getNbOfRecipients($sql='')
{ {
global $conf;
$sql = "SELECT count(distinct(a.email)) as nb"; $sql = "SELECT count(distinct(a.email)) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a"; $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
$sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")"; $sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";

2
htdocs/don/index.php
View File

@ -55,7 +55,7 @@ $somme=array();
$total = 0; $total = 0;
$sql = "SELECT count(d.rowid) as nb, sum(d.amount) as somme , d.fk_statut"; $sql = "SELECT count(d.rowid) as nb, sum(d.amount) as somme , d.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d WHERE d.entity IN (".getEntity('donation').")";
$sql.= " GROUP BY d.fk_statut"; $sql.= " GROUP BY d.fk_statut";
$sql.= " ORDER BY d.fk_statut"; $sql.= " ORDER BY d.fk_statut";