diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php index 945ecc71704..03959e227ed 100644 --- a/htdocs/fichinter/card-rec.php +++ b/htdocs/fichinter/card-rec.php @@ -1,14 +1,14 @@ - * Copyright (C) 2004-2015 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2013 Florian Henry - * Copyright (C) 2013 Juanjo Menent - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2012 Cedric Salvador - * Copyright (C) 2015 Alexandre Spangaro - * Copyright (C) 2016-2018 Charlie Benke - * Copyright (C) 2018 Frédéric France +/* Copyright (C) 2002-2003 Rodolphe Quiedeville + * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2013 Florian Henry + * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2012 Cedric Salvador + * Copyright (C) 2015 Alexandre Spangaro + * Copyright (C) 2016-2018 Charlie Benke + * Copyright (C) 2018-2019 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,9 +25,9 @@ */ /** - * \file fichinter/card-rec.php - * \ingroup intervention - * \brief Page to show predefined fichinter + * \file fichinter/card-rec.php + * \ingroup intervention + * \brief Page to show predefined fichinter */ require '../main.inc.php'; @@ -396,7 +396,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( if ($num) { print ''; print ''.$langs->trans("Description").''; - print ''.$langs->trans("Duration").''; + print ''.$langs->trans("Duration").''; print "\n"; } while ($i < $num) { @@ -413,7 +413,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( print $text.' '.nl2br($objp->description); // Qty - print ''.convertSecondToTime($objp->duree).''; + print ''.convertSecondToTime($objp->duree).''; print ""; $i++; @@ -429,7 +429,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( dol_fiche_end(); - print '
'; + print '
'; print '     '; print ''; print '
'; @@ -495,13 +495,13 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( $morehtmlref.='
'; $morehtmlref.=''; $morehtmlref.=''; - $morehtmlref.=$formproject->select_projects( + $morehtmlref.=$formproject->select_projects( $object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1 ); $morehtmlref.=''; $morehtmlref.='
'; } else { - $morehtmlref.=$form->form_project( + $morehtmlref.=$form->form_project( $_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1 @@ -552,7 +552,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( print $langs->trans('Contract'); print ''; if ($action != 'contrat') { - print 'id.'">'; + print 'id.'">'; print img_edit($langs->trans('SetContract'), 1); print ''; } @@ -560,17 +560,15 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( print ''; if ($action == 'contrat') { $formcontract= new Formcontract($db); - $formcontract->formSelectContract( - $_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, - $object->fk_contrat, 'contratid', 0, 1 - ); + $formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1); } else { if ($object->fk_contrat) { $contratstatic = new Contrat($db); $contratstatic->fetch($object->fk_contrat); print $contratstatic->getNomUrl(0, '', 1); - } else - print " "; + } else { + print " "; + } } print ''; print ''; @@ -595,7 +593,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( print $langs->trans('Frequency'); print ''; if ($action != 'editfrequency' && $user->rights->ficheinter->creer) { - print ''; + print ''; print img_edit($langs->trans('Edit'), 1) . ''; } print ''; @@ -720,7 +718,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( print ''; print ''; print ''; - print ''; + print ''; print ''; $num = count($object->lines); @@ -744,7 +742,7 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( print $text.' '.nl2br($object->lines[$i]->desc); print ''; - print ''; + print ''; print "\n"; $i++; } @@ -801,66 +799,41 @@ $date_next_execution = (GETPOST('remonth') ? dol_mktime( $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); -print_barre_liste( - $langs->trans("RepeatableInterventional"), $page, - $_SERVER['PHP_SELF'], "&socid=$socid", $sortfield, $sortorder, - '', $num, '', 'title_commercial.png' - ); + print_barre_liste( + $langs->trans("RepeatableInterventional"), + $page, + $_SERVER['PHP_SELF'], + "&socid=$socid", + $sortfield, + $sortorder, + '', + $num, + '', + 'title_commercial.png' + ); print $langs->trans("ToCreateAPredefinedInterventional").'

'; $i = 0; print '
'.$langs->trans("Description").''.$langs->trans("Duration").''.$langs->trans("Duration").'
'.convertSecondToTime($object->lines[$i]->duree).''.convertSecondToTime($object->lines[$i]->duree).'
'; print ''; -print_liste_field_titre( - $langs->trans("Ref"), $_SERVER['PHP_SELF'], "f.titre", "", "", - 'width="200px" align="left"', $sortfiled, $sortorder - ); + 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" align="left"', $sortfiled, $sortorder - ); - if (! empty($conf->contrat->enabled)) - print_liste_field_titre( - $langs->trans("Contract"), $_SERVER['PHP_SELF'], - "f.fk_contrat", "", "", - 'width="100px" align="left"', $sortfiled, $sortorder - ); + print_liste_field_titre($langs->trans("Company"), $_SERVER['PHP_SELF'], "s.nom", "", "", 'width="200px"', $sortfiled, $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 '); + } - if (! empty($conf->projet->enabled)) - print_liste_field_titre( - $langs->trans("Project"), $_SERVER['PHP_SELF'], - "f.fk_project", "", "", - 'width="100px" align="left"', $sortfiled, $sortorder - ); -print_liste_field_titre( - $langs->trans("Duration"), $_SERVER['PHP_SELF'], - 'f.duree', '', '', - 'width="50px" align="right"', $sortfiled, $sortorder - ); - // Recurring or not -print_liste_field_titre( - $langs->trans("Frequency"), $_SERVER['PHP_SELF'], - "f.frequency", "", "", - 'width="100px" align="center"', $sortfiled, $sortorder - ); -print_liste_field_titre( - $langs->trans("NbOfGenerationDone"), $_SERVER['PHP_SELF'], - "f.nb_gen_done", "", "", - 'width="100px" align="center"', $sortfiled, $sortorder - ); + 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($langs->trans("Duration"), $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfiled, $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" align="center"', $sortfiled, $sortorder - ); -print_liste_field_titre( - $langs->trans("NextDateToIntervention"), $_SERVER['PHP_SELF'], - "f.date_when", "", "", - 'width="100px" align="center"', $sortfiled, $sortorder - ); + 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 ''; print "\n"; @@ -899,36 +872,36 @@ print_liste_field_titre( print ''; } - print ''; + print ''; - print ''; + print ''; - print ''; - print ''; - print ''; } else { print ''.$langs->trans('NA').''; print ''; - print ''; - print ''; } if ($user->rights->ficheinter->creer) { // Action column - print ''; } @@ -1393,8 +1393,8 @@ elseif ($id > 0 || ! empty($ref)) print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -1414,10 +1414,10 @@ elseif ($id > 0 || ! empty($ref)) print dol_htmlentitiesbr($objp->description); // Date - print ''; + print ''; // Duration - print ''; + print ''; print "\n"; @@ -1425,16 +1425,16 @@ elseif ($id > 0 || ! empty($ref)) // Icone d'edition et suppression if ($object->statut == 0 && $user->rights->ficheinter->creer) { - print ''; - print ''; - print ''; // Date d'intervention - print ''; // Duration - print ''; - print ''; print '' . "\n"; @@ -1532,8 +1532,8 @@ elseif ($id > 0 || ! empty($ref)) print ''; - print ''; - print ''; + print ''; + print ''; print ''; print "\n"; } @@ -1549,7 +1549,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; // Date intervention - print ''; // Duration - print ''; - print ''; + print ''; print ''; //Line extrafield diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php index 49521dff397..d240aadf42d 100644 --- a/htdocs/fichinter/index.php +++ b/htdocs/fichinter/index.php @@ -128,7 +128,7 @@ if ($resql) } if ($conf->use_javascript_ajax) { - print ''; print ''; - print ''; @@ -160,8 +160,8 @@ if ($resql) } } //if ($totalinprocess != $total) - //print ''; - print ''; + //print ''; + print ''; print "
'.convertSecondToTime($objp->duree).''.convertSecondToTime($objp->duree).''.yn($objp->frequency?1:0).''.yn($objp->frequency?1:0).''; + print ''; if ($objp->frequency) { print $objp->nb_gen_done.($objp->nb_gen_max>0?' / '. $objp->nb_gen_max:'') ; print ''; + print ''; print dol_print_date($db->jdate($objp->date_last_gen), 'day') ; print ''; + print ''; print dol_print_date($db->jdate($objp->date_when), 'day'); print ''; + print ''; print ''.$langs->trans('NA').''; print ''; + print ''; print ''.$langs->trans('NA').''; print ''; + print ''; if ($user->rights->ficheinter->creer) { if (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) { print 'id.'">'; + print 'id.'">'; print img_edit($langs->trans('SetContract'), 1); print '
'.$langs->trans('Description').''.$langs->trans('Date').''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').''.$langs->trans('Date').''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').'   '.(empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)?dol_print_date($db->jdate($objp->date_intervention), 'dayhour'):dol_print_date($db->jdate($objp->date_intervention), 'day')).''.(empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)?dol_print_date($db->jdate($objp->date_intervention), 'dayhour'):dol_print_date($db->jdate($objp->date_intervention), 'day')).''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?convertSecondToTime($objp->duree):'').''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?convertSecondToTime($objp->duree):'').''; + print ''; print 'rowid.'#'.$objp->rowid.'">'; print img_edit(); print ''; print ''; + print ''; print 'rowid.'">'; print img_delete(); print ''; + print ''; if ($num > 1) { if ($i > 0) @@ -1484,7 +1484,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; + print ''; if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) { print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention"); } else { @@ -1493,7 +1493,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; + print ''; if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) { $selectmode = 'select'; if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) @@ -1502,7 +1502,7 @@ elseif ($id > 0 || ! empty($ref)) } print ''; + print ''; print '
'; print ''; // ancre print $langs->trans('Description').''.$langs->trans('Date').''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').''.$langs->trans('Date').''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').' 
'; + print ''; $now=dol_now(); $timearray=dol_getdate($now); if (! GETPOST('diday', 'int')) { @@ -1565,7 +1565,7 @@ elseif ($id > 0 || ! empty($ref)) print ''; + print ''; if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) { $selectmode = 'select'; if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) { @@ -1575,7 +1575,7 @@ elseif ($id > 0 || ! empty($ref)) } print '
'; + print '
'; include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $dolgraph = new DolGraph(); @@ -150,7 +150,7 @@ if ($resql) { print '
'.$fichinterstatic->LibStatut($status, $bool, 0).''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' '; + print ''.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' '; print $fichinterstatic->LibStatut($status, $bool, 3); print ''; print '
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.'
'.$langs->trans("Total").''.$total.'
'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')'.$totalinprocess.'
'.$langs->trans("Total").''.$total.'

