From ac85f14cb66a78a669ce5186f06833ff6ac3666d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 3 Nov 2010 17:27:44 +0000
Subject: [PATCH] Works on contact canvas in relation to the thirdparty canvas
 module

---
 .../canvas/actions_contactcard_common.class.php  |  5 +++--
 .../default/tpl/contactcard_create.tpl.php       |  3 ++-
 .../canvas/default/tpl/contactcard_edit.tpl.php  |  3 ++-
 .../societe/canvas/actions_card_common.class.php | 13 +++++++++++++
 .../canvas/default/tpl/card_create.tpl.php       | 11 +----------
 .../societe/canvas/default/tpl/card_edit.tpl.php | 12 +-----------
 .../canvas/individual/tpl/card_create.tpl.php    | 11 +----------
 .../canvas/individual/tpl/card_edit.tpl.php      | 16 +++-------------
 8 files changed, 26 insertions(+), 48 deletions(-)

diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 300dcdb67f1..1c49a11da91 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -67,10 +67,11 @@ class ActionsContactCardCommon
         {
         	if ($conf->use_javascript_ajax)
 			{
-				$this->tpl['ajax_selectpays'] = "\n".'<script type="text/javascript" language="javascript">
+				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectpays_id").change(function() {
 							document.formsoc.action.value="'.$action.'";
+							document.formsoc.canvas.value="'.$canvas.'";
 							document.formsoc.submit();
 						});
 					})
