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

Merge pull request #6087 from fappels/Fix-travis

Browse Source 
Fix travis
This commit is contained in:
Laurent Destailleur 2016-12-07 11:26:23 +01:00 committed by GitHub
commit af222e3622
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture.php
View File

@ -2484,8 +2484,8 @@ if ($action == 'create')
$htmltext=''; $htmltext='';
if (GETPOST('fac_rec','int') > 0) if (GETPOST('fac_rec','int') > 0)
{ {
$dateexample=dol_now(); $dateexample=($datefacture ? $datefacture : $dateinvoice);
if (! empty($datefacture?$datefacture:$dateinvoice)) $dateexample=($datefacture?$datefacture:$dateinvoice); if (empty($dateexample)) $dateexample=dol_now();
$substitutionarray=array( $substitutionarray=array(
'__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')', '__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')',
'__TOTAL_TTC__' => $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ttc).')', '__TOTAL_TTC__' => $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ttc).')',