"; } else @@ -263,7 +263,7 @@ if ($resql) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -274,7 +274,7 @@ if ($resql) print ''.img_object($langs->trans("ShowCompany"), "company").' '.$obj->name.''; print ''.dol_print_date($db->jdate($obj->datem), 'day').''; - print ''.$fichinterstatic->LibStatut($obj->fk_statut, 5).''; + print ''.$fichinterstatic->LibStatut($obj->fk_statut, 5).''; print ''; $i++; } @@ -331,7 +331,7 @@ if (! empty($conf->ficheinter->enabled)) print ' '; print ''; - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -342,7 +342,7 @@ if (! empty($conf->ficheinter->enabled)) print ''.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($obj->name, 24).''; - print ''.$fichinterstatic->LibStatut($obj->fk_statut, 5).''; + print ''.$fichinterstatic->LibStatut($obj->fk_statut, 5).''; print ''; $i++; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 2652787a9c0..c105d06a852 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -383,7 +383,7 @@ if ($resql) // Status if (! empty($arrayfields['f.fk_statut']['checked'])) { - print ''; + print ''; $tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short $liststatus=$objectstatic->statuts_short; if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1 @@ -403,7 +403,7 @@ if ($resql) { print ' '; } - print ''; + print ''; $searchpicto=$form->showFilterButtons(); print $searchpicto; print ''; @@ -420,13 +420,13 @@ if ($resql) $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder); $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; - if (! empty($arrayfields['f.datec']['checked'])) print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['f.tms']['checked'])) print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); - if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder); + if (! empty($arrayfields['f.datec']['checked'])) print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap '); + if (! empty($arrayfields['f.tms']['checked'])) print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap '); + if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'right '); if (! empty($arrayfields['fd.description']['checked'])) print_liste_field_titre($arrayfields['fd.description']['label'], $_SERVER["PHP_SELF"], ''); - if (! empty($arrayfields['fd.date']['checked'])) print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, 'align="center"', $sortfield, $sortorder); - if (! empty($arrayfields['fd.duree']['checked'])) print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, 'align="right"', $sortfield, $sortorder); - print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch '); + if (! empty($arrayfields['fd.date']['checked'])) print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, '', $sortfield, $sortorder, 'center '); + if (! empty($arrayfields['fd.duree']['checked'])) print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right '); + print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; $total = 0; @@ -469,7 +469,7 @@ if ($resql) } // Other picto tool - print ''; + print ''; $filename=dol_sanitizeFileName($obj->ref); $filedir=$conf->ficheinter->dir_output . '/' . dol_sanitizeFileName($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; @@ -504,7 +504,7 @@ if ($resql) // Date creation if (! empty($arrayfields['f.datec']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ''; if (! $i) $totalarray['nbfield']++; @@ -512,7 +512,7 @@ if ($resql) // Date modification if (! empty($arrayfields['f.tms']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print ''; if (! $i) $totalarray['nbfield']++; @@ -520,7 +520,7 @@ if ($resql) // Status if (! empty($arrayfields['f.fk_statut']['checked'])) { - print ''.$objectstatic->LibStatut($obj->fk_statut, 5).''; + print ''.$objectstatic->LibStatut($obj->fk_statut, 5).''; if (! $i) $totalarray['nbfield']++; } // Fields of detail of line @@ -531,18 +531,18 @@ if ($resql) } if (! empty($arrayfields['fd.date']['checked'])) { - print ''.dol_print_date($db->jdate($obj->dp), 'dayhour')."\n"; + print ''.dol_print_date($db->jdate($obj->dp), 'dayhour')."\n"; if (! $i) $totalarray['nbfield']++; } if (! empty($arrayfields['fd.duree']['checked'])) { - print ''.convertSecondToTime($obj->duree, 'allhourmin').''; + print ''.convertSecondToTime($obj->duree, 'allhourmin').''; if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['totaldurationfield']=$totalarray['nbfield']; $totalarray['totalduration']+=$obj->duree; } // Action column - print ''; + print ''; if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined { $selected=0; @@ -571,7 +571,7 @@ if ($resql) if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''; else print ''.$langs->trans("Totalforthispage").''; } - elseif ($totalarray['totaldurationfield'] == $i) print ''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').''; + elseif ($totalarray['totaldurationfield'] == $i) print ''.convertSecondToTime($totalarray['totalduration'], 'allhourmin').''; else print ''; } print ''; diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 8d2c465a0cf..824dfff8c84 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -254,7 +254,7 @@ print '
'; arsort($arrayyears); print $form->selectarray('year', $arrayyears, $year, 0); print ''; - print ''; + print ''; print ''; print ''; print '

