From cacb4f094a304c02ebc5c95398f345af6ec61f20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 2 Oct 2008 23:08:14 +0000
Subject: [PATCH] Duplicate link in transaction account view

---
 htdocs/compta/bank/account.php       |  68 +++++++++++++++++----------
 htdocs/lib/functions.lib.php         |  17 +++++++
 htdocs/theme/auguria/img/view.png    | Bin 0 -> 1154 bytes
 htdocs/theme/bluelagoon/img/view.png | Bin 0 -> 1154 bytes
 htdocs/theme/dev/img/view.png        | Bin 0 -> 1154 bytes
 htdocs/theme/eldy/img/view.png       | Bin 0 -> 1154 bytes
 htdocs/theme/freelug/img/view.png    | Bin 0 -> 1154 bytes
 htdocs/theme/yellow/img/view.png     | Bin 0 -> 1154 bytes
 8 files changed, 59 insertions(+), 26 deletions(-)
 create mode 100644 htdocs/theme/auguria/img/view.png
 create mode 100644 htdocs/theme/bluelagoon/img/view.png
 create mode 100644 htdocs/theme/dev/img/view.png
 create mode 100644 htdocs/theme/eldy/img/view.png
 create mode 100644 htdocs/theme/freelug/img/view.png
 create mode 100644 htdocs/theme/yellow/img/view.png

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 8d7458a4df9..90fcc486e1c 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -380,7 +380,7 @@ if ($account || $_GET["ref"])
 	print '<tr class="liste_titre">';
 	print '<td colspan="3">&nbsp;</td>';
 	print '<td><input type="text" class="flat" name="req_desc" value="'.$_REQUEST["req_desc"].'" size="24"></td>';
-	print '<td><input type="text" class="flat" name="thirdparty" value="'.$_REQUEST["thirdparty"].'" size="16"></td>';
+	print '<td><input type="text" class="flat" name="thirdparty" value="'.$_REQUEST["thirdparty"].'" size="14"></td>';
 	print '<td align="right"><input type="text" class="flat" name="req_debit" value="'.$_REQUEST["req_debit"].'" size="4"></td>';
 	print '<td align="right"><input type="text" class="flat" name="req_credit" value="'.$_REQUEST["req_credit"].'" size="4"></td>';
 	print '<td align="center">&nbsp;</td>';
@@ -459,34 +459,46 @@ if ($account || $_GET["ref"])
 	            }
 	    
 	            print "<tr $bc[$var]>";
+
 	            print "<td nowrap>".dolibarr_print_date($objp->do,"day")."</td>\n";
+	            
 	            print "<td nowrap>&nbsp;".dolibarr_print_date($objp->dv,"day")."</td>\n";
+	            
 	            print "<td nowrap>&nbsp;".$objp->fk_type." ".($objp->num_chq?$objp->num_chq:"")."</td>\n";
