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

Doc

Browse Source
This commit is contained in:
Laurent Destailleur 2008-07-07 00:12:02 +00:00
parent 1e1558897e
commit fdad333184
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/contact/fiche.php
View File

@ -670,9 +670,10 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
// Recherche histo sur mailing // Recherche histo sur mailing
$sql = "SELECT m.rowid as id, ".$db->pdate("mc.date_envoi")." as da, m.titre as note, '100' as percentage,"; $sql = "SELECT m.rowid as id, ".$db->pdate("mc.date_envoi")." as da, m.titre as note, '100' as percentage,";
$sql.= " 'AC_EMAILING' as acode,"; $sql.= " 'AC_EMAILING' as acode,";
$sql.= " u.rowid as user_id, u.login"; $sql.= " u.rowid as user_id, u.login"; // User that valid action
$sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u "; $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE mc.email = '".addslashes($contact->email)."'"; $sql.= " ,".MAIN_DB_PREFIX."socpeople as sp";
$sql.= " WHERE mc.email = '".addslashes($contact->email)."'"; // Search is done on email.
$sql.= " AND mc.statut = 1"; $sql.= " AND mc.statut = 1";
$sql.= " AND u.rowid = m.fk_user_valid"; $sql.= " AND u.rowid = m.fk_user_valid";
$sql.= " AND mc.fk_mailing=m.rowid"; $sql.= " AND mc.fk_mailing=m.rowid";
@ -689,7 +690,8 @@ if ($_GET["id"] && $_GET["action"] != 'edit')
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$histo[$numaction]=array('type'=>'mailing','id'=>$obj->id,'date'=>$obj->da,'note'=>$obj->note,'percent'=>$obj->percentage, $histo[$numaction]=array('type'=>'mailing','id'=>$obj->id,'date'=>$obj->da,'note'=>$obj->note,'percent'=>$obj->percentage,
'acode'=>$obj->acode,'libelle'=>$obj->libelle, 'acode'=>$obj->acode,'libelle'=>$obj->libelle,
'userid'=>$obj->user_id,'login'=>$obj->login); 'userid'=>$obj->user_id,'login'=>$obj->login,
'contact_id'=>$obj->contact_id);
$numaction++; $numaction++;
$i++; $i++;
} }