'; @@ -263,13 +263,13 @@ print '
'; print '
'; print ''; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ''; $oldyear=0; @@ -282,26 +282,26 @@ foreach ($data as $val) $oldyear--; print ''; - print ''; + print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; } print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; print ''; $oldyear=$year; } @@ -314,7 +314,7 @@ print '
'; // Show graphs -print '
'.$langs->trans("Year").''.$langs->trans("NbOfinterventions").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%'.$langs->trans("Year").''.$langs->trans("NbOfinterventions").'%'.$langs->trans("AmountTotal").'%'.$langs->trans("AmountAverage").'%
0?'&userid='.$userid:'').'">'.$oldyear.'0?'&userid='.$userid:'').'">'.$oldyear.'000000
0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'], 'MT'), 1).''.round($val['total_diff']).''.price(price2num($val['avg'], 'MT'), 1).''.round($val['avg_diff']).'0?'&userid='.$userid:'').'">'.$year.''.$val['nb'].''.round($val['nb_diff']).''.price(price2num($val['total'], 'MT'), 1).''.round($val['total_diff']).''.price(price2num($val['avg'], 'MT'), 1).''.round($val['avg_diff']).'
'; +print ' - + - - + + - \ No newline at end of file +
'; if ($mesg) { print $mesg; } else { print $px1->show(); diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php index 8825a249431..9f481b6b648 100644 --- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php @@ -47,13 +47,13 @@ foreach($linkedObjectBlock as $key => $objectlink) trans("Intervention"); ?> getNomUrl(1); ?> datev, 'day'); ?>datev, 'day'); ?> getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>getLibStatut(3); ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>