diff --git a/htdocs/contrat/enservice.php b/htdocs/contrat/enservice.php index 4e6d40e43fc..98e1266d5a9 100644 --- a/htdocs/contrat/enservice.php +++ b/htdocs/contrat/enservice.php @@ -62,7 +62,8 @@ if (! $sortorder) $sortorder="DESC"; $sql = "SELECT s.nom, c.rowid as cid, s.idp as sidp, cd.rowid, cd.label, cd.statut, p.rowid as pid,"; -$sql .= " ".$db->pdate("cd.date_ouverture")." as date_ouverture"; +$sql .= " ".$db->pdate("cd.date_ouverture")." as date_ouverture,"; +$sql .= " ".$db->pdate("cd.date_fin_validite")." as date_fin_validite"; $sql .= " FROM ".MAIN_DB_PREFIX."contrat as c"; $sql .= " , ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product as p"; $sql .= " , ".MAIN_DB_PREFIX."contratdet as cd"; @@ -81,16 +82,17 @@ if ($resql) $num = $db->num_rows($resql); $i = 0; - print_barre_liste($langs->trans("ListOfRunningContractsLines"), $page, "enservice.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); + print_barre_liste($langs->trans("ListOfRunningServices"), $page, "enservice.php", "&sref=$sref&snom=$snom", $sortfield, $sortorder,'',$num); print ''; print ''; print_liste_field_titre($langs->trans("Contract"),"enservice.php", "c.rowid","","","",$sortfield); - print_liste_field_titre($langs->trans("Status"),"enservice.php", "cd.statut","","","",$sortfield); print_liste_field_titre($langs->trans("Service"),"enservice.php", "p.label","","","",$sortfield); print_liste_field_titre($langs->trans("Company"),"enservice.php", "s.nom","","","",$sortfield); - print_liste_field_titre($langs->trans("Date"),"enservice.php", "cd.date_ouverture",'','',' align="center"',$sortfield); + print_liste_field_titre($langs->trans("DateStartReal"),"enservice.php", "cd.date_ouverture",'','',' align="center"',$sortfield); + print_liste_field_titre($langs->trans("DateEndPlanned"),"enservice.php", "cd.date_fin_validite",'','',' align="center"',$sortfield); + print_liste_field_titre($langs->trans("Status"),"enservice.php", "cd.statut","","","",$sortfield); print "\n"; $now=mktime(); @@ -101,11 +103,11 @@ if ($resql) $var=!$var; print ""; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; print ''; - + print ''; + print ''; print "\n"; $i++; } diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 69afb469d56..3618b1f6a6d 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -650,7 +650,11 @@ else if ($objp->fk_product > 0) { print ''; + print 'statut'; + print ''; + } else { + // Si non ligne de service (Ne devrait pas arriver) + print ''; } print "\n"; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index f5d33e23ac6..8362762f250 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -117,8 +117,8 @@ if ( $db->query($sql) ) print ""; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print "\n"; $i++; @@ -162,8 +162,8 @@ if ( $db->query($sql) ) print ""; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print "\n"; $i++; diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 42f970f6021..267f701e5e5 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -88,8 +88,8 @@ if ($resql) print '
'.img_object($langs->trans("ShowContract"),"contract").' '.$obj->cid.'statut'.img_object($langs->trans("ShowService"),"service").' '.$obj->label.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowService"),"service").' '.dolibarr_trunc($obj->label,20).''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,44).''.dolibarr_print_date($obj->date_ouverture).''.($obj->date_fin_validite?dolibarr_print_date($obj->date_fin_validite):' ').'statut
'; print '';; - print 'statut 
'.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.''.img_object($langs->trans("ShowService"),"service").' '.$obj->label.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowService"),"service").' '.dolibarr_trunc($obj->label,20).''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,44).'statut
'.img_object($langs->trans("ShowContract"),"contract").' '.$obj->fk_contrat.''.img_object($langs->trans("ShowService"),"service").' '.$obj->label.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.img_object($langs->trans("ShowService"),"service").' '.dolibarr_trunc($obj->label,20).''.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,44).'statut
'; print ''; - print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","","",$sortfield); - print_liste_field_titre($langs->trans("NbOfServices"), $_SERVER["PHP_SELF"], "nb","","","",$sortfield); + print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","",'width="50"',$sortfield); + print_liste_field_titre($langs->trans("NbOfServices"), $_SERVER["PHP_SELF"], "nb",'','','width="80"',$sortfield); print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","","",$sortfield); print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","","",$sortfield); print "\n"; @@ -103,7 +103,7 @@ if ($resql) print ""; print "'; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 575f84b94f9..b53408bcb8f 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -10,6 +10,7 @@ ContractStatusRunning=Running ContractStatusClosed=Closed Contracts=Contracts Contract=Contract +MenuRunningServices=Running services NewContract=New contract AddContract=Add contract SearchAContract=Search a contract @@ -23,6 +24,7 @@ DateServiceStart=Date for beginning of service DateServiceEnd=Date for end of service ShowContract=Show contract ListOfRunningContractsLines=List of running contract lines +ListOfRunningServices=List of running services NotActivatedServices=Not activated services LastActivatedServices=Last %s activated services EditServiceLine=Edit service line diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index bd7326865e0..9b239a6ab4d 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -10,6 +10,7 @@ ContractStatusRunning=En service ContractStatusClosed=Clôturé Contracts=Contrats Contract=Contrat +MenuRunningServices=Services actifs NewContract=Nouveau contrat AddContract=Créer contrat SearchAContract=Rechercher un contrat @@ -23,6 +24,7 @@ DateServiceStart=Date d DateServiceEnd=Date fin du service ShowContract=Afficher contrat ListOfRunningContractsLines=Liste des lignes de contrats en service +ListOfRunningServices=Liste des services actifs NotActivatedServices=Services non activés LastActivatedServices=Les %s derniers services activés EditServiceLine=Edition ligne du service
cid\">"; print img_object($langs->trans("ShowContract"),"contract").' '.$obj->cid.''.$obj->nb.''.$obj->nb.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.dolibarr_print_date($obj->datec).'