Fix: ER payment type don't show in card

This commit is contained in:
aspangaro 2015-07-15 20:22:40 +02:00
parent e0b44d7954
commit 8b6a6d1da1
2 changed files with 4 additions and 4 deletions

View File

@ -1442,8 +1442,8 @@ else
print "<tr ".$bc[$var]."><td>";
print '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
$labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->fk_typepayment;
print "<td>".$labeltype.' '.$object->num_payment."</td>\n";
$labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->fk_typepayment;
print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
print '<td align="right">'.price($objp->amount)."</td><td>&nbsp;".$langs->trans("Currency".$conf->currency)."</td>\n";
print "</tr>";
$totalpaid += $objp->amount;

View File

@ -56,8 +56,8 @@ class ExpenseReport extends CommonObject
var $user_author_infos;
var $user_validator_infos;
var $modepayment;
var $modepaymentid;
var $fk_typepayment;
var $num_payment;
var $code_paiement;
var $code_statut;