diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index e88372c4835..4accbed5636 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1757,7 +1757,7 @@ else if ($action == 'deleteline' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $object->lines[$cursorline-1]->id == GETPOST('rowid')) { print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("DeleteContractLine"),$langs->trans("ConfirmDeleteContractLine"),"confirm_deleteline",'',0,1); - if ($ret == 'html') print '
'; + if ($ret == 'html') print '
'; } /* @@ -1777,7 +1777,7 @@ else array('type' => 'select', 'name' => 'newcid', 'values' => $arraycontractid)); $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&lineid=".GETPOST('rowid'),$langs->trans("MoveToAnotherContract"),$langs->trans("ConfirmMoveToAnotherContract"),"confirm_move",$formquestion); - print '
'; + print '
'; } /* @@ -1789,7 +1789,7 @@ else $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear')); $comment = GETPOST('comment'); $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment),$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",dol_print_date($dateactstart,"%A %d %B %Y")),"confirm_active", '', 0, 1); - print '
'; + print '
'; } /* @@ -1801,7 +1801,7 @@ else $dateactend = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear')); $comment = GETPOST('comment'); $form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService",dol_print_date($dateactend,"%A %d %B %Y")), "confirm_closeline", '', 0, 1); - print '
'; + print '
'; } diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index ea9c06d0b2f..924958319a4 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -77,7 +77,6 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele // Search contract if (! empty($conf->contrat->enabled)) { - $var=false; print '
'; print ''; print ''; @@ -181,7 +180,6 @@ else print '
'; print ''."\n"; -$var=true; $listofstatus=array(0,4,4,5); $bool=false; foreach($listofstatus as $status) { @@ -204,13 +202,11 @@ if (! empty($conf->use_javascript_ajax)) dol_print_graph('stats',300,180,$data,1,'pie',1); print ''; } -$var=true; $listofstatus=array(0,4,4,5); $bool=false; foreach($listofstatus as $status) { if (empty($conf->use_javascript_ajax)) - { - + { print ''; print ''; print ''; @@ -243,7 +239,6 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) if ( $resql ) { - $var = false; $num = $db->num_rows($resql); print '
'.$langs->trans("Statistics").' - '.$langs->trans("Services").'
'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).''.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'
'; @@ -277,7 +272,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire) } else { - print ''; + print ''; } print "
'.$langs->trans("NoContracts").'
'.$langs->trans("NoContracts").'

"; $db->free($resql); @@ -330,11 +325,9 @@ if ($result) print ''.$langs->trans("Services").''; print "\n"; - $var=True; while ($i < $num) { - $obj = $db->fetch_object($result); - + $obj = $db->fetch_object($result); print ''; print ''; @@ -397,7 +390,6 @@ if ($resql) print ''.$langs->trans("LastModifiedServices",$max).''; print "\n"; - $var=True; while ($i < min($num,$max)) { $obj = $db->fetch_object($resql); @@ -478,7 +470,6 @@ if ($resql) print ''.$langs->trans("NotActivatedServices").' '.$num.''; print "\n"; - $var=True; while ($i < $num) { $obj = $db->fetch_object($resql); @@ -559,7 +550,6 @@ if ($resql) print ''.$langs->trans("ListOfExpiredServices").' '.$num.''; print "\n"; - $var=True; while ($i < $num) { $obj = $db->fetch_object($resql);