From 3716834b0a9835e350b02eb2d19b5ded9ca59f58 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 9 Mar 2019 01:13:15 +0100 Subject: [PATCH] Fix bad var name --- htdocs/fichinter/card-rec.php | 21 +++++++++------------ test/phpunit/CodingPhpTest.php | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 03959e227ed..38871f55c0e 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -817,23 +817,20 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( $i = 0; print ''; print ''; - print_liste_field_titre($langs->trans("Ref"), $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfiled, $sortorder, 'left '); - - print_liste_field_titre($langs->trans("Company"), $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfiled, $sortorder, 'left '); + print_liste_field_titre("Ref", $_SERVER['PHP_SELF'], "f.titre", "", "", 'width="200px"', $sortfield, $sortorder, 'left '); + print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfield, $sortorder, 'left '); if (! empty($conf->contrat->enabled)) { - print_liste_field_titre($langs->trans("Contract"), $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfiled, $sortorder, 'left '); + print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left '); } - if (! empty($conf->projet->enabled)) { - print_liste_field_titre($langs->trans("Project"), $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfiled, $sortorder, 'left '); + print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left '); } - print_liste_field_titre($langs->trans("Duration"), $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfiled, $sortorder, 'right '); + print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right '); // Recurring or not - print_liste_field_titre($langs->trans("Frequency"), $_SERVER['PHP_SELF'], "f.frequency", "", "", 'width="100px"', $sortfiled, $sortorder, 'center '); - print_liste_field_titre($langs->trans("NbOfGenerationDone"), $_SERVER['PHP_SELF'], "f.nb_gen_done", "", "", 'width="100px"', $sortfiled, $sortorder, 'center '); - - print_liste_field_titre($langs->trans("DateLastGeneration"), $_SERVER['PHP_SELF'], "f.date_last_gen", "", "", 'width="100px"', $sortfiled, $sortorder, 'center '); - print_liste_field_titre($langs->trans("NextDateToIntervention"), $_SERVER['PHP_SELF'], "f.date_when", "", "", 'width="100px"', $sortfiled, $sortorder, 'center '); + print_liste_field_titre("Frequency", $_SERVER['PHP_SELF'], "f.frequency", "", "", 'width="100px"', $sortfield, $sortorder, 'center '); + print_liste_field_titre("NbOfGenerationDone", $_SERVER['PHP_SELF'], "f.nb_gen_done", "", "", 'width="100px"', $sortfield, $sortorder, 'center '); + print_liste_field_titre("DateLastGeneration", $_SERVER['PHP_SELF'], "f.date_last_gen", "", "", 'width="100px"', $sortfield, $sortorder, 'center '); + print_liste_field_titre("NextDateToIntervention", $_SERVER['PHP_SELF'], "f.date_when", "", "", 'width="100px"', $sortfield, $sortorder, 'center '); print ''; print "\n"; diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php index 2a1dad01049..8f6eb2b8d5e 100644 --- a/test/phpunit/CodingPhpTest.php +++ b/test/phpunit/CodingPhpTest.php @@ -220,7 +220,7 @@ class CodingPhpTest extends PHPUnit_Framework_TestCase $ok=false; break; } - $this->assertTrue($ok, 'Found a use of print_liste_field_titre with fist parameter that is a translated value instead of just the translation key in file '.$file['fullname'].'. Bad.'); + $this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['fullname'].'. Bad.'); // Test we don't have