From c0f22ac4721b864e7dcba87c98849769ce1707cd Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Fri, 28 Sep 2012 14:27:16 +0200
Subject: [PATCH 1/2] Task # 355 : autofill contat address with third party
 address

---
 htdocs/contact/fiche.php          | 15 ++++++++++++---
 htdocs/langs/en_US/companies.lang |  1 +
 htdocs/langs/fr_FR/companies.lang |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 30e6952db44..2ac6ef5316e 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -377,13 +377,20 @@ else
 
             if ($conf->use_javascript_ajax)
             {
-                print "\n".'<script type="text/javascript" language="javascript">';
+                print "\n".'<script type="text/javascript" language="javascript">'."\n";
                 print 'jQuery(document).ready(function () {
 							jQuery("#selectcountry_id").change(function() {
 								document.formsoc.action.value="create";
 								document.formsoc.submit();
                         	});
-						})';
+						
+							$("#copyaddressfromsoc").click(function() {
+								$(\'textarea[name="address"]\').text("'.addslashes($objsoc->address).'");
+								$(\'input[name="zipcode"]\').val("'.addslashes($objsoc->zip).'");
+								$(\'input[name="town"]\').val("'.addslashes($objsoc->town).'");
+								$(\'select[name="country_id"]\').val("'.addslashes($objsoc->country_id).'");
+							});
+						})'."\n";
                 print '</script>'."\n";
             }
 
@@ -426,7 +433,9 @@ else
 
             // Address
             if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) $object->address = $objsoc->address;	// Predefined with third party
-            print '<tr><td>'.$langs->trans("Address").'</td><td colspan="3"><textarea class="flat" name="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>';
+            print '<tr><td>'.$langs->trans("Address");
+            if ($conf->use_javascript_ajax) print '<br /><a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a></td>';
+            print '<td colspan="3"><textarea class="flat" name="address" cols="70">'.(isset($_POST["address"])?$_POST["address"]:$object->address).'</textarea></td>';
 
             // Zip / Town
             if (($objsoc->typent_code == 'TE_PRIVATE' || ! empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) $object->zip = $objsoc->zip;			// Predefined with third party
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index e176b08e935..5cc2c15f50f 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -77,6 +77,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
+CopyAddressFromSoc=Copier l'adresse de la société
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE is used
 LocalTax1IsNotUsedES= RE is not used
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index b7d0397243b..9ec54530163 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -79,6 +79,7 @@ Poste= Poste
 DefaultLang=Langue par défaut
 VATIsUsed=Assujetti à TVA
 VATIsNotUsed=Non assujetti à TVA
+CopyAddressFromSoc=Copier l'adresse de la société
 ##### Local Taxes #####
 LocalTax1IsUsedES= Assujetti à RE
 LocalTax1IsNotUsedES= Non assujetti à RE

From 398023e7229ef2d2a1d9a77c9b3c133b28dbf44a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Fri, 28 Sep 2012 14:29:20 +0200
Subject: [PATCH 2/2] Task # 335 : translation

---
 htdocs/langs/en_US/companies.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 5cc2c15f50f..9e555cc94bd 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -77,7 +77,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Copier l'adresse de la société
+CopyAddressFromSoc=Copy address from company
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE is used
 LocalTax1IsNotUsedES= RE is not used