diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index d02dea03976..1f8d17d4a4c 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -715,7 +715,7 @@ if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
$object = new ExpenseReport($db);
$object->fetch($id);
- $result = $object->set_paid($id, $user)
+ $result = $object->set_paid($id, $user);
if ($result > 0)
{
@@ -778,15 +778,15 @@ if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
// Retour
if($result):
- Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
- exit;
+ Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+ exit;
else:
- dol_print_error($db);
+ dol_print_error($db);
endif;
+
else:
dol_print_error($db,$acct->error);
endif;
- endif;
else:
@@ -1492,20 +1492,6 @@ else
print '
'.$langs->trans("DATE_SAVE").' | ';
print ''.dol_print_date($object->date_create,'dayhour').' | ';
print '';
- if($object->fk_statut==6)
- {
- print '';
- print '| '.$langs->trans("AUTHORPAIEMENT").' | ';
- print '';
- $userfee=new User($db);
- $userfee->fetch($object->fk_user_paid);
- print $userfee->getNomUrl(1);
- print ' |
';
- print '';
- print '| '.$langs->trans("DATE_PAIEMENT").' | ';
- print ''.$object->date_paiement.' |
';
- print '';
- }
// User to inform
if($object->fk_statut<3) // informed
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index a30889c5bf4..b7eaf65568a 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -383,7 +383,7 @@ class ExpenseReport extends CommonObject
function set_paid($id, $fuser)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport";
- $sql.= " SET fk_statut = 6, fk_user_paid = ".$fuser->id.",";
+ $sql.= " SET fk_statut = 6, fk_user_paid = ".$fuser->id;
$sql.= " WHERE rowid = $id AND fk_statut = 5";
dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);