diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 6f8539dd981..6ae39f755fd 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -802,7 +802,7 @@ else
print '| | ';
}
// Icon update et delete (statut contrat 0=brouillon,1=valid�,2=ferm�)
- print '';
+ print ' | ';
if ($contrat->statut != 2 && $user->rights->contrat->creer)
{
print '';
@@ -898,7 +898,14 @@ else
{
dolibarr_print_error($db);
}
-
+
+ if ($contrat->statut > 0)
+ {
+ print '';
+ print '
| ';
+ print " \n";
+ }
+
print "";
@@ -911,7 +918,7 @@ else
$dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$contrat->id."&ligne=".$_GET["ligne"]."&date=".$dateactstart."&dateend=".$dateactend,$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",strftime("%A %d %B %Y", $dateactstart)),"confirm_active");
- //print '
';
+ print '';
}
/*
@@ -923,7 +930,7 @@ else
$dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$contrat->id."&ligne=".$_GET["ligne"]."&date=".$dateactstart."&dateend=".$dateactend,$langs->trans("CloseService"),$langs->trans("ConfirmCloseService",strftime("%A %d %B %Y", $dateactend)),"confirm_closeline");
- //print '
';
+ print '';
}
// Area with activation info
@@ -931,14 +938,21 @@ else
{
print '';
- print '';
- print '| '.$langs->trans("Activation").' | ';
- print ' | ';
- print " \n";
-
print '';
- print '| '.$langs->trans("Status").': '.$contrat->lignes[$cursorline-1]->getLibStatut(4).' | ';
- print ' | ';
+ print ''.$langs->trans("ServiceStatus").': '.$contrat->lignes[$cursorline-1]->getLibStatut(4).' | ';
+ print '';
+ if ($user->societe_id == 0)
+ {
+ if ($contrat->statut > 0 && $_REQUEST["action"] != 'activateline' && $_REQUEST["action"] != 'unactivateline')
+ {
+ $action='activateline';
+ if ($objp->statut == 4) $action='unactivateline';
+ print '';
+ print img_edit();
+ print '';
+ }
+ }
+ print ' | ';
print " \n";
print '';
@@ -967,17 +981,8 @@ else
// Statut
print '| ';
- if ($user->societe_id == 0)
- {
- if ($contrat->statut > 0 && $_REQUEST["action"] != 'activateline' && $_REQUEST["action"] != 'unactivateline')
- {
- $action='activateline';
- if ($objp->statut == 4) $action='unactivateline';
- print '';
- print img_edit();
- print '';
- }
- }
+ print ' ';
+ print ' | ';
print ' ';
print ' ';
}
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index f04f5d88f17..941fbcb0631 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -28,7 +28,7 @@ AddContract=Add contract
SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract ?
+ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ?
ConfirmValidateContract=Are you sure you want to validate this contract ?
ConfirmCloseContract=Are you sure you want to close this contract ?
ConfirmCloseService=Are you sure you want to close this service with date %s ?
@@ -64,6 +64,7 @@ CloseService=Close service
ServicesNomberShort=%s service(s)
RunningServices=Running services
BoardRunningServices=Expired running services
+ServiceStatus=Status of service
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 277261bbe7a..3cc56352bbe 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -28,7 +28,7 @@ AddContract=Cr
SearchAContract=Rechercher un contrat
DeleteAContract=Supprimer un contract
CloseAContract=Cloturer un contract
-ConfirmDeleteAContract=Etes-vous sûr de vouloir supprimer ce contrat ?
+ConfirmDeleteAContract=Etes-vous sûr de vouloir supprimer ce contrat et tous ses services ?
ConfirmValidateContract=Etes-vous sûr de vouloir valider ce contrat ?
ConfirmCloseContract=Etes-vous sûr de vouloir cloturer ce contrat ?
ConfirmCloseService=Etes-vous sûr de vouloir fermer ce service à la date du %s ?
@@ -64,6 +64,7 @@ CloseService=Fermer service
ServicesNomberShort=%s service(s)
RunningServices=Services actifs
BoardRunningServices=Services actifs expirés
+ServiceStatus=Statut du service
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
TypeContact_contrat_internal_SALESREPFOLL=Commercial suivi du contrat
|