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

Fix hook for formmail and translation

Browse Source
This commit is contained in:
Laurent Destailleur 2017-12-10 02:01:36 +01:00
parent 57c7fa6ae9
commit 472d7b591e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/html.formmail.class.php
View File

@ -521,9 +521,19 @@ class FormMail extends Form
}
}
}
// Set the default "From"
$defaultfrom='';
$reshook=$hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);
if (empty($reshook))
{
$defaultfrom = $this->fromtype;
}
if (! empty($hookmanager->resArray['defaultfrom'])) $defaultfrom=$hookmanager->resArray['defaultfrom'];
// Using combo here make the '<email>' no more visible on list.
//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200onsmartphone', 1, '', $disablebademails);
$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200onsmartphone', 0, '', $disablebademails);
//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
$out.= ' '.$form->selectarray('fromtype', $liste, $defaultfrom, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);
}
$out.= "</td></tr>\n";

2
htdocs/societe/class/societe.class.php
View File

@ -1959,7 +1959,7 @@ class Societe extends CommonObject
if (! empty($this->country_code))
$label.= '<br><b>' . $langs->trans('Country') . ':</b> '. $this->country_code;
if (! empty($this->tva_intra))
$label.= '<br><b>' . $langs->trans('VATNumber') . ':</b> '. $this->tva_intra;
$label.= '<br><b>' . $langs->trans('VATIntra') . ':</b> '. $this->tva_intra;
if (! empty($this->code_client) && $this->client)
$label.= '<br><b>' . $langs->trans('CustomerCode') . ':</b> '. $this->code_client;
if (! empty($this->code_fournisseur) && $this->fournisseur)