From e43b13968e156973f96973fefdc4e1b6d98d4a50 Mon Sep 17 00:00:00 2001 From: Neil Orley Date: Thu, 7 Sep 2017 15:31:19 +0200 Subject: [PATCH] New: Adds an hide hour button in the "intervention" module Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module --- htdocs/admin/fichinter.php | 31 +++++++++++++++++++ .../fichinter/doc/pdf_soleil.modules.php | 10 +++++- htdocs/fichinter/card.php | 8 +++-- htdocs/langs/en_US/interventions.lang | 1 + htdocs/langs/fr_FR/interventions.lang | 1 + 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index c4d1b1d556b..374d72fa7bf 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -230,6 +230,20 @@ elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS') $error++; } + if (!$error) { + setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); + } else { + setEventMessages($langs->trans("Error"), null, 'errors'); + } +} elseif ($action == 'set_FICHINTER_DATE_WITHOUT_HOUR') { + $val = GETPOST('FICHINTER_DATE_WITHOUT_HOUR', 'alpha'); + $res = dolibarr_set_const($db, "FICHINTER_DATE_WITHOUT_HOUR", ($val == 'on' ? 1 : 0), 'bool', 0, '', + $conf->entity); + + if (!$res > 0) { + $error++; + } + if (!$error) { setEventMessages($langs->trans("SetupSaved"), null, 'mesgs'); } else { @@ -607,6 +621,23 @@ print ''; print ''; print ''; +// use date without hour +print '
'; +print ''; +print ''; +print ''; +print ''; +print $langs->trans("UseDateWithoutHourOnFichinter"); +print ''; +print ''; +print 'global->FICHINTER_DATE_WITHOUT_HOUR?' checked':'') . '>'; +print ''; +print ''; +print ''; +print ''; +print ''; +print '
'; + diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 4d889f84902..f12f0127cec 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -277,7 +277,15 @@ class pdf_soleil extends ModelePDFFicheinter $curX = $this->posxdesc-1; // Description of product line - $txt=$outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true); + if (empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) + { + $txt=$outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'dayhour',false,$outputlangs,true); + } + else + { + $txt=$outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei,'day',false,$outputlangs,true); + } + if ($objectligne->duration > 0) { $txt.=" - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration); diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 953b48a8adf..fc634bed9ff 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1379,7 +1379,7 @@ else if ($id > 0 || ! empty($ref)) print dol_htmlentitiesbr($objp->description); // Date - print ''.dol_print_date($db->jdate($objp->date_intervention),'dayhour').''; + print ''.(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')).''; // Duration print ''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?convertSecondToTime($objp->duree):'').''; @@ -1452,7 +1452,8 @@ else if ($id > 0 || ! empty($ref)) // Date d'intervention print ''; - $form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention"); + if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) $form->select_date($db->jdate($objp->date_intervention),'di',0,0,0,"date_intervention"); + else $form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention"); print ''; // Duration @@ -1519,7 +1520,8 @@ else if ($id > 0 || ! empty($ref)) $timearray=dol_getdate($now); if (! GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int')); - $form->select_date($timewithnohour,'di',1,1,0,"addinter"); + if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) $form->select_date($timewithnohour,'di',0,0,0,"addinter"); + else $form->select_date($timewithnohour,'di',1,1,0,"addinter"); print ''; // Duration diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 40556724507..b151565f3a3 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -49,6 +49,7 @@ PrintProductsOnFichinter=Print also lines of type "product" (not only services) PrintProductsOnFichinterDetails=interventions generated from orders UseServicesDurationOnFichinter=Use services duration for interventions generated from orders UseDurationOnFichinter=Hides the duration field for intervention records +UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records InterventionStatistics=Statistics of interventions NbOfinterventions=Nb of intervention cards NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation) diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang index 13bc2cee7d4..8a7158c212b 100644 --- a/htdocs/langs/fr_FR/interventions.lang +++ b/htdocs/langs/fr_FR/interventions.lang @@ -49,6 +49,7 @@ PrintProductsOnFichinter=Imprimer aussi les lignes de type "produit" (pas seulem PrintProductsOnFichinterDetails=interventions générées à partir des commandes UseServicesDurationOnFichinter=Utiliser la durée des services dans les interventions créées depuis des commandes UseDurationOnFichinter=Masquer le champ durée dans les fiches d'intervention +UseDateWithoutHourOnFichinter=Masquer l'heure de la date d'intervention InterventionStatistics=Statistiques des interventions NbOfinterventions=Nb de fiches d'intervention NumberOfInterventionsByMonth=Nb de fiches d'intervention par mois (date de validation)