From 9ef5effeebbbd011dea6c1734f3839a5a1b10dd2 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Tue, 27 Jul 2004 14:53:14 +0000
Subject: [PATCH] Gestion du prefix commerciale

---
 htdocs/soc.php           | 30 +++++++++++++++++++++++-------
 htdocs/societe.class.php |  8 +++++++-
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/htdocs/soc.php b/htdocs/soc.php
index d29c65cd061..d519983b8bf 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -52,6 +52,7 @@ if ($_POST["action"] == 'add' or $_POST["action"] == 'update')
   $soc->siren                = $_POST["siren"];
   $soc->siret                = $_POST["siret"];
   $soc->ape                  = $_POST["ape"];
+  $soc->prefix_comm          = $_POST["prefix_comm"];
   $soc->capital              = $_POST["capital"];
   $soc->tva_intra            = $_POST["tva_intra_code"] . $_POST["tva_intra_num"];
   $soc->forme_juridique_code = $_POST["forme_juridique_code"];
@@ -61,7 +62,16 @@ if ($_POST["action"] == 'add' or $_POST["action"] == 'update')
 
   if ($_POST["action"] == 'update')
     {
-      $soc->update($_GET["socid"]);
+      $result = $soc->update($_GET["socid"]);
+      if ($result == -1)
+	{
+	  $soc->id = $_GET["socid"];
+	  // doublon sur le prefix comm
+	  $no_reload = 1;
+	  $mesg = "Erreur, le prefix '".$soc->prefix_comm."' existe déjà vous devez en choisir un autre";
+	  $_GET["action"]= "edit";
+	}
+	
     }
   if ($_POST["action"] == 'add')
     {
@@ -160,15 +170,21 @@ elseif ($_GET["action"] == 'edit')
 
   if ($_GET["socid"])
     {
-      $soc = new Societe($db);
-      $soc->id = $_GET["socid"];
-      $soc->fetch($_GET["socid"]);
-
+      if ($no_reload <> 1)
+	{
+	  $soc = new Societe($db);
+	  $soc->id = $_GET["socid"];
+	  $soc->fetch($_GET["socid"]);
+	}
+      print $mesg;	  
       print '<form action="soc.php?socid='.$soc->id.'" method="post">';
       print '<input type="hidden" name="action" value="update">';
 
       print '<table class="border" width="100%" cellpadding="3" cellspacing="0">';
-      print '<tr><td>Nom</td><td colspan="3"><input type="text" size="40" name="nom" value="'.$soc->nom.'"></td></tr>';
+      print '<tr><td>Nom</td><td><input type="text" size="40" name="nom" value="'.$soc->nom.'"></td>';
+
+      print '<td>Préfix</td><td colspan="3"><input type="text" size="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
+
       print '<tr><td valign="top">'.$langs->trans('Adresse').'</td><td colspan="3"><textarea name="adresse" cols="30" rows="3" wrap="soft">';
       print $soc->adresse;
       print '</textarea></td></tr>';
@@ -285,7 +301,7 @@ else
    */
   
   print '<table class="border" cellpadding="3" cellspacing="0" width="100%">';
-  print '<tr><td width="20%">Nom</td><td width="80%" colspan="3">'.$soc->nom.'</td></tr>';
+  print '<tr><td width="20%">Nom</td><td>'.$soc->nom.'</td><td>Préfix</td><td>'.$soc->prefix_comm.'</td></tr>';
 
   print "<tr><td valign=\"top\">".$langs->trans('Adresse')."</td><td colspan=\"3\">".nl2br($soc->adresse)."<br>".$soc->cp." ".$soc->ville." ".$soc->pays."</td></tr>";
 
diff --git a/htdocs/societe.class.php b/htdocs/societe.class.php
index a0735897b38..6a54523286d 100644
--- a/htdocs/societe.class.php
+++ b/htdocs/societe.class.php
@@ -131,6 +131,7 @@ class Societe {
     $sql .= ",siren = '" . trim($this->siren) ."'";
     $sql .= ",siret = '" . trim($this->siret) ."'";
     $sql .= ",ape = '" . trim($this->ape) ."'";
+    $sql .= ",prefix_comm = '" . trim($this->prefix_comm) ."'";
     $sql .= ",tva_intra = '" . trim($this->tva_intra) ."'";
     $sql .= ",capital = '" . $this->capital ."'";
     $sql .= ",fk_effectif = '" . $this->effectif_id ."'";
@@ -140,10 +141,15 @@ class Societe {
     $sql .= " WHERE idp = '" . $id ."';";
     if ($this->db->query($sql)) 
       {
-
+	return 0;
       }
     else
       {
+	if ($this->db->errno() == 1062)
+	  {
+	    // Doublons sur le prefix commercial
+	    return -1;
+	  }
 	print $this->db->error();
       }
   }