Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
This commit is contained in:
commit
2e94f7dbd4
4 changed files with 13 additions and 11 deletions
|
|
@ -632,11 +632,11 @@ class Invoices extends DolibarrApi
|
|||
}
|
||||
}
|
||||
|
||||
if ($this->invoice->update(DolibarrApiAccess::$user)) {
|
||||
if ($this->invoice->update(DolibarrApiAccess::$user) > 0) {
|
||||
return $this->get($id);
|
||||
} else {
|
||||
throw new RestException(500, $this->invoice->error);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -716,7 +716,7 @@ class FormTicket
|
|||
$ticketstat->loadCacheTypesTickets();
|
||||
|
||||
print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect?'[]':'').'"'.($multiselect?' multiple':'').'>';
|
||||
if ($empty) {
|
||||
if ($empty && !$multiselect) {
|
||||
print '<option value=""> </option>';
|
||||
}
|
||||
|
||||
|
|
@ -753,7 +753,7 @@ class FormTicket
|
|||
print ' selected="selected"';
|
||||
} elseif (in_array($id, $selected)) {
|
||||
print ' selected="selected"';
|
||||
} elseif ($arraytypes['use_default'] == "1" && empty($selected)) {
|
||||
} elseif ($arraytypes['use_default'] == "1" && empty($selected) && !$multiselect) {
|
||||
print ' selected="selected"';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1193,6 +1193,7 @@ foreach ($listofreferent as $key => $value) {
|
|||
}
|
||||
|
||||
$num = count($elementarray);
|
||||
$total_time = 0;
|
||||
for ($i = 0; $i < $num; $i++) {
|
||||
$tmp = explode('_', $elementarray[$i]);
|
||||
$idofelement = $tmp[0];
|
||||
|
|
@ -1310,7 +1311,7 @@ foreach ($listofreferent as $key => $value) {
|
|||
print "</td>\n";
|
||||
|
||||
// Date or TimeSpent
|
||||
$date = ''; $total_time_by_line = null; $total_time = 0;
|
||||
$date = ''; $total_time_by_line = null;
|
||||
if ($tablename == 'expensereport_det') {
|
||||
$date = $element->date; // No draft status on lines
|
||||
} elseif ($tablename == 'stock_mouvement') {
|
||||
|
|
|
|||
|
|
@ -375,6 +375,7 @@ if ($socid > 0) {
|
|||
}
|
||||
|
||||
foreach ($search as $key => $val) {
|
||||
$tmpkey = 't.' . $key;
|
||||
if ($key == 'fk_statut' && !empty($search['fk_statut'])) {
|
||||
$newarrayofstatus = array();
|
||||
foreach ($search['fk_statut'] as $key2 => $val2) {
|
||||
|
|
@ -396,18 +397,18 @@ foreach ($search as $key => $val) {
|
|||
$newarrayofstatus[] = Ticket::STATUS_CANCELED;
|
||||
}
|
||||
if (count($newarrayofstatus)) {
|
||||
$sql .= natural_search($key, join(',', $newarrayofstatus), 2);
|
||||
$sql .= natural_search($tmpkey, join(',', $newarrayofstatus), 2);
|
||||
}
|
||||
continue;
|
||||
} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create' || $key == 'fk_project') {
|
||||
if ($search[$key] > 0) {
|
||||
$sql .= natural_search($key, $search[$key], 2);
|
||||
$sql .= natural_search($tmpkey, $search[$key], 2);
|
||||
}
|
||||
continue;
|
||||
} elseif ($key == 'type_code') {
|
||||
$newarrayoftypecodes = is_array($search[$key]) ? $search[$key] : (!empty($search[$key]) ? explode(',', $search[$key]) : array());
|
||||
if (count($newarrayoftypecodes)) {
|
||||
$sql .= natural_search($key, join(',', $newarrayoftypecodes), 3);
|
||||
$sql .= natural_search($tmpkey, join(',', $newarrayoftypecodes), 3);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
|
@ -415,7 +416,7 @@ foreach ($search as $key => $val) {
|
|||
$mode_search = ((!empty($object->fields[$key]) && ($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))) ? 1 : 0);
|
||||
// $search[$key] can be an array of values, or a string. We add filter if array not empty or if it is a string.
|
||||
if ((is_array($search[$key]) && !empty($search[$key])) || (!is_array($search[$key]) && $search[$key] != '')) {
|
||||
$sql .= natural_search($key, $search[$key], $mode_search);
|
||||
$sql .= natural_search($tmpkey, $search[$key], $mode_search);
|
||||
}
|
||||
}
|
||||
if ($search_all) {
|
||||
|
|
@ -425,7 +426,7 @@ if ($search_societe) {
|
|||
$sql .= natural_search('s.nom', $search_societe);
|
||||
}
|
||||
if ($search_fk_project > 0) {
|
||||
$sql .= natural_search('fk_project', $search_fk_project, 2);
|
||||
$sql .= natural_search('t.fk_project', $search_fk_project, 2);
|
||||
}
|
||||
if ($search_date_start) {
|
||||
$sql .= " AND t.datec >= '".$db->idate($search_date_start)."'";
|
||||
|
|
|
|||
Loading…
Reference in a new issue