Possibilit� de saisir des contacts sans soci�t�s.

htdocs/contact.class.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
- * Copyright (C) 2004      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Regis Houssin  <regis.houssin@cap-networks.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,6 @@
  *
  * $Id$
  * $Source$
- * 
  */
 
 /**
@@ -86,7 +85,10 @@ class Contact
         }
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople (datec, fk_soc, name, fk_user)";
-        $sql.= " VALUES (now(),$this->socid,'$this->name',$user->id)";
+        $sql.= " VALUES (now(),";
+        if ($this->socid > 0) $sql.= " $this->socid,";
+        else $sql.= "null,";
+        $sql.= "'$this->name',$user->id)";
     
         if ($this->db->query($sql) )
         {

htdocs/contact/exportimport.php

@@ -79,6 +79,12 @@ if ($contact->socid > 0)
 
     print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->nom_url.'</td></tr>';
 }
+else
+{
+    print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+    print $langs->trans("ContactNotLinkedToCompany");
+    print '</td></tr>';
+}
 
 print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
 print $contact->civilite_id;

htdocs/contact/fiche.php

@@ -19,7 +19,6 @@
  *
  * $Id$
  * $Source$
- *
  */
 
 /**
@@ -244,7 +243,8 @@ if ($_GET["action"] == 'create')
     }
     else {
         print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
-        print $form->select_societes('','socid','');
+        //print $form->select_societes('','socid','');
+        print $langs->trans("ContactNotLinkedToCompany");
         print '</td></tr>';
     }
 
@@ -282,7 +282,7 @@ if ($_GET["action"] == 'create')
     print $form->selectyesno("facturation",$contact->facturation);
     print '</td></tr>';
 
-    print '<tr><td align="center" colspan="4"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
+    print '<tr><td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
     print "</table><br>";
 
     print "</form>";
@@ -309,7 +309,12 @@ elseif ($_GET["action"] == 'edit')
 
         print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->nom_url.'</td></tr>';
     }
-
+    else
+    {
+        print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+        print $langs->trans("ContactNotLinkedToCompany");
+        print '</td></tr>';
+    }
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
     print $form->select_civilite($contact->civilite_id);
     print '</td></tr>';
@@ -347,7 +352,7 @@ elseif ($_GET["action"] == 'edit')
     print $form->selectyesno("facturation",$contact->facturation);
     print '</td></tr>';
 
-    print '<tr><td colspan="4" align="center"><input type="submit" value="'.$langs->trans("Save").'"></td></tr>';
+    print '<tr><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
     print "</table><br>";
 
     print "</form>";
@@ -368,6 +373,12 @@ else
     
         print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->nom_url.'</td></tr>';
     }
+    else
+    {
+        print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+        print $langs->trans("ContactNotLinkedToCompany");
+        print '</td></tr>';
+    }
     
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
     //TODO Aller chercher le libellé de la civilite a partir de l'id $contact->civilite_id

htdocs/contact/index.php

@@ -232,8 +232,17 @@ if ($result)
         print img_object($langs->trans("ShowContact"),"contact");
         print ' '.$obj->name.'</a></td>';
         print '<td>'.$obj->firstname.'</td>';
-        print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">';
+        print '<td>';
-        print img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,44).'</a></td>';
+        if ($obj->idp)
+        {
+            print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->idp.'">';
+            print img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,40).'</a>';
+        }
+        else
+        {   
+            print '&nbsp;';
+        }
+        print '</td>';
         print '<td><a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&amp;actionid=1&amp;contactid='.$obj->cidp.'&amp;socid='.$obj->idp.'">'.dolibarr_print_phone($obj->phone).'</a>&nbsp;</td>';
 
         if ($_GET["view"] == 'phone')

htdocs/contact/perso.php

@@ -111,6 +111,12 @@ if ($_GET["action"] == 'edit')
 
         print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->nom_url.'</td>';
     }
+    else
+    {
+        print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+        print $langs->trans("ContactNotLinkedToCompany");
+        print '</td></tr>';
+    }
     
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
     print $contact->civilite_id;
@@ -161,6 +167,13 @@ else
         print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">'.$objsoc->nom_url.'</td></tr>';
     }
 
+    else
+    {
+        print '<tr><td>'.$langs->trans("Company").'</td><td colspan="3">';
+        print $langs->trans("ContactNotLinkedToCompany");
+        print '</td></tr>';
+    }
+    
     print '<tr><td>'.$langs->trans("UserTitle").'</td><td colspan="3">';
     print $contact->civilite_id;
     print '</td></tr>';

htdocs/includes/menus/barre_left/eldy.php

@@ -163,14 +163,19 @@ class MenuLeft {
                 
                 $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 1, $user->rights->societe->creer);
                 $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("List"), 1, $user->rights->societe->lire);
-                $newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=prospects&type=p", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
+                $newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=prospects&type=p", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
 
                 // Clients
                 $newmenu->add(DOL_URL_ROOT."/comm/index.php?leftmenu=customers", $langs->trans("Customers"), 0, $user->rights->societe->creer);
 
-                $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 1, $user->rights->societe->creer);
+                $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 1, $user->rights->societe->creer);
                 $newmenu->add_submenu(DOL_URL_ROOT."/comm/clients.php?leftmenu=customers", $langs->trans("List"), 1, $user->rights->societe->lire);
-                $newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
+                $newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 1, $user->rights->societe->lire);
+                
+                // Contacts
+                $newmenu->add(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("Contacts"), 0, $user->rights->societe->lire);
+                $newmenu->add_submenu(DOL_URL_ROOT."/contact/fiche.php?leftmenu=contacts&action=create", $langs->trans("NewContact"), 1, $user->rights->societe->creer);
+                $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->lire);
 
                 // Actions
                 $newmenu->add(DOL_URL_ROOT."/comm/action/index.php?leftmenu=actions", $langs->trans("Actions"), 0);

htdocs/langs/en_US/companies.lang

@@ -111,3 +111,4 @@ NoRIB=No RIB defined
 NoParentCompany=None
 ExportImport=Import-Export
 ExportCardToFormat=Export card to format
+ContactNotLinkedToCompany=Contact not linked to any company

htdocs/langs/fr_FR/companies.lang

@@ -111,3 +111,4 @@ NoRIB=Aucun RIB d
 NoParentCompany=Aucune
 ExportImport=Import-Export
 ExportCardToFormat=Exporter fiche au format
+ContactNotLinkedToCompany=Contact non lié à une société