diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 1a99881fb03..8596711aba3 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -18,7 +18,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -60,182 +59,160 @@ $form=new Form($db);
  */
 if ($_GET["action"] == 'create')
 {
-
-  $soc = new Societe($db);
-  /* TODO Ajouter un test ici */
-  $soc->fetch($_GET["socidp"]);
-
-  $obj = PROPALE_ADDON;
-  $modPropale = new $obj;
-  $numpr = $modPropale->propale_get_num($soc);
-  $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."propal WHERE ref like '$numpr%'";
-
-  if ( $db->query($sql) )
+    $soc = new Societe($db);
+    $result=$soc->fetch($_GET["socidp"]);
+    if ($result < 0)
     {
-      $num = $db->result(0, 0);
-      $db->free();
-      if ($num > 0)
-	{
-	  $numpr .= "." . ($num + 1);
-	}
+        dolibarr_print_error($db,$soc->error);
+        exit;
     }
-    
-  print "<form action=\"propal.php?socidp=".$soc->id."\" method=\"post\">";
-  print "<input type=\"hidden\" name=\"action\" value=\"add\">";
-  
-  print '<table class="border" width="100%">';
-  
-  print '<tr><td>'.$langs->trans("Ref").'</td><td><input name="ref" value="'.$numpr.'"></td>';
 
-  print '<td valign="top" colspan="2">';
-  print $langs->trans("Comments").'</td></tr>';
-  
-  print '<tr><td>'.$langs->trans("Company").'</td><td><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
-  print '<td rowspan="5" colspan="2" valign="top">';
-  print '<textarea name="note" wrap="soft" cols="40" rows="6"></textarea>';
-  print '</tr>';
-  
-  print "<tr><td>".$langs->trans("Date")."</td><td>";
-  $form->select_date();
-  print "</td></tr>";
-  
-  print '<tr><td>'.$langs->trans("Author").'</td><td>'.$user->fullname.'</td></tr>';
-  print '<tr><td>'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" size="5" value="15"> '.$langs->trans("days").'</td></tr>';
+    $obj = PROPALE_ADDON;
+    $modPropale = new $obj;
+    $numpr = $modPropale->propale_get_num($soc);
+    $sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."propal WHERE ref like '$numpr%'";
 
-  /*
-   * Destinataire de la propale
-   */
-  print "<tr><td>".$langs->trans("Contact")."</td><td>\n";
-  $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email FROM ".MAIN_DB_PREFIX."socpeople as p";
-  $sql .= " WHERE p.fk_soc = ".$soc->id;
-  
-  if ( $db->query($sql) )
+    if ( $db->query($sql) )
     {
-      $i = 0 ;
-      $numdest = $db->num_rows(); 
-  
-      if ($numdest==0)
-	{
-	  print '<font class="error">Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale</font><br>';
-	  print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$soc->id.'&amp;action=create&amp;backtoreferer=1">'.$langs->trans("AddContact").'</a>';
-	}
-      else
-	{
-	  print "<select name=\"contactidp\">\n";
-	  
-	  while ($i < $numdest)
-	    {
-	      $contact = $db->fetch_object();
-	      print '<option value="'.$contact->idp.'"';
-	      if ($contact->idp == $setcontact)
-		{
-		  print ' selected';
-		}
-	      print '>'.$contact->firstname.' '.$contact->name;
-	      if ($contact->email) { print ' &lt;'.$contact->email.'&gt;'; }
-	      print '</option>';
-	      $i++;
-	    }
-	  print '</select>';
-	}
-      
-      $db->free();
-    }
-  else
-    {
-      dolibarr_print_error($db);
-    }
-  
-  print '</td></tr>';
-
-  print '<tr>';
-  if ($conf->projet->enabled) {
-
-      /*
-       * Projet associé
-       */
-      print '<td valign="top">'.$langs->trans("Project").'</td><td>';
-      print '<option value="0"></option>';
-      
-      $sql = "SELECT p.rowid, p.title FROM ".MAIN_DB_PREFIX."projet as p WHERE p.fk_soc =".$soc->id;
-      
-      if ( $db->query($sql) )
+        $num = $db->result(0, 0);
+        $db->free();
+        if ($num > 0)
         {
-          $i = 0 ;
-          $numprojet = $db->num_rows();
-    
-          if ($numprojet==0)
-    	{
-    	  print $langs->trans("NoProject").' - ';
-    	  print '<a href=../projet/fiche.php?socidp='.$soc->id.'&action=create>'.$langs->trans("AddProject").'</a>';
-    	}
-          else
-    	{	  
-    	  print '<select name="projetidp">';
-    	  
-    	  while ($i < $numprojet)
-    	    {
-    	      $projet = $db->fetch_object();
-    	      print "<option value=\"$projet->rowid\">".$projet->title."</option>";
-    	      $i++;
-    	    }
-    	  print '</select>';
-    	}
-          $db->free();
+            $numpr .= "." . ($num + 1);
         }
-      else
+    }
+
+    print "<form action=\"propal.php?socidp=".$soc->id."\" method=\"post\">";
+    print "<input type=\"hidden\" name=\"action\" value=\"add\">";
+
+    print '<table class="border" width="100%">';
+
+    print '<tr><td>'.$langs->trans("Ref").'</td><td><input name="ref" value="'.$numpr.'"></td>';
+
+    print '<td valign="top" colspan="2">';
+    print $langs->trans("Comments").'</td></tr>';
+
+    print '<tr><td>'.$langs->trans("Company").'</td><td><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
+    print '<td rowspan="5" colspan="2" valign="top">';
+    print '<textarea name="note" wrap="soft" cols="40" rows="6"></textarea>';
+    print '</tr>';
+
+    print "<tr><td>".$langs->trans("Date")."</td><td>";
+    $form->select_date();
+    print "</td></tr>";
+
+    print '<tr><td>'.$langs->trans("Author").'</td><td>'.$user->fullname.'</td></tr>';
+    print '<tr><td>'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" size="5" value="15"> '.$langs->trans("days").'</td></tr>';
+
+    /*
+    * Destinataire de la propale
+    */
+    print "<tr><td>".$langs->trans("Contact")."</td><td>\n";
+    $sql = "SELECT p.idp, p.name, p.firstname, p.poste, p.phone, p.fax, p.email FROM ".MAIN_DB_PREFIX."socpeople as p";
+    $sql .= " WHERE p.fk_soc = ".$soc->id;
+
+    if ( $db->query($sql) )
+    {
+        $i = 0 ;
+        $numdest = $db->num_rows();
+
+        if ($numdest==0)
         {
-          dolibarr_print_error($db);
+            print '<font class="error">Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale</font><br>';
+            print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$soc->id.'&amp;action=create&amp;backtoreferer=1">'.$langs->trans("AddContact").'</a>';
+        }
+        else
+        {
+            print "<select name=\"contactidp\">\n";
+
+            while ($i < $numdest)
+            {
+                $contact = $db->fetch_object();
+                print '<option value="'.$contact->idp.'"';
+                if ($contact->idp == $setcontact)
+                {
+                    print ' selected';
+                }
+                print '>'.$contact->firstname.' '.$contact->name;
+                if ($contact->email) { print ' &lt;'.$contact->email.'&gt;'; }
+                print '</option>';
+                $i++;
+            }
+            print '</select>';
         }
 
-      print '</td>';
-  }
-  else {
+        $db->free();
+    }
+    else
+    {
+        dolibarr_print_error($db);
+    }
+
+    print '</td></tr>';
+
+    print '<tr>';
+    if ($conf->projet->enabled)
+    {
+        /*
+         * Projet associ
+         */
+        print '<td valign="top">'.$langs->trans("Project").'</td><td>';
+
+        $numprojet=$form->select_projects($soc->id,0,'projetidp');
+        if ($numprojet==0)
+        {
+            print ' &nbsp; <a href=../projet/fiche.php?socidp='.$soc->id.'&action=create>'.$langs->trans("AddProject").'</a>';
+        }
+        print '</td>';
+    }
+    else {
         print '<td colspan="2">&nbsp;</td>';
-  }
-
-  print '<td>Modèle</td>';
-  print '<td>';
-  include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
-  $model=new ModelePDFPropales();
-  $liste=$model->liste_modeles($db);
-  $form->select_array("modelpdf",$liste,$conf->global->PROPALE_ADDON_PDF);
-  print "</td></tr></table>";
-  
-  print '<br>';
-  
-  if ($conf->produit->enabled || $conf->service->enabled)
-  {
-      $titre=$langs->trans("ProductsAndServices");
-      $lib=$langs->trans("Product").'/'.$langs->trans("Services");
-      
-      print_titre($titre);
-        
-      print '<table class="border">';
-      print '<tr><td>'.$lib.'</td><td>'.$langs->trans("Qty").'</td><td>'.$langs->trans("Discount").'</td></tr>';
-      for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
-        {
-          print '<tr><td>';
-          $form->select_produits('',"idprod".$i);
-          print '</td>';
-          print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
-          print '<td><input type="text" size="3" name="remise'.$i.'" value="'.$soc->remise_client.'"> %</td></tr>';
-        }
-      
-      print "</table>";
-    
-      print '<br>';
-  }
-
-  /*
-   * Si il n'y a pas de contact pour la societe on ne permet pas la creation de propale
-   */
-  if ($numdest > 0)
-    {
-      $langs->load("bills");
-      print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
     }
-  print "</form>";
+
+    print '<td>Modèle</td>';
+    print '<td>';
+    include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
+    $model=new ModelePDFPropales();
+    $liste=$model->liste_modeles($db);
+    $form->select_array("modelpdf",$liste,$conf->global->PROPALE_ADDON_PDF);
+    print "</td></tr></table>";
+
+    print '<br>';
+
+    if ($conf->produit->enabled || $conf->service->enabled)
+    {
+        $titre=$langs->trans("ProductsAndServices");
+        $lib=$langs->trans("Product").'/'.$langs->trans("Services");
+
+        print_titre($titre);
+
+        print '<table class="border">';
+        print '<tr><td>'.$lib.'</td><td>'.$langs->trans("Qty").'</td><td>'.$langs->trans("Discount").'</td></tr>';
+        for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
+        {
+            print '<tr><td>';
+            $form->select_produits('',"idprod".$i);
+            print '</td>';
+            print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
+            print '<td><input type="text" size="3" name="remise'.$i.'" value="'.$soc->remise_client.'"> %</td></tr>';
+        }
+
+        print "</table>";
+
+        print '<br>';
+    }
+
+    /*
+    * Si il n'y a pas de contact pour la societe on ne permet pas la creation de propale
+    */
+    if ($numdest > 0)
+    {
+        $langs->load("bills");
+        print '<center>';
+        print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
+        print '</center>';
+    }
+    print "</form>";
 }
 
 $db->close();
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index f51c9e1a03a..284c79f4816 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -97,36 +97,42 @@ if ($_POST['action'] == 'confirm_validate' && $_POST['confirm'] == 'yes')
 
 if ($_POST['action'] == 'add') 
 {
-  $propal = new Propal($db, $_GET['socidp']);
-  $propal->datep = mktime(12, 1 , 1, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-  
-  $propal->duree_validite = $_POST['duree_validite'];
-  
-  $propal->contactid = $_POST['contactidp'];
-  $propal->projetidp = $_POST['projetidp'];
-  $propal->modelpdf  = $_POST['modelpdf'];
-  $propal->author    = $user->id;
-  $propal->note      = $_POST['note'];
-  
-  $propal->ref = $_POST['ref'];
-  
-  for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
+    $propal = new Propal($db, $_GET['socidp']);
+    $propal->datep = mktime(12, 1 , 1, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+
+    $propal->duree_validite = $_POST['duree_validite'];
+
+    $propal->contactid = $_POST['contactidp'];
+    $propal->projetidp = $_POST['projetidp'];
+    $propal->modelpdf  = $_POST['modelpdf'];
+    $propal->author    = $user->id;
+    $propal->note      = $_POST['note'];
+
+    $propal->ref = $_POST['ref'];
+
+    for ($i = 1 ; $i <= PROPALE_NEW_FORM_NB_PRODUCT ; $i++)
     {
-      $xid = 'idprod'.$i;
-      $xqty = 'qty'.$i;
-      $xremise = 'remise'.$i;
-      $propal->add_product($_POST[$xid],$_POST[$xqty],$_POST[$xremise]);
+        $xid = 'idprod'.$i;
+        $xqty = 'qty'.$i;
+        $xremise = 'remise'.$i;
+        $propal->add_product($_POST[$xid],$_POST[$xqty],$_POST[$xremise]);
     }
-  
-  $id = $propal->create();
-  
-  /*
-   *   Generation
-   */
-  if ($id) 
+
+    $id = $propal->create();
+
+    /*
+     *   Generation
+     */
+    if ($id > 0)
     {
-      propale_pdf_create($db, $id, $_POST['modelpdf']);
-      Header ('Location: propal.php?propalid='.$id);
+        propale_pdf_create($db, $id, $_POST['modelpdf']);
+        Header ('Location: propal.php?propalid='.$id);
+        exit;
+    }
+    else
+    {
+        dolibarr_print_error($db,$propal->error);
+        exit;
     }
 }