lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression in edition of date

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-17 09:17:11 +02:00
parent 797de131a6
commit 0bf540b3c1
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commonobject.class.php
View File

@ -5365,7 +5365,7 @@ abstract class CommonObject
if (!$required && $value == '') $value = '-1'; if (!$required && $value == '') $value = '-1';
// TODO Must also support $moreparam // TODO Must also support $moreparam
$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 1, 0); $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
} }
elseif (in_array($type,array('int','integer'))) elseif (in_array($type,array('int','integer')))
{ {

2
htdocs/core/class/extrafields.class.php
View File

@ -1001,7 +1001,7 @@ class ExtraFields
if (!$required && $value == '') $value = '-1'; if (!$required && $value == '') $value = '-1';
// TODO Must also support $moreparam // TODO Must also support $moreparam
$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 1, 0); $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
} }
elseif (in_array($type,array('int','integer'))) elseif (in_array($type,array('int','integer')))
{ {

3
htdocs/core/class/html.form.class.php
View File

@ -4939,11 +4939,10 @@ class Form
function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='') function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='')
{ {
// phpcs:enable // phpcs:enable
$retstring = $this->selectDate($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $disabled=0, $fullday='', $addplusone='', $adddateof=''); $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
if (! empty($nooutput)) { if (! empty($nooutput)) {
return $retstring; return $retstring;
} }
print $retstring; print $retstring;
return; return;
} }