From f3d0a39d01c240c513e0da54979ccdd129807206 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 3 Apr 2007 15:23:49 +0000
Subject: [PATCH] =?UTF-8?q?D=E9but=20ajout=20cr=E9ation=20de=20particulier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menus/barre_left/eldy_backoffice.php      |  3 +-
 htdocs/langs/fr_FR/companies.lang             |  2 +-
 htdocs/soc.php                                | 61 +++++++++----------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php
index 0c11ddaaf71..0e555a83197 100644
--- a/htdocs/includes/menus/barre_left/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php
@@ -197,7 +197,8 @@ class MenuLeft {
 					// Sécurité accés client
 					if ($user->societe_id == 0)
 					{
-						$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("NewSupplier"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire);
+						$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f",$langs->trans("MenuNewCompany"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire);
+						$newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f&amp;private=1",$langs->trans("MenuNewPrivateIndividual"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire);
 					}
 					$newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=suppliers&amp;type=f",$langs->trans("Contacts"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire);
 				}
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index c5472e6e31d..df901c77447 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -14,7 +14,7 @@ MenuSocGroup=Groupes
 NewCompany=Nouvelle société (prospect, client, fournisseur)
 NewThirdParty=Nouveau tiers (prospect, client, fournisseur)
 NewSocGroup=Nouveau groupement de sociétés
-NewPrivateIndividual=Nouveau particulier (prospect, client)
+NewPrivateIndividual=Nouveau particulier (prospect, client, fournisseur)
 ProspectionArea=Espace prospection
 SocGroup=Groupement de sociétés
 IdCompany=Id société
diff --git a/htdocs/soc.php b/htdocs/soc.php
index 4861a2fcd99..8ec945d5e73 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -352,40 +352,37 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
         print '</td></tr>';
 
         // Fournisseur
-        if (!$soc->particulier)
-        {
-        	print '<tr>';
-          print '<td>'.$langs->trans('Supplier').'</td><td>';
-          $form->selectyesnonum("fournisseur",$soc->fournisseur);
-          print '</td>';
-          print '<td>'.$langs->trans('SupplierCode').'</td><td>';
+        print '<tr>';
+        print '<td>'.$langs->trans('Supplier').'</td><td>';
+        $form->selectyesnonum("fournisseur",$soc->fournisseur);
+        print '</td>';
+        print '<td>'.$langs->trans('SupplierCode').'</td><td>';
+        
+        print '<table class="nobordernopadding"><tr><td>';
+        print '<input type="text" name="code_fournisseur" size="16" value="'.$soc->code_fournisseur.'" maxlength="15">';
+		    print '</td><td>';
+		    $s=$langs->trans("SupplierCodeDesc").'<br>';
+		    $s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeFournisseur->getNom($langs).'</b><br>';
+		    $s.=$langs->trans("RequiredIfSupplier").': <b>'.yn(!$modCodeFournisseur->code_null).'</b><br>';
+		    $s.=$langs->trans("Example").': <b>'.$modCodeFournisseur->getExample($langs).'</b>';
+		    print $form->textwithhelp('',$s,1);
+        print '</td></tr></table>';
 
-          print '<table class="nobordernopadding"><tr><td>';
-          print '<input type="text" name="code_fournisseur" size="16" value="'.$soc->code_fournisseur.'" maxlength="15">';
-		      print '</td><td>';
-		      $s=$langs->trans("SupplierCodeDesc").'<br>';
-		      $s.=$langs->trans("ValidityControledByModule").': <b>'.$modCodeFournisseur->getNom($langs).'</b><br>';
-		      $s.=$langs->trans("RequiredIfSupplier").': <b>'.yn(!$modCodeFournisseur->code_null).'</b><br>';
-		      $s.=$langs->trans("Example").': <b>'.$modCodeFournisseur->getExample($langs).'</b>';
-		      print $form->textwithhelp('',$s,1);
-          print '</td></tr></table>';
+        print '</td></tr>';
 
-          print '</td></tr>';
-
-		      if ($soc->fournisseur)
-		      {
-			      $load = $soc->LoadSupplierCateg();
-			      if ( $load == 0)
-			      {
-				      if (sizeof($soc->SupplierCategories) > 0)
-				      {
-					      print '<tr>';
-					      print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
-					      $form->select_array("fournisseur_categorie",$soc->SupplierCategories);
-					      print '</td></tr>';
-				      }
-			      }
-		      }
+		    if ($soc->fournisseur)
+		    {
+			    $load = $soc->LoadSupplierCateg();
+			    if ( $load == 0)
+			    {
+				    if (sizeof($soc->SupplierCategories) > 0)
+				    {
+				     print '<tr>';
+				     print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
+				     $form->select_array("fournisseur_categorie",$soc->SupplierCategories);
+				     print '</td></tr>';
+				    }
+			    }
 		    }
 
         print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="adresse" cols="40" rows="3" wrap="soft">';