diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index a07395a8f4f..a02dff6b868 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -543,41 +543,37 @@ if ($id > 0 || ! empty($ref))
if ($links[$key]['type']=='payment')
{
$paymentstatic->id=$links[$key]['url_id'];
+ $paymentstatic->ref=$links[$key]['url_id'];
print ' '.$paymentstatic->getNomUrl(2);
}
- else if ($links[$key]['type']=='payment_supplier')
+ elseif ($links[$key]['type']=='payment_supplier')
{
$paymentsupplierstatic->id=$links[$key]['url_id'];
$paymentsupplierstatic->ref=$links[$key]['url_id'];
print ' '.$paymentsupplierstatic->getNomUrl(2);
}
- else if ($links[$key]['type']=='company')
+ elseif ($links[$key]['type']=='payment_sc')
{
-
- }
- else if ($links[$key]['type']=='payment_sc')
- {
- //print ' - ';
print '';
print ' '.img_object($langs->trans('ShowPayment'),'payment').' ';
//print $langs->trans("SocialContributionPayment");
print '';
}
- else if ($links[$key]['type']=='payment_vat')
+ elseif ($links[$key]['type']=='payment_vat')
{
$paymentvatstatic->id=$links[$key]['url_id'];
$paymentvatstatic->ref=$links[$key]['url_id'];
print ' '.$paymentvatstatic->getNomUrl(2);
}
- else if ($links[$key]['type']=='banktransfert')
+ elseif ($links[$key]['type']=='banktransfert')
{
- // Do not show link to transfer ince there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
+ // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
if ($objp->amount > 0)
{
$banklinestatic->fetch($links[$key]['url_id']);
$bankstatic->id=$banklinestatic->fk_account;
$bankstatic->label=$banklinestatic->bank_account_label;
- print ' ('.$langs->trans("From ");
+ print ' ('.$langs->trans("from").' ';
print $bankstatic->getNomUrl(1,'transactions');
print ' '.$langs->trans("toward").' ';
$bankstatic->id=$objp->bankid;
@@ -589,7 +585,7 @@ if ($id > 0 || ! empty($ref))
{
$bankstatic->id=$objp->bankid;
$bankstatic->label=$objp->bankref;
- print ' ('.$langs->trans("From ");
+ print ' ('.$langs->trans("from").' ';
print $bankstatic->getNomUrl(1,'');
print ' '.$langs->trans("toward").' ';
$banklinestatic->fetch($links[$key]['url_id']);
@@ -600,11 +596,15 @@ if ($id > 0 || ! empty($ref))
}
//var_dump($links);
}
- else if ($links[$key]['type']=='member')
+ elseif ($links[$key]['type']=='company')
{
}
- else if ($links[$key]['type']=='sc')
+ elseif ($links[$key]['type']=='member')
+ {
+
+ }
+ elseif ($links[$key]['type']=='sc')
{
}
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 2a6ddd762d3..3c02d6fd9db 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2009 Laurent Destailleur
+ * Copyright (C) 2004-2013 Laurent Destailleur
* Copyright (C) 2005-2013 Regis Houssin
*
* This program is free software; you can redistribute it and/or modify
@@ -20,11 +20,17 @@
/**
* \file htdocs/compta/bank/releve.php
* \ingroup banque
- * \brief Page d'affichage d'un releve
+ * \brief Page to show a bank receipt report
*/
require('../../main.inc.php');
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$langs->load("banks");
@@ -76,6 +82,14 @@ $pagenext = $page + 1;
llxHeader();
$form = new Form($db);
+$societestatic=new Societe($db);
+$chargestatic=new ChargeSociales($db);
+$memberstatic=new Adherent($db);
+$paymentstatic=new Paiement($db);
+$paymentsupplierstatic=new PaiementFourn($db);
+$paymentvatstatic=new TVA($db);
+$bankstatic=new Account($db);
+$banklinestatic=new AccountLine($db);
// Load account
@@ -131,7 +145,7 @@ if (empty($num))
print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$acct->id, $sortfield, $sortorder,'',$numrows);
print '
';
- print "
";
+ print '
';
print '
'.$langs->trans("AccountStatement").'
';
//while ($i < min($numrows,$conf->liste_limit)) // retrait de la limite tant qu'il n'y a pas de pagination
@@ -145,7 +159,7 @@ if (empty($num))
}
else
{
- print "