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

FIX refacto

Browse Source
This commit is contained in:
quentin 2020-07-01 14:04:41 +02:00
parent 267aa7605b
commit 39651953b3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5241,7 +5241,7 @@ class Form
print $retstring; print $retstring;
return; return;
} }
/** /**
* Show 2 HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes. * Show 2 HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
* Fields are preselected with : * Fields are preselected with :

9
htdocs/core/lib/company.lib.php
View File

@ -1850,9 +1850,8 @@ function show_subsidiaries($conf, $langs, $db, $object)
* @param string $donetodo donetodo * @param string $donetodo donetodo
* @param string $now now * @param string $now now
* @param string $filters array * @param string $filters array
* @param string $donetodo donetodo * @param string $sqlANDOR "AND", "OR" or "" sql condition
* @param string $sqlANDOR "AND", "OR" or "" * @return string sql request
* @return void
*/ */
function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDOR = "AND") function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDOR = "AND")
{ {
@ -1877,6 +1876,8 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO
if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))"; if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))"; elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']); if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);
return $sql;
} }
/** /**
@ -1884,7 +1885,7 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO
* *
* @param string $actioncode Action code * @param string $actioncode Action code
* @param string $objcon objcon * @param string $objcon objcon
* @param Object $filterobj * @param Object $filterobj filterobj
* @return string * @return string
*/ */
function addMailingEventTypeSQL($actioncode, $objcon, $filterobj) function addMailingEventTypeSQL($actioncode, $objcon, $filterobj)