Merge pull request #10079 from aljawaid/aljawaid-fix_payment_type

FIX: Display All Types of Payments on Expense Report Card
This commit is contained in:
Laurent Destailleur 2018-11-29 11:17:31 +01:00 committed by GitHub
commit d5c28a76d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1925,7 +1925,7 @@ else
print $paymentexpensereportstatic->getNomUrl(1);
print '</td>';
print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
$labeltype=$langs->trans("PaymentType".$objp->p_code)!=("PaymentType".$objp->p_code)?$langs->trans("PaymentType".$objp->p_code):$objp->fk_typepayment;
$labeltype=$langs->trans("PaymentType".$objp->p_code)!=("PaymentType".$objp->p_code)?$langs->trans("PaymentType".$objp->p_code):$objp->payment_type;
print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
if (! empty($conf->banque->enabled))
{