From 5d0a8945c178eebd63fd031a39280ce91f9379e1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 14 Mar 2012 19:17:04 +0100
Subject: [PATCH] New: add getNomUrl() method

---
 htdocs/comm/propal/contact.php                |   4 ++--
 htdocs/core/class/html.formother.class.php    |   2 +-
 htdocs/core/lib/company.lib.php               |  15 ++++--------
 htdocs/societe/class/address.class.php        |  22 ++++++++++++++++++
 htdocs/theme/auguria/img/object_address.png   | Bin 0 -> 1645 bytes
 .../theme/bureau2crea/img/object_address.png  | Bin 0 -> 1645 bytes
 htdocs/theme/cameleo/img/object_address.png   | Bin 0 -> 1645 bytes
 htdocs/theme/eldy/img/object_address.png      | Bin 0 -> 1645 bytes
 8 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 htdocs/theme/auguria/img/object_address.png
 create mode 100644 htdocs/theme/bureau2crea/img/object_address.png
 create mode 100644 htdocs/theme/cameleo/img/object_address.png
 create mode 100644 htdocs/theme/eldy/img/object_address.png

diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index e12476483a0..54081f5bc21 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -189,11 +189,11 @@ if ($id > 0 || ! empty($ref))
 		
 			if ($action == 'editdelivery_address')
 			{
-				$formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'fk_address','propal',$object->id);
+				$formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'fk_address','propal',$object->id);
 			}
 			else
 			{
-				$formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,GETPOST('socid','int'),'none','propal',$object->id);
+				$formother->form_address($_SERVER['PHP_SELF'].'?id='.$object->id,$object->fk_delivery_address,$object->socid,'none','propal',$object->id);
 			}
 			print '</td></tr>';
 		}
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 1c70695994c..5d53a352b68 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -720,7 +720,7 @@ class FormOther
     }
 
     /**
-     * Show form to select addresse
+     * Show form to select address
      *
      * @param	int		$page        	Page
      * @param  	string	$selected    	Id condition pre-selectionne
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 73b58d7fb37..26b4163a1c2 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -631,8 +631,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 	print '<td>'.$langs->trans("Town").'</td>';
 	print '<td>'.$langs->trans("Country").'</td>';
 	print '<td>'.$langs->trans("Tel").'</td>';
-	print '<td>'.$langs->trans("Fax").'</td>';
-	//print '<td>'.$langs->trans("EMail").'</td>';
+	print '<td>'.$langs->trans("Fax").'</td>';
 	print "<td>&nbsp;</td>";
 	print "</tr>";
 
@@ -647,8 +646,9 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 			print "<tr ".$bc[$var].">";
 
 			print '<td>';
-			print $address->label;
-			//print $addressstatic->getNomUrl(1);
+			$addressstatic->id = $address->id;
+			$addressstatic->label = $address->label;
+			print $addressstatic->getNomUrl(1);
 			print '</td>';
 
 			print '<td>'.$address->name.'</td>';
@@ -664,12 +664,7 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 			print '</td>';
 			print '<td>';
 			print dol_print_phone($address->fax,$address->country_code,$address->id,$object->id,'AC_FAX');
-			print '</td>';
-			/*
-			print '<td>';
-			print dol_print_email($address->email,$address->id,$object->id,'AC_EMAIL');
-			print '</td>';
-			*/
+			print '</td>';
 
 			if ($user->rights->societe->creer)
 			{
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index e8fad145610..b4c456a1b05 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -433,6 +433,28 @@ class Address
 			print $this->db->error() . '<br>' . $sql;
 		}
 	}
