diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 19e313607ea..765503b7a4d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3217,11 +3217,11 @@ class Form
{
foreach ($formquestion as $key => $input)
{
- if (isset($input['name'])) array_push($inputok,$input['name']);
+ //print "xx ".$key." rr ".is_array($input)."
\n";
+ if (is_array($input) && isset($input['name'])) array_push($inputok,$input['name']);
if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko,$input['name']);
}
}
-
// Show JQuery confirm box. Note that global var $useglobalvars is used inside this template
$formconfirm.= '
';
if (! empty($more)) {
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index c5a792121d6..ec172d74cce 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -576,7 +576,7 @@ if ($action == "confirm_refuse" && GETPOST('confirm')=="yes" && $id > 0 && $user
}
else
{
- setEventMessage($object->error, $object->errors);
+ setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -1407,7 +1407,14 @@ else
print '
';
print '| '.$langs->trans("AmountHT").' | ';
print ''.price($object->total_ht).' | ';
- print '';
+ $rowspan = 5;
+ if ($object->fk_statut < 3) $rowspan++;
+ elseif($object->fk_statut == 4) $rowspan+=2;
+ else $rowspan+=2;
+ if ($object->fk_statut==99 || !empty($object->detail_refuse)) $rowspan+=2;
+ if($object->fk_statut==6) $rowspan+=2;
+
+ print ' | ';
/*
* Payments
*/
@@ -1501,7 +1508,7 @@ else
print ' |
';
// User to inform
- if($object->fk_statut<3) // informed
+ if ($object->fk_statut < 3) // informed
{
print '';
print '| '.$langs->trans("VALIDATOR").' | ';
@@ -1515,7 +1522,7 @@ else
}
print '
';
}
- elseif($object->fk_statut==4)
+ elseif($object->fk_statut == 4)
{
print '';
print '| '.$langs->trans("CANCEL_USER").' | ';
@@ -1554,7 +1561,7 @@ else
print '
';
}
- if($object->fk_statut==99 || !empty($object->detail_refuse))
+ if ($object->fk_statut==99 || !empty($object->detail_refuse))
{
print '';
print '| '.$langs->trans("REFUSEUR").' | ';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 66d1c0e25d7..7fad44bb3ab 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -986,8 +986,8 @@ class ExpenseReport extends CommonObject
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$fuser->id.",";
$sql.= " date_refuse='".$this->db->idate($now)."',";
- $sql.= " detail_refuse='".$this->db->escape($details)."'";
- $sql.= " fk_user_approve=NULL,";
+ $sql.= " detail_refuse='".$this->db->escape($details)."',";
+ $sql.= " fk_user_approve = NULL";
$sql.= ' WHERE rowid = '.$this->id;
if ($this->db->query($sql))
{