From f7f90b51c71ab9b3253c14566814b37473303269 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 25 Apr 2011 09:27:25 +0000
Subject: [PATCH] Works on possibility to change customer when cloning (enable
 in customer orders) New: can send extra input in ajax dialog

---
 htdocs/commande/fiche.php             | 1 +
 htdocs/core/class/html.form.class.php | 9 +++++----
 htdocs/langs/en_US/companies.lang     | 1 +
 htdocs/langs/fr_FR/companies.lang     | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 144e6719714..df365b6d365 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1498,6 +1498,7 @@ else
                 $formquestion=array(
                 //'text' => $langs->trans("ConfirmClone"),
                 //array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
+                //array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
                 array('type' => 'other', 'name' => 'socid',   'label' => $langs->trans("SelectThirdParty"),   'value' => $html->select_company(GETPOST('socid'),'socid','(s.client=1 OR s.client=3)'))
                 );
                 // Paiement incomplet. On demande si motif = escompte ou autre
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5af432450ee..5d4e0c634df 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1992,7 +1992,7 @@ class Form
 
         if ($formquestion)
         {
-            $more.='<table class="nobordernopadding" width="100%">'."\n";
+        	$more.='<table class="nobordernopadding" width="100%">'."\n";
             $more.='<tr><td colspan="3" valign="top">'.$formquestion['text'].'</td></tr>'."\n";
             foreach ($formquestion as $key => $input)
             {
@@ -2064,7 +2064,8 @@ class Form
 
             // New code using jQuery only
             $formconfirm.= '<div id="dialog-confirm" title="'.dol_escape_htmltag($title).'">';
-            $formconfirm.= img_help('','').' '.$more.$question;
+            $formconfirm.= img_help('','').' '.$question;
+            if (! empty($more)) $formconfirm.= '<p>'.$more.'</p>';
             $formconfirm.= '</div>'."\n";
             $formconfirm.= '<script type="text/javascript">
                 var choice=\'ko\';
@@ -2235,7 +2236,7 @@ class Form
      *    	\param      htmlname    	Name of select html field
      *		\param		addempty		Ajoute entree vide
      */
- function form_availability($page, $selected='', $htmlname='availability', $addempty=0)
+    function form_availability($page, $selected='', $htmlname='availability', $addempty=0)
     {
         global $langs;
         if ($htmlname != "none")
@@ -2269,7 +2270,7 @@ class Form
      *    	\param      htmlname    	Name of select html field
      *		\param		addempty		Ajoute entree vide
      */
- function form_source($page, $selected='', $htmlname='source', $addempty=0)
+    function form_source($page, $selected='', $htmlname='source', $addempty=0)
     {
         global $langs;
         if ($htmlname != "none")
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 2ad0ffb79df..58105266ebd 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -3,6 +3,7 @@ CHARSET=UTF-8
 ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
 ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
 ErrorSetACountryFirst=Set the country first
+SelectThirdParty=Select a third party
 DeleteThirdParty=Delete a third party
 ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
 DeleteContact=Delete a contact
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index d98425d3b01..a531042d7bb 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -3,6 +3,7 @@ CHARSET=UTF-8
 ErrorCompanyNameAlreadyExists=Le nom de société %s existe déjà. Veuillez en choisir un autre.
 ErrorPrefixAlreadyExists=Le préfixe %s existe déjà. Veuillez en choisir un autre.
 ErrorSetACountryFirst=Définissez d'abord le pays
+SelectThirdParty=Sélectionner un tiers
 DeleteThirdParty=Supprimer un tiers
 ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ?
 DeleteContact=Supprimer un contact