diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index ba3455fb601..1094577536e 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -72,7 +72,7 @@ else $viewline = 50; $sql = "SELECT b.rowid, b.dateo as do, b.amount, b.label, b.rappro, b.num_releve, b.num_chq,"; $sql.= " b.fk_account, b.fk_type,"; -$sql.= " ba.rowid as bankid, ba.label as bankref,"; +$sql.= " ba.rowid as bankid, ba.ref as bankref,"; $sql.= " bu.label as labelurl, bu.url_id"; $sql.= " FROM ("; if (! empty($_REQUEST["bid"])) $sql.= MAIN_DB_PREFIX."bank_class as l, "; @@ -133,8 +133,9 @@ if ($resql) print ''; print ''; print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans('DateOperation'),$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans('DateOperationShort'),$_SERVER['PHP_SELF'],'b.dateo','',$param,'align="left"',$sortfield,$sortorder); print ''; + print ''; print ''; print ''; print ''; @@ -146,8 +147,9 @@ if ($resql) print ''; print ''; print ''; + print ''; print ''; @@ -188,6 +190,21 @@ if ($resql) else print dolibarr_trunc($objp->label,40); print " "; + // Third party + print "'; + + // Debit/Credit if ($objp->amount < 0) { print "\n"; @@ -197,11 +214,12 @@ if ($resql) print "\n"; } + // Payment type print "\n"; // Bank account print "\n";
'.$langs->trans("Description").''.$langs->trans("ThirdParty").''.$langs->trans("Debit").''.$langs->trans("Credit").''.$langs->trans("Type").'  '; - print ''; + print ''; print ' '; print ''; print '"; + if ($objp->url_id) + { + $companystatic->id=$objp->url_id; + $companystatic->nom=$objp->labelurl; + print $companystatic->getNomUrl(1); + } + else + { + print ' '; + } + print '".price($objp->amount * -1)."  ".price($objp->amount)."".$langs->getLabelFromKey($db,$objp->fk_type,'c_paiement','code','libelle').""; - $bankaccountstatic->id=$objp->bankid; + $bankaccountstatic->id=$objp->url_id; $bankaccountstatic->label=$objp->bankref; print $bankaccountstatic->getNomUrl(1); print "