From 8b6a6d1da1f50748b16c5bbe13c0a6bc36df268c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 15 Jul 2015 20:22:40 +0200
Subject: [PATCH] Fix: ER payment type don't show in card
---
htdocs/expensereport/card.php | 4 ++--
htdocs/expensereport/class/expensereport.class.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index fd701cc333b..cb36ecff487 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -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> ".$langs->trans("Currency".$conf->currency)."</td>\n";
print "</tr>";
$totalpaid += $objp->amount;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 04f5628a224..358c42362a5 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -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;
--
GitLab