From 7776ae6da436decd4dc53f708feecf30a125ca4d Mon Sep 17 00:00:00 2001 From: fappels Date: Mon, 5 Dec 2016 19:19:48 +0100 Subject: [PATCH 1/2] Fix travis --- htdocs/compta/facture.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 839841e4cf9..db9df79b91c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2484,8 +2484,7 @@ if ($action == 'create') $htmltext=''; if (GETPOST('fac_rec','int') > 0) { - $dateexample=dol_now(); - if (! empty($datefacture?$datefacture:$dateinvoice)) $dateexample=($datefacture?$datefacture:$dateinvoice); + if (empty($dateexample)) $dateexample=dol_now(); $substitutionarray=array( '__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')', '__TOTAL_TTC__' => $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ttc).')', From b918d7abc9fe442795772369601f00cad6de791d Mon Sep 17 00:00:00 2001 From: fappels Date: Mon, 5 Dec 2016 19:20:46 +0100 Subject: [PATCH 2/2] fix travis --- htdocs/compta/facture.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index db9df79b91c..ab562584b0a 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2484,6 +2484,7 @@ if ($action == 'create') $htmltext=''; if (GETPOST('fac_rec','int') > 0) { + $dateexample=($datefacture ? $datefacture : $dateinvoice); if (empty($dateexample)) $dateexample=dol_now(); $substitutionarray=array( '__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')',