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

Fix combo to select action status

Browse Source
This commit is contained in:
Laurent Destailleur 2021-01-28 19:38:47 +01:00
parent 98447c4c5f
commit e5b4c76a26
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/list.php
View File

@ -366,7 +366,7 @@ if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'"; if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
if ($type) $sql .= " AND c.id = ".(int) $type; if ($type) $sql .= " AND c.id = ".(int) $type;
if ($search_status == '0') { $sql .= " AND a.percent = 0"; } if ($search_status == '0') { $sql .= " AND a.percent = 0"; }
if ($search_status == '-1') { $sql .= " AND a.percent = -1"; } // Not applicable if ($search_status == 'na') { $sql .= " AND a.percent = -1"; } // Not applicable
if ($search_status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; } // Running already started if ($search_status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; } // Running already started
if ($search_status == '100') { $sql .= " AND a.percent = 100"; } if ($search_status == '100') { $sql .= " AND a.percent = 100"; }
if ($search_status == 'done') { $sql .= " AND (a.percent = 100)"; } if ($search_status == 'done') { $sql .= " AND (a.percent = 100)"; }

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

@ -70,7 +70,7 @@ class FormActions
global $langs, $conf; global $langs, $conf;
$listofstatus = array( $listofstatus = array(
'-1' => $langs->trans("ActionNotApplicable"), 'na' => $langs->trans("ActionNotApplicable"),
'0' => $langs->trans("ActionsToDoShort"), '0' => $langs->trans("ActionsToDoShort"),
'50' => $langs->trans("ActionRunningShort"), '50' => $langs->trans("ActionRunningShort"),
'100' => $langs->trans("ActionDoneShort") '100' => $langs->trans("ActionDoneShort")