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

Bug & merge

Browse Source
This commit is contained in:
aspangaro 2014-11-12 07:33:03 +01:00
parent a55afd4f50
commit c70539b3b2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/account.php
View File

@ -727,7 +727,7 @@ if ($id > 0 || ! empty($ref))
$loanstatic->label=$links[$key]['label']; $loanstatic->label=$links[$key]['label'];
} }
$loanstatic->ref=$loanstatic->label; $loanstatic->ref=$loanstatic->label;
print $loanstatic->getNameUrl(1,16); print $loanstatic->getLinkUrl(1,16);
} }
else if ($links[$key]['type']=='member') else if ($links[$key]['type']=='member')
{ {

8
htdocs/fichinter/card.php
View File

@ -748,10 +748,10 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
if ($message) if ($message)
{ {
if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
$actionmsg = dol_concatdesc($actionmsg, $message); $actionmsg = dol_concatdesc($actionmsg, $message);
} }
$actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref); $actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
} }