From 33fbee51bdf06beffbe962691e8a31badc0aadcc Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Sun, 15 Sep 2013 19:09:22 +0200
Subject: [PATCH] ability to copy contact address to clipboard

---
 htdocs/core/lib/company.lib.php | 20 +++++++++++++-------
 htdocs/langs/en_US/main.lang    |  1 +
 htdocs/langs/fr_FR/main.lang    |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 6b39670fb77..ffb8cb68618 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -537,7 +537,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     print "\n".'<table class="noborder" width="100%">'."\n";
 
-    $colspan=6;
+    $colspan=8;
     print '<tr class="liste_titre">';
     print '<td>'.$langs->trans("Name").'</td>';
     print '<td>'.$langs->trans("Poste").'</td>';
@@ -552,11 +552,16 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     	$colspan++;
         print '<td>&nbsp;</td>';
     }
+    if ($user->rights->societe->contact->creer)
+    {
+    	$colspan++;
+        print '<td>&nbsp;</td>';
+    }
     print "</tr>";
 
 
     $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays, p.poste, p.phone, p.phone_mobile, p.fax, p.email, p.statut ";
-    $sql .= ", p.address, p.zip, p.town";
+    $sql .= ", p.civilite, p.address, p.zip, p.town";
     $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
     $sql .= " WHERE p.fk_soc = ".$object->id;
     $sql .= " ORDER by p.datec";
@@ -611,8 +616,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 				$coords .= addslashes($obj->civilite).' ';
 			if (!empty($obj->firstname))
 				$coords .= addslashes($obj->firstname).' ';
-			if (!empty($obj->name))
-				$coords .= addslashes($obj->name);
+			if (!empty($obj->lastname))
+				$coords .= addslashes($obj->lastname);
 			$coords .= "<br />";
 			if (!empty($obj->address))
 			{
@@ -634,7 +639,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 				if (!empty($object->country))
 					$coords .= "<br />".addslashes($object->country);
 			}
-            print '<td align="center"><a href="#" onclick="copyToClipboard(\''.$coords.'\');">';
+            print '<td align="center"><a href="#" onclick="return copyToClipboard(\''.$coords.'\');">';
             print img_picto($langs->trans("Address"), 'object_address.png');
             print '</a></td>';
 
@@ -677,16 +682,17 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     print "<br>\n";
 ?>
-<div id="dialog" title="Coordonnées" style="display: none;">
+<div id="dialog" title="<?php echo $langs->trans('Address'); ?>" style="display: none;">
 </div>
 <?php
 	print '<script type="text/javascript">
 			function copyToClipboard (text) {
 			  text = text.replace(/<br \/>/g,"\n");
-			  var newElem = "<textarea id=\"coords\" style=\"border: none; width: 100%; height: 90px;\">"+text+"</textarea><br/><br/>Ctrl+C pour copier dans le presse-papier";
+			  var newElem = "<textarea id=\"coords\" style=\"border: none; width: 90%; height: 120px;\">"+text+"</textarea><br/><br/>'.$langs->trans('HelpCopyToClipboard').'";
 			  $("#dialog").html(newElem);
 			  $( "#dialog" ).dialog();
 			  $("#coords").select();
+			  return false;
 			}
 	</script>';
 
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 9f8c6eebd51..1cc88057f27 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -658,6 +658,7 @@ Deductible=Deductible
 from=from
 toward=toward
 Access=Access
+HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
 
 # Week day
 Monday=Monday
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index ee591bb4535..b34b784165a 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -658,6 +658,7 @@ Deductible=Déductible
 from=de
 toward=vers
 Access=Accès
+HelpCopyToClipboard=Ctrl+C pour copier dans le presse-papier
 
 # Week day
 Monday=Lundi