diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index d9fc828f67f..9adbbf936d5 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2004 Benoit Mortier * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,26 +29,40 @@ $error = array(); if ($_POST["action"] == 'add') { - $contact = new Contact($db); - - $contact->socid = $_POST["socid"]; - - $contact->name = $_POST["name"]; - $contact->firstname = $_POST["firstname"]; - $contact->civilite_id = $_POST["civilite_id"]; - $contact->poste = $_POST["poste"]; - $contact->address = $_POST["adresse"]; - $contact->cp = $_POST["cp"]; - $contact->ville = $_POST["ville"]; - $contact->fax = $_POST["fax"]; - $contact->note = $_POST["note"]; - $contact->email = $_POST["email"]; - $contact->phone_pro = $_POST["phone_pro"]; - $contact->phone_perso = $_POST["phone_perso"]; - $contact->phone_mobile = $_POST["phone_mobile"]; - $contact->jabberid = $_POST["jabberid"]; - - $_GET["id"] = $contact->create($user); + if (! $_POST["name"] && ! $_POST["firstname"]) { + array_push($error,"Le champ nom ou prénom est obligatoire"); + $_GET["id"]=0; + // TODO Mettre lien back + } + else { + $contact = new Contact($db); + + $contact->socid = $_POST["socid"]; + + $contact->name = $_POST["name"]; + $contact->firstname = $_POST["firstname"]; + $contact->civilite_id = $_POST["civilite_id"]; + $contact->poste = $_POST["poste"]; + $contact->address = $_POST["adresse"]; + $contact->cp = $_POST["cp"]; + $contact->ville = $_POST["ville"]; + if ($_POST["birthdayyear"] && $_POST["birthdayyear"]<=1970 && $_SERVER["WINDIR"]) { + # windows does not support negative date timestamp so birthday is not support for old persons + array_push($error,"Windows ne sachant pas gérer des dates avant 1970, les dates de naissance avant cette date ne seront pas sauvegardées"); + } else { + $contact->birthday = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]); + } + $contact->email = $_POST["email"]; + $contact->phone_pro = $_POST["phone_pro"]; + $contact->phone_perso = $_POST["phone_perso"]; + $contact->phone_mobile = $_POST["phone_mobile"]; + $contact->fax = $_POST["fax"]; + $contact->jabberid = $_POST["jabberid"]; + + $contact->note = $_POST["note"]; + + $_GET["id"] = $contact->create($user); + } } if ($_GET["action"] == 'delete') @@ -74,24 +88,27 @@ if ($_POST["action"] == 'update') $contact->socid = $_POST["socid"]; $contact->name = $_POST["name"]; $contact->firstname = $_POST["firstname"]; - $contact->civilite_id = $_POST["civilite_id"]; + $contact->civilite_id = $_POST["civilite_id"]; $contact->poste = $_POST["poste"]; $contact->address = $_POST["adresse"]; $contact->cp = $_POST["cp"]; $contact->ville = $_POST["ville"]; + $contact->email = $_POST["email"]; $contact->phone_pro = $_POST["phone_pro"]; $contact->phone_perso = $_POST["phone_perso"]; $contact->phone_mobile = $_POST["phone_mobile"]; $contact->fax = $_POST["fax"]; - $contact->note = $_POST["note"]; - $contact->email = $_POST["email"]; $contact->jabberid = $_POST["jabberid"]; + $contact->birthday = mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]); + + $contact->note = $_POST["note"]; + $result = $contact->update($_POST["contactid"], $user); - $error = $contact->error; + if ($contact->error) { array_push($error,$contact->error); } } if ($_GET["action"] == 'create_user') @@ -125,14 +142,17 @@ if ($_GET["id"] > 0) print 'Info'; } else { - print 'Général'; + print 'Général'; } print ''; -if ($mesg) + +// Affiche les erreurs +if (sizeof($error)) { - print '
'.$mesg; - print '
'; + print '

'; + print join("
",$error); + print '

'; } @@ -146,7 +166,8 @@ if ($_GET["socid"] > 0) if ($_GET["action"] == 'create') { - print_fiche_titre ("Création d'un nouveau contact"); + // Fiche en mode creation + print '
'; print "
"; print ''; @@ -158,16 +179,16 @@ if ($_GET["action"] == 'create') print ''; } - print 'Titre'; - print $form->select_civilite($contact->civilite_id); - print ''; + print 'Titre'; + print $form->select_civilite(); + print ''; print 'Nom'; print 'Prenom'; print 'Tel Pro'; - print 'Poste'; + print 'Poste/Fonction'; print 'Tel Perso'; @@ -182,6 +203,10 @@ if ($_GET["action"] == 'create') print 'Jabberid'; + print 'Date de naissance'; + print $form->select_date('','birthday',0,0,1); + print ''; + print 'Note'; print ''; print ""; @@ -189,8 +214,9 @@ if ($_GET["action"] == 'create') } elseif ($_GET["action"] == 'edit') { - print_fiche_titre ("Edition d'un contact"); - + // Fiche en mode edition + print '
'; + $contact = new Contact($db); $contact->fetch($_GET["id"], $user); @@ -207,20 +233,20 @@ elseif ($_GET["action"] == 'edit') print ''; } - print 'Titre'; - print $form->select_civilite($contact->civilite_id); - print ''; + print 'Titre'; + print $form->select_civilite($contact->civilite_id); + print ''; print 'Nom'; print 'Prénom'; print 'Tel Pro'; - print 'Poste'; + print 'Poste/Fonction'; print 'Tel Perso'; - print 'Adresse'; + print 'Adresse'; print 'Portable'; @@ -231,8 +257,19 @@ elseif ($_GET["action"] == 'edit') print 'Jabberid'; - print 'Note'; - print ''; + print 'Date de naissance'; + if ($contact->birthday) { + print $form->select_date($contact->birthday,'birthday',0,0,0); + } else { + print $form->select_date(0,'birthday',0,0,1); + } + print ''; + + print 'Note'; + print ''; + print ''; print ""; print "
"; @@ -260,7 +297,9 @@ else print 'Société : '.$objsoc->nom_url.''; } - print 'Titre : '.$contact->civilite."
"; + + //TODO Aller chercher le libellé de la civilite a partir de l'id $contact->civilite_id + //print 'Titre : '.$contact->civilite."
"; print 'Nom : '.$contact->name.' '.$contact->firstname ."
"; @@ -274,8 +313,6 @@ else if ($contact->jabberid) print 'Jabber : '.$contact->jabberid ."
"; - print "
"; - print ''; if ($contact->phone_pro) @@ -291,16 +328,18 @@ else print 'Fax : '.$contact->fax."
"; print ''; - print ""; - print nl2br($contact->note); + if($contact->birthday && $contact->birthday > 0) + print 'Date de naissance : '.dolibarr_print_date($contact->birthday).""; - if (sizeof($error)) - { - print $error[0]; - - } + if ($contact->note) { + print ''; + print nl2br($contact->note); + print ''; + } + print "
"; + print ""; if ($user->societe_id == 0) diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index e91c81d9844..f3f8c5a7875 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -51,11 +52,13 @@ if ($contact->socid > 0) $objsoc = new Societe($db); $objsoc->fetch($contact->socid); - print 'Société : '.$objsoc->nom.'
'; + print 'Société : '.$objsoc->nom_url.'
'; } dolibarr_print_object_info($contact); +print "
"; + $db->close(); llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index f03c189a57f..3546eb50cc8 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -1,5 +1,6 @@ + * Copyright (C) 2004 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,17 +24,17 @@ require("./pre.inc.php"); require("../contact.class.php"); require (DOL_DOCUMENT_ROOT."/lib/vcard/vcard.class.php"); -if ($HTTP_POST_VARS["action"] == 'update') +if ($_POST["action"] == 'update') { $contact = new Contact($db); - $contact->id = $HTTP_POST_VARS["contactid"]; + $contact->id = $_POST["contactid"]; - $contact->birthday = $HTTP_POST_VARS["reyear"].'-'.$HTTP_POST_VARS["remonth"].'-'.$HTTP_POST_VARS["reday"]; + $contact->birthday = $_POST["reyear"].'-'.$_POST["remonth"].'-'.$_POST["reday"]; - $contact->birthday_alert = $HTTP_POST_VARS["birthday_alert"]; + $contact->birthday_alert = $_POST["birthday_alert"]; - $result = $contact->update_perso($HTTP_POST_VARS["contactid"], $user); + $result = $contact->update_perso($_POST["contactid"], $user); } /* @@ -110,15 +111,17 @@ else $objsoc = new Societe($db); $objsoc->fetch($contact->socid); - print 'Société : '.$objsoc->nom.'
'; + print 'Société : '.$objsoc->nom_url.'
'; } - if ($contact->birthday) - print 'Date de naissance : '.strftime("%d %B %Y",$contact->birthday); - - if ($contact->birthday_alert) - print ' (alerte)'; + if ($contact->birthday) { + print 'Date de naissance : '.dolibarr_print_date($contact->birthday); + if ($contact->birthday_alert) + print ' (alerte active)
'; + else + print ' (alerte inactive)
'; + } print "
"; print "";