diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 474227349b8..f07011f4968 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -149,7 +149,10 @@ elseif ($action == 'setdoc') $draft = GETPOST('CONTRACT_DRAFT_WATERMARK', 'alpha'); $res2 = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity); - if (!$res1 > 0 || !$res2 > 0) $error++; + $value = GETPOST('activate_hideClosedServiceByDefault', 'alpha'); + $res3 = dolibarr_set_const($db, "CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT", $value, 'chaine', 0, '', $conf->entity); + + if (!$res1 > 0 || !$res2 > 0 || !$res3 > 0) $error++; if (!$error) { @@ -470,6 +473,13 @@ print '
| '.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).' | '; print ''; if ($user->socid == 0) @@ -1824,7 +1828,7 @@ if ($action == 'create') print ' | '; print "
| '; // Si pas encore active @@ -2082,7 +2086,11 @@ if ($action == 'create') // print ''; //} } - + if (! empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0) + { + if($action == 'showclosedlines') print ''; + else print ''; + } // On peut supprimer entite si // - Droit de creer + mode brouillon (erreur creation) // - Droit de supprimer diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang index 47572c355ab..373d68c16b1 100644 --- a/htdocs/langs/en_US/contracts.lang +++ b/htdocs/langs/en_US/contracts.lang @@ -99,3 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up cont TypeContact_contrat_external_BILLING=Billing customer contact TypeContact_contrat_external_CUSTOMER=Follow-up customer contact TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact +HideClosedServiceByDefault=Hide closed services by default +ShowClosedServices=Show Closed Services +HideClosedServices=Hide Closed Services \ No newline at end of file diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index 2372c9bec3f..e1dc3103151 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -99,3 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Commercial suivi du contrat TypeContact_contrat_external_BILLING=Contact client facturation contrat TypeContact_contrat_external_CUSTOMER=Contact client suivi contrat TypeContact_contrat_external_SALESREPSIGN=Contact client signataire contrat +HideClosedServiceByDefault=Cacher les services fermés sur les contrats par défaut +ShowClosedServices=Afficher les services fermés +HideClosedServices=Cacher les services fermés \ No newline at end of file |