From 42eba7270d721b3d9357505c6a073a56fd9fbda4 Mon Sep 17 00:00:00 2001 From: abb Date: Thu, 3 Mar 2016 21:16:51 +0100 Subject: [PATCH] new:constant FICHINTER_WITHOUT_DURATION to handle interventions without duration in lines Conflicts: htdocs/fichinter/card.php --- htdocs/fichinter/card.php | 52 ++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 9ca25527b1c..71fec224137 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -5,8 +5,8 @@ * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2015 Ferran Marcet - * Copyright (C) 2014-2015 Charlie Benke - * Copyright (C) 2015 Abbes Bahfir + * Copyright (C) 2014-2015 Charlie Benke + * Copyright (C) 2015-2016 Abbes Bahfir * * 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 @@ -478,12 +478,12 @@ if (empty($reshook)) $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'
'; $error++; } - if (!GETPOST('durationhour','int') && !GETPOST('durationmin','int')) + if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && !GETPOST('durationhour','int') && !GETPOST('durationmin','int')) { $mesg='
'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Duration")).'
'; $error++; } - if (GETPOST('durationhour','int') >= 24 && GETPOST('durationmin','int') > 0) + if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && GETPOST('durationhour','int') >= 24 && GETPOST('durationmin','int') > 0) { $mesg='
'.$langs->trans("ErrorValueTooHigh").'
'; $error++; @@ -494,7 +494,7 @@ if (empty($reshook)) $desc=GETPOST('np_desc'); $date_intervention = dol_mktime(GETPOST('dihour','int'), GETPOST('dimin','int'), 0, GETPOST('dimonth','int'), GETPOST('diday','int'), GETPOST('diyear','int')); - $duration = convertTime2Seconds(GETPOST('durationhour','int'), GETPOST('durationmin','int')); + $duration = empty($conf->global->FICHINTER_WITHOUT_DURATION)?0:convertTime2Seconds(GETPOST('durationhour','int'), GETPOST('durationmin','int')); // Extrafields @@ -1457,7 +1457,7 @@ else if ($id > 0 || ! empty($ref)) print ''; print ''.$langs->trans('Description').''; print ''.$langs->trans('Date').''; - print ''.$langs->trans('Duration').''; + print ''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').''; print ' '; print "\n"; } @@ -1479,7 +1479,7 @@ else if ($id > 0 || ! empty($ref)) print ''.dol_print_date($db->jdate($objp->date_intervention),'dayhour').''; // Duration - print ''.convertSecondToTime($objp->duree).''; + print ''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?convertSecondToTime($objp->duree):'').''; print "\n"; @@ -1551,15 +1551,18 @@ else if ($id > 0 || ! empty($ref)) print ''; $form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention"); print ''; + + // Duration + print ''; + if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) { + $selectmode = 'select'; + if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) + $selectmode = 'text'; + $form->select_duration('duration', $objp->duree, $selectmode); + } + print ''; - // Duration - print ''; - $selectmode='select'; - if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text'; - $form->select_duration('duration',$objp->duree,0, $selectmode); - print ''; - - print ''; + print ''; print '
'; print '' . "\n"; @@ -1590,7 +1593,7 @@ else if ($id > 0 || ! empty($ref)) print ''; // ancre print $langs->trans('Description').''; print ''.$langs->trans('Date').''; - print ''.$langs->trans('Duration').''; + print ''.(empty($conf->global->FICHINTER_WITHOUT_DURATION)?$langs->trans('Duration'):'').''; print ' '; print "\n"; @@ -1616,14 +1619,17 @@ else if ($id > 0 || ! empty($ref)) $form->select_date($timewithnohour,'di',1,1,0,"addinter"); print ''; - // Duration - print ''; - $selectmode='select'; - if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text'; - $form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode); - print ''; + // Duration + print ''; + if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) { + $selectmode = 'select'; + if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) + $selectmode = 'text'; + $form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode); + } + print ''; - print ''; + print ''; print ''; //Line extrafield