@@ -130,7 +131,7 @@ class ActionsContactCardCommon
         	if ($conf->mailing->enabled)
 			{
 				$langs->load("mails");
-				$this->tpl['nb_emailing'] = $object->getNbOfEMailings();
+				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
         	
         	// Linked element
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index 897075fb65c..13fff5b0998 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -21,12 +21,13 @@
 
 <!-- BEGIN PHP TEMPLATE -->
 
-<?php echo $this->tpl['ajax_selectpays']; ?>
+<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <br>
 
 <form method="post" name="formsoc" action="<?php echo $_SERVER["PHP_SELF"]; ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="canvas" value="<?php echo $canvas ?>">
 <input type="hidden" name="action" value="add">
 <?php if ($this->control->tpl['company_id']) { ?>
 <input type="hidden" name="socid" value="<?php echo $this->control->tpl['company_id']; ?>">
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index b5df126519a..ac60cc28496 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -21,12 +21,13 @@
 
 <!-- BEGIN PHP TEMPLATE -->
 
-<?php echo $this->tpl['ajax_selectpays']; ?>
+<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <br>
 
 <form method="post" name="formsoc" action="<?php echo $_SERVER["PHP_SELF"].'?id='.GETPOST("id"); ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
+<input type="hidden" name="canvas" value="<?php echo $canvas ?>">
 <input type="hidden" name="id" value="<?php echo GETPOST("id"); ?>">
 <input type="hidden" name="action" value="update">
 <input type="hidden" name="contactid" value="<?php echo $this->control->tpl['id']; ?>">
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 0c25309e9bd..87718a7def1 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -71,6 +71,19 @@ class ActionsCardCommon
 
         if ($action == 'create' || $action == 'edit')
         {
+        	if ($conf->use_javascript_ajax)
+			{
+				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
+				jQuery(document).ready(function () {
+						jQuery("#selectpays_id").change(function() {
+							document.formsoc.action.value="'.$action.'";
+							document.formsoc.canvas.value="'.$canvas.'";
+							document.formsoc.submit();
+						});
+					})
+				</script>'."\n";
+			}
+        	
             // Load object modCodeClient
             $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
             if (! $module) dolibarr_error('',$langs->trans("ErrorModuleThirdPartyCodeInCompanyModuleNotDefined"));
diff --git a/htdocs/societe/canvas/default/tpl/card_create.tpl.php b/htdocs/societe/canvas/default/tpl/card_create.tpl.php
index 8b10e4a1db7..91d156bd59d 100644
--- a/htdocs/societe/canvas/default/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/default/tpl/card_create.tpl.php
@@ -46,16 +46,7 @@ jQuery(document).ready(function () {
 <input type="radio" id="radioprivate" class="flat" name="private" value="1"'<?php echo (! $_REQUEST["private"]?'':' checked="true"'); ?>> <?php echo $langs->trans("Individual"); ?> (<?php echo $langs->trans("ToCreateContactWithSameName") ?>)
 <br>
 <br>
-
-<script type="text/javascript" language="javascript">
-jQuery(document).ready(function () {
-                        jQuery("#selectpays_id").change(function() {
-                            document.formsoc.action.value="create";
-                            document.formsoc.canvas.value="<?php echo $canvas ?>";
-                            document.formsoc.submit();
-                        });
-                   });
-</script>
+<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 <?php } ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="POST" name="formsoc">
diff --git a/htdocs/societe/canvas/default/tpl/card_edit.tpl.php b/htdocs/societe/canvas/default/tpl/card_edit.tpl.php
index 881ddb54da1..cfc5bd511c3 100644
--- a/htdocs/societe/canvas/default/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/default/tpl/card_edit.tpl.php
@@ -21,17 +21,7 @@
 
 <!-- BEGIN PHP TEMPLATE -->
 
-<?php if ($conf->use_javascript_ajax) { ?>
-<script type="text/javascript" language="javascript">
-jQuery(document).ready(function () {
-                        jQuery("#selectpays_id").change(function() {
-                            document.formsoc.action.value="update";
-                            document.formsoc.canvas.value="<?php echo $canvas ?>";
-                            document.formsoc.submit();
-                        });
-                   });
-</script>
-<?php } ?>
+<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id']; ?>" method="POST" name="formsoc">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 7eb58fd9414..e4562e5d08e 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -46,16 +46,7 @@ jQuery(document).ready(function () {
 <input type="radio" id="radioprivate" class="flat" name="private" value="1"'<?php echo (! $_REQUEST["private"]?'':' checked="true"'); ?>> <?php echo $langs->trans("Individual"); ?> (<?php echo $langs->trans("ToCreateContactWithSameName") ?>)
 <br>
 <br>
-
-<script type="text/javascript" language="javascript">
-jQuery(document).ready(function () {
-                        jQuery("#selectpays_id").change(function() {
-                            document.formsoc.action.value="create";
-                            document.formsoc.canvas.value="<?php echo $canvas ?>";
-                            document.formsoc.submit();
-                        });
-                   });
-</script>
+<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 <?php } ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="POST" name="formsoc">
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 1aafa23409a..06967cb788f 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -21,17 +21,7 @@
 
 <!-- BEGIN PHP TEMPLATE -->
 
-<?php if ($conf->use_javascript_ajax) { ?>
-<script type="text/javascript" language="javascript">
-jQuery(document).ready(function () {
-                        jQuery("#selectpays_id").change(function() {
-                            document.formsoc.action.value="update";
-                            document.formsoc.canvas.value="<?php echo $canvas ?>";
-                            document.formsoc.submit();
-                        });
-                   });
-</script>
-<?php } ?>
+<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id']; ?>" method="POST" name="formsoc">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
@@ -127,9 +117,9 @@ if ($this->control->tpl['fournisseur']) {
 
 <tr>
 	<td><?php echo $langs->trans('Zip'); ?></td>
-	<td><input size="6" type="text" name="cp" value="<?php echo $this->control->tpl['cp']; ?>"><?php echo $this->control->tpl['autofilltownfromzip']; ?></td>
+	<td><?php echo $this->control->tpl['select_zip']; ?></td>
 	<td><?php echo $langs->trans('Town'); ?></td>
-	<td><input type="text" name="ville" value="<?php echo $this->control->tpl['ville']; ?>"></td>
+	<td><?php echo $this->control->tpl['select_town']; ?></td>
 </tr>
 
 <tr>