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

Fix: Maxi debug of emailing feature

Browse Source
This commit is contained in:
Laurent Destailleur 2010-12-13 18:52:19 +00:00
parent 6539f61785
commit 80dd25401f
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/includes/modules/mailings/dolibarr_services_expired.modules.php
View File

@ -123,7 +123,11 @@ class mailing_dolibarr_services_expired extends MailingTargets
$cibles[$j] = array( $cibles[$j] = array(
'email' => $obj->email, 'email' => $obj->email,
'name' => $obj->name, 'name' => $obj->name,
'other' => dol_print_date($this->db->jdate($obj->date_ouverture),'day').';'.dol_print_date($this->db->jdate($obj->date_fin_validite),'day').';'.$obj->fk_contrat.';'.$obj->cdid, 'other' =>
('StartDate='.dol_print_date($this->db->jdate($obj->date_ouverture),'day')).';'.
('EndDate='.dol_print_date($this->db->jdate($obj->date_fin_validite),'day')).';'.
('Contract='.$obj->fk_contrat).';'.
('ContactLine='.$obj->cdid),
'source_url' => $this->url($obj->rowid), 'source_url' => $this->url($obj->rowid),
'source_id' => $obj->cdid, 'source_id' => $obj->cdid,
'source_type' => 'contract_line' 'source_type' => 'contract_line'

9
htdocs/includes/modules/mailings/fraise.modules.php
View File

@ -184,10 +184,11 @@ class mailing_fraise extends MailingTargets
'fk_contact' => $obj->fk_contact, 'fk_contact' => $obj->fk_contact,
'name' => $obj->name, 'name' => $obj->name,
'firstname' => $obj->firstname, 'firstname' => $obj->firstname,
'other' => ($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin),'day')).';'. 'other' =>
($langs->transnoentities("Civility").'='.$obj->civilite).';'. ($langs->transnoentities("Login").'='.$obj->login).';'.
($langs->transnoentities("Login").'='.$obj->login).';'. ($langs->transnoentities("Civility").'='.$langs->transnoentities("Civility".$obj->civilite)).';'.
($langs->transnoentities("Company").'='.$obj->societe), ($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin),'day')).';'.
($langs->transnoentities("Company").'='.$obj->societe),
'source_url' => $this->url($obj->id), 'source_url' => $this->url($obj->id),
'source_id' => $obj->id, 'source_id' => $obj->id,
'source_type' => 'member' 'source_type' => 'member'

7
htdocs/includes/modules/mailings/poire.modules.php
View File

@ -219,15 +219,14 @@ class mailing_poire extends MailingTargets
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
if ($old <> $obj->email) if ($old <> $obj->email)
{ {
$other='';
if ($obj->companyname) { if ($other) $other.=';'; $other.=$langs->transnoentities("ThirdParty").'='.$obj->companyname; }
if ($obj->civilite) { if ($other) $other.=';'; $other.=$langs->transnoentities("Civility".$obj->civilite); }
$cibles[$j] = array( $cibles[$j] = array(
'email' => $obj->email, 'email' => $obj->email,
'fk_contact' => $obj->fk_contact, 'fk_contact' => $obj->fk_contact,
'name' => $obj->name, 'name' => $obj->name,
'firstname' => $obj->firstname, 'firstname' => $obj->firstname,
'other' => $other, 'other' =>
($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
($langs->transnoentities("Civility").'='.$langs->transnoentities("Civility".$obj->civilite)),
'source_url' => $this->url($obj->id), 'source_url' => $this->url($obj->id),
'source_id' => $obj->id, 'source_id' => $obj->id,
'source_type' => 'contact' 'source_type' => 'contact'

5
htdocs/includes/modules/mailings/pomme.modules.php
View File

@ -163,7 +163,10 @@ class mailing_pomme extends MailingTargets
'fk_contact' => $obj->fk_contact, 'fk_contact' => $obj->fk_contact,
'name' => $obj->name, 'name' => $obj->name,
'firstname' => $obj->firstname, 'firstname' => $obj->firstname,
'other' => $langs->transnoentities("Login").'='.$obj->login.';'.$langs->transnoentities("PhonePro").'='.$obj->office_phone, 'other' =>
($langs->transnoentities("Login").'='.$obj->login).';'.
// ($langs->transnoentities("Civility").'='.$obj->civilite).';'.
($langs->transnoentities("PhonePro").'='.$obj->office_phone),
'source_url' => $this->url($obj->id), 'source_url' => $this->url($obj->id),
'source_id' => $obj->id, 'source_id' => $obj->id,
'source_type' => 'user' 'source_type' => 'user'