From f25f8b1909dfc19e122c44acb193042ed92bfb63 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 21 Mar 2007 18:22:32 +0000
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20possibilit=E9=20d'affecter=20?=
 =?UTF-8?q?un=20commercial=20=E0=20la=20cr=E9ation=20d'un=20tier=20(s=E9le?=
 =?UTF-8?q?ction=20non=20obligatoire),=20cette=20liste=20d=E9roulante=20n'?=
 =?UTF-8?q?est=20pas=20visible=20si=20l'utilisateur=20n'a=20pas=20le=20dro?=
 =?UTF-8?q?it=20de=20voir=20tous=20les=20clients,=20dans=20ce=20cas=20se?=
 =?UTF-8?q?=20sera=20l'id=20du=20user=20en=20question=20qui=20sera=20affec?=
 =?UTF-8?q?t=E9=20=E0=20la=20soci=E9t=E9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/html.form.class.php        |  5 +++--
 htdocs/langs/en_US/companies.lang |  3 ++-
 htdocs/langs/fr_FR/companies.lang |  3 ++-
 htdocs/soc.php                    | 16 +++++++++++++++-
 htdocs/societe.class.php          |  7 +++++++
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 29cdc0fcd23..1bd690ad830 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -657,7 +657,7 @@ class Form
      *    \param      selected        Id contact pré-sélectionn
      *    \param      htmlname        Nom champ formulaire
      */
-    function select_users($selected='',$htmlname='userid')
+    function select_users($selected='',$htmlname='userid',$show_empty=0)
     {
         // On recherche les utilisateurs
         $sql = "SELECT u.rowid, u.name, u.firstname FROM ";
@@ -667,6 +667,7 @@ class Form
         if ($this->db->query($sql))
         {
             print '<select class="flat" name="'.$htmlname.'">';
+            if ($show_empty) print '<option value="-1"'.($id==-1?' selected="true"':'').'>&nbsp;</option>'."\n";
             $num = $this->db->num_rows();
             $i = 0;
             if ($num)
@@ -674,7 +675,7 @@ class Form
                 while ($i < $num)
                 {
                     $obj = $this->db->fetch_object();
-    
+                    
                     if ($selected && $selected == $obj->rowid)
                     {
                         print '<option value="'.$obj->rowid.'" selected="true">'.$obj->name.' '.$obj->firstname.'</option>';
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index e204beaa90b..80687235e4f 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -206,4 +206,5 @@ AddAddress=Add address
 NoOtherDeliveryAddress=No alternative delivery address defined
 JuridicalStatus200=Independant
 DeleteFile=Delete file
-ConfirmDeleteFile=Are you sure you want to delete this file?
\ No newline at end of file
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Allocate a commercial
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index b2c53808247..d604a4a4ce8 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -207,4 +207,5 @@ AddAddress=Ajouter adresse
 NoOtherDeliveryAddress=Pas d'adresses alternatives définies
 SupplierCategory=Catégorie du fournisseur
 DeleteFile=Suppression d'un fichier
-ConfirmDeleteFile=Êtes-vous sûr de vouloir supprimer ce fichier ?
\ No newline at end of file
+ConfirmDeleteFile=Êtes-vous sûr de vouloir supprimer ce fichier ?
+AllocateCommercial=Affecter un commercial
\ No newline at end of file
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 6defb63d761..5d16da084f0 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -122,6 +122,8 @@ if ((! $_POST["getcustomercode"] && ! $_POST["getsuppliercode"])
 	$soc->client                = $_POST["client"];
 	$soc->fournisseur           = $_POST["fournisseur"];
 	$soc->fournisseur_categorie = $_POST["fournisseur_categorie"];
+	
+	$soc->commercial_id         = $_POST["commercial_id"];
 
 	if ($_POST["action"] == 'add')
 	{
@@ -271,9 +273,11 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
             $soc->typent_id=$_POST["typent_id"];
             $soc->effectif_id=$_POST["effectif_id"];
 	    
-			$soc->tva_assuj = $_POST["assujtva_value"];
+			      $soc->tva_assuj = $_POST["assujtva_value"];
             $soc->tva_intra_code=$_POST["tva_intra_code"];
             $soc->tva_intra_num=$_POST["tva_intra_num"];
+            
+            $soc->commercial_id=$_POST["commercial_id"];
         }
 
         // On positionne pays_id, pays_code et libelle du pays choisi
@@ -512,6 +516,16 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
 		}
         print '</td>';
         print '</tr>';
+        
+    if ($user->rights->commercial->client->voir)
+    {
+    	//Affecter un commercial
+      print '<tr>';
+      print '<td>'.$langs->trans("AllocateCommercial").'</td>';
+      print '<td colspan="3">';
+      $form->select_users($soc->commercial_id,'commercial_id',1);
+      print '</td></tr>';
+    }
 
 
 
diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php
index d59a86b7d93..78d06eac387 100644
--- a/htdocs/societe.class.php
+++ b/htdocs/societe.class.php
@@ -89,6 +89,8 @@ class Societe
   var $statut_commercial;
   
   var $price_level;
+  
+  var $commercial_id; //Id du commercial affecté
 
 
   /**
@@ -161,6 +163,11 @@ class Societe
                 {
                 	$this->add_commercial($user, $user->id);
                 }
+                // Ajout du commercial affecté
+                else if ($this->commercial_id != '' && $this->commercial_id != -1)
+                {
+                	$this->add_commercial($user, $this->commercial_id);
+                }
 
 				// si le fournisseur est classe on l'ajoute
 				$this->AddFournisseurInCategory($this->fournisseur_categorie);