From c7ad6c9a7c072210ee203a70a6bbda7e0578e3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 25 Jul 2018 10:04:44 +0200 Subject: [PATCH 1/2] Update card-rec.php --- htdocs/fichinter/card-rec.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 96d7e106b5a..8b258ebbf6e 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -29,12 +29,7 @@ * \brief Page to show predefined fichinter */ -$res=0; -if (! $res && file_exists("../../main.inc.php")) - $res=@include("../../main.inc.php"); // For root directory -if (! $res && file_exists("../../../main.inc.php")) - $res=@include("../../../main.inc.php"); // For "custom" directory - +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinterrec.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; From 53469ee424d5ff9677753bec7b1140a7272c2475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 25 Jul 2018 11:45:52 +0200 Subject: [PATCH 2/2] Update card-rec.php --- htdocs/fichinter/card-rec.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 8b258ebbf6e..08600d71ee5 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -404,8 +404,7 @@ if ($action == 'create') { $var=true; while ($i < $num) { $objp = $db->fetch_object($result); - $var=!$var; - print ""; + print ''; // Show product and description @@ -733,10 +732,8 @@ if ($action == 'create') { $num = count($object->lines); $i = 0; - $var=true; while ($i < $num) { - $var=!$var; - + // Show product and description if (isset($object->lines[$i]->product_type)) $type=$object->lines[$i]->product_type; @@ -748,7 +745,7 @@ if ($action == 'create') { if (! empty($objp->date_end)) $type=1; // Show line - print ""; + print ''; print ''; $text = img_object($langs->trans('Service'), 'service'); print $text.' '.nl2br($object->lines[$i]->desc); @@ -879,12 +876,10 @@ if ($action == 'create') { // les filtres à faire ensuite if ($num > 0) { - $var=true; while ($i < min($num, $limit)) { $objp = $db->fetch_object($resql); - $var=!$var; - print ""; + print ''; print ''; print img_object($langs->trans("ShowIntervention"), "intervention").' '.$objp->titre; print "\n"; @@ -959,7 +954,7 @@ if ($action == 'create') { } } } else - print ''.$langs->trans("NoneF").''; + print ''.$langs->trans("NoneF").''; print ""; $db->free($resql);