-	            print '<td><a href="ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'">';
-				if (eregi('^\((.*)\)$',$objp->label,$reg))
-				{
-					// Label générique car entre parenthèses. On l'affiche en le traduisant	
-					print $langs->trans($reg[1]);
-				}
-				else
-				{    
-	            	print $objp->label;
+	            
+	            // Description
+	            print '<td>';
+	            
+	            $links = $acct->get_url($objp->rowid);
+	            
+	            $isbanktransfert=false;
+	            foreach($links as $key=>$val) { if ($val['type']=='banktransfert') $isbanktransfert=true; }
+	            
+	            if (sizeof($links) == 0 || $isbanktransfert)
+	            {
+					if (eregi('^\((.*)\)$',$objp->label,$reg))
+					{
+						// Label générique car entre parenthèses. On l'affiche en le traduisant	
+						print $langs->trans($reg[1]);
+					}
+					else
+					{    
+		            	print $objp->label;
+		            }
 	            }
-	            print '</a>';
 
 	            /*
 	             * Ajout les liens autres que tiers
 	             */
-	            $links = $acct->get_url($objp->rowid);
 	            foreach($links as $key=>$val)
 	            {
 	                if ($links[$key]['type']=='payment') {
-						print ' - ';
+						//print ' - ';
 	                    print '<a href="'.DOL_URL_ROOT.'/compta/paiement/fiche.php?id='.$links[$key]['url_id'].'">';
 						if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
 						{
 							// Label générique car entre parenthèses. On l'affiche en le traduisant	
-							if ($reg[1]=='paiement') $reg[1]='Payment';
+							if ($reg[1]=='paiement') $reg[1]='CustomerInvoicePayment';
 							print $langs->trans($reg[1]);
 						}
 						else
@@ -496,12 +508,12 @@ if ($account || $_GET["ref"])
 		                print '</a>';
 	                }
 	                else if ($links[$key]['type']=='payment_supplier') {
-						print ' - ';
+						//print ' - ';
 	                    print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$links[$key]['url_id'].'">';
 						if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
 						{
 							// Label générique car entre parenthèses. On l'affiche en le traduisant	
-							if ($reg[1]=='paiement') $reg[1]='Payment';
+							if ($reg[1]=='paiement') $reg[1]='SupplierInvoicePayment';
 							print $langs->trans($reg[1]);
 						}
 						else
@@ -515,25 +527,19 @@ if ($account || $_GET["ref"])
 					else if ($links[$key]['type']=='sc') {
 					}
 					else if ($links[$key]['type']=='payment_sc') {
-						print ' - ';
+						//print ' - ';
 						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']=='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>';
-						*/
+						/* Do not show this link (avoid confusion). Can already be accessed from transaction detail */
 					}
 					else if ($links[$key]['type']=='member') {
 					}
 					else {
-						print ' - ';
+						//print ' - ';
 	    			    print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 						if (eregi('^\((.*)\)$',$links[$key]['label'],$reg))
 						{
@@ -611,7 +617,11 @@ if ($account || $_GET["ref"])
 	            // Relevé rappro ou lien edition
 	            if ($objp->rappro && $acct->type != 2)  // Si non compte cash
 	            {
-	                print "<td align=\"center\" nowrap>&nbsp; ";
+	                print "<td align=\"center\" nowrap>";
+	                print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';
+	                print img_view();
+	                print '</a>';
+	                print "&nbsp; ";
 	                print "<a href=\"releve.php?num=$objp->num_releve&amp;account=$acct->id\">$objp->num_releve</a>";
 	                print "</td>";
 	            }
@@ -622,6 +632,12 @@ if ($account || $_GET["ref"])
 	                {
 	                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';
 	                    print img_edit();
+	                    print '</a>';
+					}
+					else
+					{
+	                    print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&amp;account='.$acct->id.'&amp;page='.$page.'">';
+	                    print img_view();
 	                    print '</a>';
 					}
 					print '&nbsp;';
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 9a1b908801f..5c6a2091d0d 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -987,6 +987,23 @@ function img_edit($alt = "default", $float=0, $other='')
 	return $img;
 }
 
+/**
+ \brief      Affiche logo voir fiche
+ \param      alt         Texte sur le alt de l'image
+ \param      float       Si il faut y mettre le style "float: right"
+ \return     string      Retourne tag img
+ */
+function img_view($alt = "default", $float=0, $other='')
+{
+	global $conf,$langs;
+	if ($alt=="default") $alt=$langs->trans("View");
+	$img='<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/view.png" border="0" alt="'.$alt.'" title="'.$alt.'"';
+	if ($float) $img.=' style="float: right"';
+	if ($other) $img.=' '.$other;
+	$img.='>';
+	return $img;
+}
+
 /**
  \brief      Affiche logo effacer
  \param      alt         Texte sur le alt de l'image
diff --git a/htdocs/theme/auguria/img/view.png b/htdocs/theme/auguria/img/view.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e0396f7b094ea1ae418e438b8f6c19ba5be0085
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DNF^MzE$5-Wc0);pW
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs56Z83KGlTt#^~qy#u6#YJRA1;peu
z)nug&^fcAYJS+psJnYQtg7m|@9YaFHOQPJ1qkR$*64KMty_0+Vau)^{ugGcJnALr-
zAy~gL#GoO>cv?;FnzGQ%l@6P$oOabYcQsY+X?5P)>aw@RZGVf`{tlo0y*`VYau+w}
ztZGeP-IlSYw|sj`-j=@FE&cTeI(-jx`M0;VH1{oN>0j7BaZ&4}W!+Pk^i5wnb-|W7
zOExZBxqjQW?Xx!BUb5lns=ar2>^r&r@U=ZhF77yTbLXjNyH7vcd-}<~Gtc*(eSUE1
zl*>zd9-UtM<k;57XEr=OyW#P9Alh{O!j*&PUmU#f;^?JU$1cA<cIEZSYi~|pe{=T6
zt1~y>p1<|({Oxy_?!3Qr_x+W-@9*7vdgH<S+YjH|di4JKgAX?ze!Tto)4ivk-`qI)
z_Rg8-cdxy8^zh+}FOOe-dHm|jlUHA#z5e>_&DWQ2zrB3-?bW;Quik%u{o%*kk3Zgh
z`uXMU<1g<Xe)#<J<CkBbzyA92?f17IzkmMx^YhoAU%&tU|NkEtHKSmlLcr6@$P{RI
zV@Z%-Ffc9#6fjIW@z@{em<mr9$B>F!$r%|NoEq5J6t?f%rKE17Vsqpq^P#n?PV{ng
zaukZR6=-X7B^^pSG)Ljity5i2DtW%Cu7Mc^4cb$pV`t45m3s1?>1uS;q^Yec(SZ{t
zFiaC|D%dQv_~0g)ggnohB#{WQL%M!Vr<}e#Q*}%|7?a47!NBnRmb3l+sj<eO$nbRa
Kb6Mw<&;$T2kk>K*

literal 0
HcmV?d00001

diff --git a/htdocs/theme/bluelagoon/img/view.png b/htdocs/theme/bluelagoon/img/view.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e0396f7b094ea1ae418e438b8f6c19ba5be0085
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DNF^MzE$5-Wc0);pW
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs56Z83KGlTt#^~qy#u6#YJRA1;peu
z)nug&^fcAYJS+psJnYQtg7m|@9YaFHOQPJ1qkR$*64KMty_0+Vau)^{ugGcJnALr-
zAy~gL#GoO>cv?;FnzGQ%l@6P$oOabYcQsY+X?5P)>aw@RZGVf`{tlo0y*`VYau+w}
ztZGeP-IlSYw|sj`-j=@FE&cTeI(-jx`M0;VH1{oN>0j7BaZ&4}W!+Pk^i5wnb-|W7
zOExZBxqjQW?Xx!BUb5lns=ar2>^r&r@U=ZhF77yTbLXjNyH7vcd-}<~Gtc*(eSUE1
zl*>zd9-UtM<k;57XEr=OyW#P9Alh{O!j*&PUmU#f;^?JU$1cA<cIEZSYi~|pe{=T6
zt1~y>p1<|({Oxy_?!3Qr_x+W-@9*7vdgH<S+YjH|di4JKgAX?ze!Tto)4ivk-`qI)
z_Rg8-cdxy8^zh+}FOOe-dHm|jlUHA#z5e>_&DWQ2zrB3-?bW;Quik%u{o%*kk3Zgh
z`uXMU<1g<Xe)#<J<CkBbzyA92?f17IzkmMx^YhoAU%&tU|NkEtHKSmlLcr6@$P{RI
zV@Z%-Ffc9#6fjIW@z@{em<mr9$B>F!$r%|NoEq5J6t?f%rKE17Vsqpq^P#n?PV{ng
zaukZR6=-X7B^^pSG)Ljity5i2DtW%Cu7Mc^4cb$pV`t45m3s1?>1uS;q^Yec(SZ{t
zFiaC|D%dQv_~0g)ggnohB#{WQL%M!Vr<}e#Q*}%|7?a47!NBnRmb3l+sj<eO$nbRa
Kb6Mw<&;$T2kk>K*

literal 0
HcmV?d00001

diff --git a/htdocs/theme/dev/img/view.png b/htdocs/theme/dev/img/view.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e0396f7b094ea1ae418e438b8f6c19ba5be0085
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DNF^MzE$5-Wc0);pW
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs56Z83KGlTt#^~qy#u6#YJRA1;peu
z)nug&^fcAYJS+psJnYQtg7m|@9YaFHOQPJ1qkR$*64KMty_0+Vau)^{ugGcJnALr-
zAy~gL#GoO>cv?;FnzGQ%l@6P$oOabYcQsY+X?5P)>aw@RZGVf`{tlo0y*`VYau+w}
ztZGeP-IlSYw|sj`-j=@FE&cTeI(-jx`M0;VH1{oN>0j7BaZ&4}W!+Pk^i5wnb-|W7
zOExZBxqjQW?Xx!BUb5lns=ar2>^r&r@U=ZhF77yTbLXjNyH7vcd-}<~Gtc*(eSUE1
zl*>zd9-UtM<k;57XEr=OyW#P9Alh{O!j*&PUmU#f;^?JU$1cA<cIEZSYi~|pe{=T6
zt1~y>p1<|({Oxy_?!3Qr_x+W-@9*7vdgH<S+YjH|di4JKgAX?ze!Tto)4ivk-`qI)
z_Rg8-cdxy8^zh+}FOOe-dHm|jlUHA#z5e>_&DWQ2zrB3-?bW;Quik%u{o%*kk3Zgh
z`uXMU<1g<Xe)#<J<CkBbzyA92?f17IzkmMx^YhoAU%&tU|NkEtHKSmlLcr6@$P{RI
zV@Z%-Ffc9#6fjIW@z@{em<mr9$B>F!$r%|NoEq5J6t?f%rKE17Vsqpq^P#n?PV{ng
zaukZR6=-X7B^^pSG)Ljity5i2DtW%Cu7Mc^4cb$pV`t45m3s1?>1uS;q^Yec(SZ{t
zFiaC|D%dQv_~0g)ggnohB#{WQL%M!Vr<}e#Q*}%|7?a47!NBnRmb3l+sj<eO$nbRa
Kb6Mw<&;$T2kk>K*

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/view.png b/htdocs/theme/eldy/img/view.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e0396f7b094ea1ae418e438b8f6c19ba5be0085
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DNF^MzE$5-Wc0);pW
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs56Z83KGlTt#^~qy#u6#YJRA1;peu
z)nug&^fcAYJS+psJnYQtg7m|@9YaFHOQPJ1qkR$*64KMty_0+Vau)^{ugGcJnALr-
zAy~gL#GoO>cv?;FnzGQ%l@6P$oOabYcQsY+X?5P)>aw@RZGVf`{tlo0y*`VYau+w}
ztZGeP-IlSYw|sj`-j=@FE&cTeI(-jx`M0;VH1{oN>0j7BaZ&4}W!+Pk^i5wnb-|W7
zOExZBxqjQW?Xx!BUb5lns=ar2>^r&r@U=ZhF77yTbLXjNyH7vcd-}<~Gtc*(eSUE1
zl*>zd9-UtM<k;57XEr=OyW#P9Alh{O!j*&PUmU#f;^?JU$1cA<cIEZSYi~|pe{=T6
zt1~y>p1<|({Oxy_?!3Qr_x+W-@9*7vdgH<S+YjH|di4JKgAX?ze!Tto)4ivk-`qI)
z_Rg8-cdxy8^zh+}FOOe-dHm|jlUHA#z5e>_&DWQ2zrB3-?bW;Quik%u{o%*kk3Zgh
z`uXMU<1g<Xe)#<J<CkBbzyA92?f17IzkmMx^YhoAU%&tU|NkEtHKSmlLcr6@$P{RI
zV@Z%-Ffc9#6fjIW@z@{em<mr9$B>F!$r%|NoEq5J6t?f%rKE17Vsqpq^P#n?PV{ng
zaukZR6=-X7B^^pSG)Ljity5i2DtW%Cu7Mc^4cb$pV`t45m3s1?>1uS;q^Yec(SZ{t
zFiaC|D%dQv_~0g)ggnohB#{WQL%M!Vr<}e#Q*}%|7?a47!NBnRmb3l+sj<eO$nbRa
Kb6Mw<&;$T2kk>K*

literal 0
HcmV?d00001

diff --git a/htdocs/theme/freelug/img/view.png b/htdocs/theme/freelug/img/view.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e0396f7b094ea1ae418e438b8f6c19ba5be0085
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DNF^MzE$5-Wc0);pW
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs56Z83KGlTt#^~qy#u6#YJRA1;peu
z)nug&^fcAYJS+psJnYQtg7m|@9YaFHOQPJ1qkR$*64KMty_0+Vau)^{ugGcJnALr-
zAy~gL#GoO>cv?;FnzGQ%l@6P$oOabYcQsY+X?5P)>aw@RZGVf`{tlo0y*`VYau+w}
ztZGeP-IlSYw|sj`-j=@FE&cTeI(-jx`M0;VH1{oN>0j7BaZ&4}W!+Pk^i5wnb-|W7
zOExZBxqjQW?Xx!BUb5lns=ar2>^r&r@U=ZhF77yTbLXjNyH7vcd-}<~Gtc*(eSUE1
zl*>zd9-UtM<k;57XEr=OyW#P9Alh{O!j*&PUmU#f;^?JU$1cA<cIEZSYi~|pe{=T6
zt1~y>p1<|({Oxy_?!3Qr_x+W-@9*7vdgH<S+YjH|di4JKgAX?ze!Tto)4ivk-`qI)
z_Rg8-cdxy8^zh+}FOOe-dHm|jlUHA#z5e>_&DWQ2zrB3-?bW;Quik%u{o%*kk3Zgh
z`uXMU<1g<Xe)#<J<CkBbzyA92?f17IzkmMx^YhoAU%&tU|NkEtHKSmlLcr6@$P{RI
zV@Z%-Ffc9#6fjIW@z@{em<mr9$B>F!$r%|NoEq5J6t?f%rKE17Vsqpq^P#n?PV{ng
zaukZR6=-X7B^^pSG)Ljity5i2DtW%Cu7Mc^4cb$pV`t45m3s1?>1uS;q^Yec(SZ{t
zFiaC|D%dQv_~0g)ggnohB#{WQL%M!Vr<}e#Q*}%|7?a47!NBnRmb3l+sj<eO$nbRa
Kb6Mw<&;$T2kk>K*

literal 0
HcmV?d00001

diff --git a/htdocs/theme/yellow/img/view.png b/htdocs/theme/yellow/img/view.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e0396f7b094ea1ae418e438b8f6c19ba5be0085
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD<DNF^MzE$5-Wc0);pW
zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NSs56Z83KGlTt#^~qy#u6#YJRA1;peu
z)nug&^fcAYJS+psJnYQtg7m|@9YaFHOQPJ1qkR$*64KMty_0+Vau)^{ugGcJnALr-
zAy~gL#GoO>cv?;FnzGQ%l@6P$oOabYcQsY+X?5P)>aw@RZGVf`{tlo0y*`VYau+w}
ztZGeP-IlSYw|sj`-j=@FE&cTeI(-jx`M0;VH1{oN>0j7BaZ&4}W!+Pk^i5wnb-|W7
zOExZBxqjQW?Xx!BUb5lns=ar2>^r&r@U=ZhF77yTbLXjNyH7vcd-}<~Gtc*(eSUE1
zl*>zd9-UtM<k;57XEr=OyW#P9Alh{O!j*&PUmU#f;^?JU$1cA<cIEZSYi~|pe{=T6
zt1~y>p1<|({Oxy_?!3Qr_x+W-@9*7vdgH<S+YjH|di4JKgAX?ze!Tto)4ivk-`qI)
z_Rg8-cdxy8^zh+}FOOe-dHm|jlUHA#z5e>_&DWQ2zrB3-?bW;Quik%u{o%*kk3Zgh
z`uXMU<1g<Xe)#<J<CkBbzyA92?f17IzkmMx^YhoAU%&tU|NkEtHKSmlLcr6@$P{RI
zV@Z%-Ffc9#6fjIW@z@{em<mr9$B>F!$r%|NoEq5J6t?f%rKE17Vsqpq^P#n?PV{ng
zaukZR6=-X7B^^pSG)Ljity5i2DtW%Cu7Mc^4cb$pV`t45m3s1?>1uS;q^Yec(SZ{t
zFiaC|D%dQv_~0g)ggnohB#{WQL%M!Vr<}e#Q*}%|7?a47!NBnRmb3l+sj<eO$nbRa
Kb6Mw<&;$T2kk>K*

literal 0
HcmV?d00001