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

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/opensurvey/studs.php
This commit is contained in:
Laurent Destailleur 2019-03-15 19:20:22 +01:00
commit 875b5b6a8d

View File

@ -1320,6 +1320,8 @@ if (empty($reshook))
foreach ($amountdeposit as $tva => $amount)
{
if (empty($amount)) continue;
$arraylist = array('amount' => 'FixAmount','variable' => 'VarAmount');
$descline = $langs->trans('Deposit');
//$descline.= ' - '.$langs->trans($arraylist[$typeamount]);