From bd46e7da6f55e253e1e7218e37e3e77db3ee2bd2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 29 Oct 2007 23:42:30 +0000
Subject: [PATCH] Ajout du lien dans bank_url entre les 2 ecritures d'un
 virement

---
 htdocs/compta/bank/account.php |  9 +++++++++
 htdocs/compta/bank/rappro.php  | 25 ++++++++++++++++++++++++-
 htdocs/langs/en_US/banks.lang  |  1 +
 htdocs/langs/fr_FR/banks.lang  |  3 ++-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 925d11e38d2..1f010e054f9 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -497,6 +497,15 @@ if ($account > 0)
 						print $langs->trans("SocialContributionPayment");
 						print '</a>';
 					}
+					else if ($links[$key]['type']=='banktransfert') {
+						/* Do not show this link (avoid confusion). Can be accessed from transaction detail.
+						print ' - ';
+						print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$links[$key]['url_id'].'">';
+						//print img_object($langs->trans('ShowPayment'),'payment').' ';
+						print $langs->trans("TransactionWithOtherAccount");
+						print '</a>';
+						*/
+					}
 					else if ($links[$key]['type']=='member') {
 					}
 					else {
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index b0422743d0b..c2b1b870ce9 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -17,7 +17,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * $Id$
- * $Source$
  */
 
 /**
@@ -258,6 +257,30 @@ if ($resql)
                 print '</a>';
                 $newline=0;
             }
+			else if ($links[$key]['type']=='sc') {
+				print '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$links[$key]['url_id'].'">';
+				print img_object($langs->trans('ShowBill'),'bill').' ';
+				print $langs->trans("SocialContribution");
+				print '</a>';
+			}
+			else if ($links[$key]['type']=='payment_sc') {
+				print '<a href="'.DOL_URL_ROOT.'/compta/sociales/xxx.php?id='.$links[$key]['url_id'].'">';
+				print img_object($langs->trans('ShowPayment'),'payment').' ';
+				print $langs->trans("SocialContributionPayment");
+				print '</a>';
+			}
+			else if ($links[$key]['type']=='member') {
+				print '<a href="'.DOL_URL_ROOT.'/adherents/fiche.php?rowid='.$links[$key]['url_id'].'">';
+				print img_object($langs->trans('ShowMember'),'user').' ';
+				print $links[$key]['label'];
+				print '</a>';
+			}
+			else if ($links[$key]['type']=='banktransfert') {
+				print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$links[$key]['url_id'].'">';
+				print img_object($langs->trans('ShowTransaction'),'payment').' ';
+				print $langs->trans("TransactionOnTheOtherAccount");
+				print '</a>';
+			}
             else {
                 print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
                 print $links[$key]['label'];
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 8e66c4e5691..4a8bd29bd5e 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -111,3 +111,4 @@ BankMovements=Movements
 CashBudget=Cash budget
 ExportDataset_banque_1=Bank transactions and account statement
 TransactionOnTheOtherAccount=Transaction on the other account
+TransactionWithOtherAccount=Account transfert
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 5085ac86d7d..c8aaff41dbd 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -110,4 +110,5 @@ ThisWillAlsoDeleteBankRecord=Ceci supprimera aussi les 
 BankMovements=Mouvements
 CashBudget=Budget de trésorerie
 ExportDataset_banque_1=Transaction bancaire et relevé
-TransactionOnTheOtherAccount=Transaction sur l'autre compte
\ No newline at end of file
+TransactionOnTheOtherAccount=Transaction sur l'autre compte
+TransactionWithOtherAccount=Transfert de compte