+	
+	/**
+	 *  Return name of address with link (and eventually picto)
+	 *	Use $this->id, $this->label, $this->socid
+	 *
+	 *	@param		int			$withpicto		Include picto with link
+	 *	@param		string		$option			Where the link point to
+	 *	@return		string						String with URL
+	 */
+	function getNomUrl($withpicto=0,$option='')
+	{
+		global $langs;
+	
+		$result='';
+	
+		$lien = '<a href="'.DOL_URL_ROOT.'/comm/address.php?id='.$this->id.'&socid='.$this->socid.'">';
+		$lienfin='</a>';
+	
+		if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label,'address').$lienfin.' ');
+		$result.=$lien.$this->label.$lienfin;
+		return $result;
+	}
 
 
 	/**
diff --git a/htdocs/theme/auguria/img/object_address.png b/htdocs/theme/auguria/img/object_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..b20734da69abc6d778f525e70f27b74ff67f07b2
GIT binary patch
literal 1645
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFis`Z(?$09*7TC
z@9S&jnO9trn3tUD>0+w{G(j&jGsVin(!#{m#Ms!(3>eCWu7(z-t_H3y=FVo0#>N(I
zu5K{BF8Rr&xv6<2Fuf@Vy(T#If|5dR0nlcb)S}F?)D*X({9FaFm#s2!yTuTvc~HG6
zxZPreQ?EYIG5Vm0MT%&c5HR(CnDAr^<iHbtY927P7Xg#?u1QXu3=B*UJzX3_DsIJ0
zzUv>vC~<85XU69X7Cd4X;>gR0ytSq1*{xsaZf(*JU)$epxBk@4taY=a%(v#<ib^XD
z&&{2=Zd+bd^tGrfuBqo#0-FwbvAQ%eS2Yw1SUf+n=f$Gu@<0CG`(7J&=xLFn0Efa%
zpQN-jw$FcTq^_GBdRd|*!<Xo}^Pt(Ac{_q4^6sAhx%b;9rfqv)mz7UAR<Fn@#KOqJ
zT-SYFeAf!2D{}Tl&k6!#w{oVqW$dnhzHH(8?d9Ab`!zT?+MPc9D-ciPELG=P``j%5
z{@V2`H!TRzbv`a|BHg2=eD}vC%b)Aa<qpvjU9@n)wTA^|2Hs)w@}u@&jo6>0`9*3$
z!^DZl11yCde6%&T>bM&<hs}CyVIkAk+yA@0`m#~(zB}8*ZqLeI5T=q5$)(lh5EUdK
zy6M3q$q$pH7VZdgTh_v|@6VIG9E;MsF+saUx37zHDk>BDRZ~@XEyAdKr3aV2vu01r
zCW$#chmRlSyp*<i<-x3;m-b~cs{}9H321HSf2TY<`bvpT@5e|%<vPZ^_c~L=Yfscw
zFxxq6O{xBK{Uq<1LmT&c^B$QKH(xnZ@bTjd;p+~uOg}hZ#`my>!L90qnwzY4`<a+C
zPx`whU!3Nfdi2Qe@V^mf&oA7&m|17_!Q<~8d;ZRAlw|bT!DjesW`oZ~f$md|lSCXZ
zb1iZ4*1oo6-r`wG;-W`edH&eRm6){_UN=!%BPzN{E_f=tpw6l$liz+3It)wG9Ny<N
zm;L7R2x6P0qdYU}#9U4OH5(bzrX8KJl5fuWnJa#MTk`wJx@Eh!sCc@l$h4hIiOT7_
z`;T#cyIbJq^`g5T1%0?^P!k`|&35qi_T@LrdY7CHj+)Ci#cz4^^N$rSyr;wN?Y=E5
zKjYLU*J)8Fv~-!)otLcpaq}`)=#vi@o!R9kn%K(wt1LJt88mn9-2CQ)4<_iG=8Fu}
z6It<ONBWsW!N2GHzp6fZ*|saS++$W})S7E|lsN=k1$hoXSkJ)Bu+Y(`I`iyL5l{u-
M>FVdQ&MBb@0E{els{jB1

literal 0
HcmV?d00001

diff --git a/htdocs/theme/bureau2crea/img/object_address.png b/htdocs/theme/bureau2crea/img/object_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..b20734da69abc6d778f525e70f27b74ff67f07b2
GIT binary patch
literal 1645
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFis`Z(?$09*7TC
z@9S&jnO9trn3tUD>0+w{G(j&jGsVin(!#{m#Ms!(3>eCWu7(z-t_H3y=FVo0#>N(I
zu5K{BF8Rr&xv6<2Fuf@Vy(T#If|5dR0nlcb)S}F?)D*X({9FaFm#s2!yTuTvc~HG6
zxZPreQ?EYIG5Vm0MT%&c5HR(CnDAr^<iHbtY927P7Xg#?u1QXu3=B*UJzX3_DsIJ0
zzUv>vC~<85XU69X7Cd4X;>gR0ytSq1*{xsaZf(*JU)$epxBk@4taY=a%(v#<ib^XD
z&&{2=Zd+bd^tGrfuBqo#0-FwbvAQ%eS2Yw1SUf+n=f$Gu@<0CG`(7J&=xLFn0Efa%
zpQN-jw$FcTq^_GBdRd|*!<Xo}^Pt(Ac{_q4^6sAhx%b;9rfqv)mz7UAR<Fn@#KOqJ
zT-SYFeAf!2D{}Tl&k6!#w{oVqW$dnhzHH(8?d9Ab`!zT?+MPc9D-ciPELG=P``j%5
z{@V2`H!TRzbv`a|BHg2=eD}vC%b)Aa<qpvjU9@n)wTA^|2Hs)w@}u@&jo6>0`9*3$
z!^DZl11yCde6%&T>bM&<hs}CyVIkAk+yA@0`m#~(zB}8*ZqLeI5T=q5$)(lh5EUdK
zy6M3q$q$pH7VZdgTh_v|@6VIG9E;MsF+saUx37zHDk>BDRZ~@XEyAdKr3aV2vu01r
zCW$#chmRlSyp*<i<-x3;m-b~cs{}9H321HSf2TY<`bvpT@5e|%<vPZ^_c~L=Yfscw
zFxxq6O{xBK{Uq<1LmT&c^B$QKH(xnZ@bTjd;p+~uOg}hZ#`my>!L90qnwzY4`<a+C
zPx`whU!3Nfdi2Qe@V^mf&oA7&m|17_!Q<~8d;ZRAlw|bT!DjesW`oZ~f$md|lSCXZ
zb1iZ4*1oo6-r`wG;-W`edH&eRm6){_UN=!%BPzN{E_f=tpw6l$liz+3It)wG9Ny<N
zm;L7R2x6P0qdYU}#9U4OH5(bzrX8KJl5fuWnJa#MTk`wJx@Eh!sCc@l$h4hIiOT7_
z`;T#cyIbJq^`g5T1%0?^P!k`|&35qi_T@LrdY7CHj+)Ci#cz4^^N$rSyr;wN?Y=E5
zKjYLU*J)8Fv~-!)otLcpaq}`)=#vi@o!R9kn%K(wt1LJt88mn9-2CQ)4<_iG=8Fu}
z6It<ONBWsW!N2GHzp6fZ*|saS++$W})S7E|lsN=k1$hoXSkJ)Bu+Y(`I`iyL5l{u-
M>FVdQ&MBb@0E{els{jB1

literal 0
HcmV?d00001

diff --git a/htdocs/theme/cameleo/img/object_address.png b/htdocs/theme/cameleo/img/object_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..b20734da69abc6d778f525e70f27b74ff67f07b2
GIT binary patch
literal 1645
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFis`Z(?$09*7TC
z@9S&jnO9trn3tUD>0+w{G(j&jGsVin(!#{m#Ms!(3>eCWu7(z-t_H3y=FVo0#>N(I
zu5K{BF8Rr&xv6<2Fuf@Vy(T#If|5dR0nlcb)S}F?)D*X({9FaFm#s2!yTuTvc~HG6
zxZPreQ?EYIG5Vm0MT%&c5HR(CnDAr^<iHbtY927P7Xg#?u1QXu3=B*UJzX3_DsIJ0
zzUv>vC~<85XU69X7Cd4X;>gR0ytSq1*{xsaZf(*JU)$epxBk@4taY=a%(v#<ib^XD
z&&{2=Zd+bd^tGrfuBqo#0-FwbvAQ%eS2Yw1SUf+n=f$Gu@<0CG`(7J&=xLFn0Efa%
zpQN-jw$FcTq^_GBdRd|*!<Xo}^Pt(Ac{_q4^6sAhx%b;9rfqv)mz7UAR<Fn@#KOqJ
zT-SYFeAf!2D{}Tl&k6!#w{oVqW$dnhzHH(8?d9Ab`!zT?+MPc9D-ciPELG=P``j%5
z{@V2`H!TRzbv`a|BHg2=eD}vC%b)Aa<qpvjU9@n)wTA^|2Hs)w@}u@&jo6>0`9*3$
z!^DZl11yCde6%&T>bM&<hs}CyVIkAk+yA@0`m#~(zB}8*ZqLeI5T=q5$)(lh5EUdK
zy6M3q$q$pH7VZdgTh_v|@6VIG9E;MsF+saUx37zHDk>BDRZ~@XEyAdKr3aV2vu01r
zCW$#chmRlSyp*<i<-x3;m-b~cs{}9H321HSf2TY<`bvpT@5e|%<vPZ^_c~L=Yfscw
zFxxq6O{xBK{Uq<1LmT&c^B$QKH(xnZ@bTjd;p+~uOg}hZ#`my>!L90qnwzY4`<a+C
zPx`whU!3Nfdi2Qe@V^mf&oA7&m|17_!Q<~8d;ZRAlw|bT!DjesW`oZ~f$md|lSCXZ
zb1iZ4*1oo6-r`wG;-W`edH&eRm6){_UN=!%BPzN{E_f=tpw6l$liz+3It)wG9Ny<N
zm;L7R2x6P0qdYU}#9U4OH5(bzrX8KJl5fuWnJa#MTk`wJx@Eh!sCc@l$h4hIiOT7_
z`;T#cyIbJq^`g5T1%0?^P!k`|&35qi_T@LrdY7CHj+)Ci#cz4^^N$rSyr;wN?Y=E5
zKjYLU*J)8Fv~-!)otLcpaq}`)=#vi@o!R9kn%K(wt1LJt88mn9-2CQ)4<_iG=8Fu}
z6It<ONBWsW!N2GHzp6fZ*|saS++$W})S7E|lsN=k1$hoXSkJ)Bu+Y(`I`iyL5l{u-
M>FVdQ&MBb@0E{els{jB1

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/object_address.png b/htdocs/theme/eldy/img/object_address.png
new file mode 100644
index 0000000000000000000000000000000000000000..b20734da69abc6d778f525e70f27b74ff67f07b2
GIT binary patch
literal 1645
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xa$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%u1Od5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W}skZsAp(w
zVs37(qhMrUXrOOkq;F`XYiMp|Y-D9%pa2C*K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mLM~XjC6r2bc-wVN)jt{^NN*WCb*;)Cl_TFlw{`TDS%8&Ov*1U
zu~h=P6yk;40=Thx#n4~^2AF<DVu8M)o&m^9FonLp_?717!c`ZS1f?R}i`C%bkjjEo
z{h-w1{L-RiV8o><gRCmBaxO|uEXgkl$<NP$g<?QPeo20DMt*^UbFis`Z(?$09*7TC
z@9S&jnO9trn3tUD>0+w{G(j&jGsVin(!#{m#Ms!(3>eCWu7(z-t_H3y=FVo0#>N(I
zu5K{BF8Rr&xv6<2Fuf@Vy(T#If|5dR0nlcb)S}F?)D*X({9FaFm#s2!yTuTvc~HG6
zxZPreQ?EYIG5Vm0MT%&c5HR(CnDAr^<iHbtY927P7Xg#?u1QXu3=B*UJzX3_DsIJ0
zzUv>vC~<85XU69X7Cd4X;>gR0ytSq1*{xsaZf(*JU)$epxBk@4taY=a%(v#<ib^XD
z&&{2=Zd+bd^tGrfuBqo#0-FwbvAQ%eS2Yw1SUf+n=f$Gu@<0CG`(7J&=xLFn0Efa%
zpQN-jw$FcTq^_GBdRd|*!<Xo}^Pt(Ac{_q4^6sAhx%b;9rfqv)mz7UAR<Fn@#KOqJ
zT-SYFeAf!2D{}Tl&k6!#w{oVqW$dnhzHH(8?d9Ab`!zT?+MPc9D-ciPELG=P``j%5
z{@V2`H!TRzbv`a|BHg2=eD}vC%b)Aa<qpvjU9@n)wTA^|2Hs)w@}u@&jo6>0`9*3$
z!^DZl11yCde6%&T>bM&<hs}CyVIkAk+yA@0`m#~(zB}8*ZqLeI5T=q5$)(lh5EUdK
zy6M3q$q$pH7VZdgTh_v|@6VIG9E;MsF+saUx37zHDk>BDRZ~@XEyAdKr3aV2vu01r
zCW$#chmRlSyp*<i<-x3;m-b~cs{}9H321HSf2TY<`bvpT@5e|%<vPZ^_c~L=Yfscw
zFxxq6O{xBK{Uq<1LmT&c^B$QKH(xnZ@bTjd;p+~uOg}hZ#`my>!L90qnwzY4`<a+C
zPx`whU!3Nfdi2Qe@V^mf&oA7&m|17_!Q<~8d;ZRAlw|bT!DjesW`oZ~f$md|lSCXZ
zb1iZ4*1oo6-r`wG;-W`edH&eRm6){_UN=!%BPzN{E_f=tpw6l$liz+3It)wG9Ny<N
zm;L7R2x6P0qdYU}#9U4OH5(bzrX8KJl5fuWnJa#MTk`wJx@Eh!sCc@l$h4hIiOT7_
z`;T#cyIbJq^`g5T1%0?^P!k`|&35qi_T@LrdY7CHj+)Ci#cz4^^N$rSyr;wN?Y=E5
zKjYLU*J)8Fv~-!)otLcpaq}`)=#vi@o!R9kn%K(wt1LJt88mn9-2CQ)4<_iG=8Fu}
z6It<ONBWsW!N2GHzp6fZ*|saS++$W})S7E|lsN=k1$hoXSkJ)Bu+Y(`I`iyL5l{u-
M>FVdQ&MBb@0E{els{jB1

literal 0
HcmV?d00001