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

Debug

Browse Source
This commit is contained in:
aspangaro 2015-06-22 06:53:43 +02:00
parent e0ae7bd430
commit 134cea194d
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/expensereport/card.php
View File

@ -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 '<td>'.$langs->trans("DATE_SAVE").'</td>';
print '<td>'.dol_print_date($object->date_create,'dayhour').'</td></tr>';
print '</tr>';
if($object->fk_statut==6)
{
print '<tr>';
print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
print '<td>';
$userfee=new User($db);
$userfee->fetch($object->fk_user_paid);
print $userfee->getNomUrl(1);
print '</td></tr>';
print '<tr>';
print '<td>'.$langs->trans("DATE_PAIEMENT").'</td>';
print '<td>'.$object->date_paiement.'</td></tr>';
print '</tr>';
}
// User to inform
if($object->fk_statut<3) // informed

2
htdocs/expensereport/class/expensereport.class.php
View File

@ -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);