diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 9adbbf936d5..eb135897a12 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -46,12 +46,6 @@ if ($_POST["action"] == 'add')
$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"];
@@ -102,8 +96,6 @@ if ($_POST["action"] == 'update')
$contact->fax = $_POST["fax"];
$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);
@@ -203,9 +195,9 @@ if ($_GET["action"] == 'create')
print '
Date de naissance : '.dolibarr_print_date($contact->birthday)."
";
-
if ($contact->note) {
print '
';
print nl2br($contact->note);
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 3546eb50cc8..8a2e14f942b 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -29,8 +29,15 @@ if ($_POST["action"] == 'update')
$contact = new Contact($db);
$contact->id = $_POST["contactid"];
- $contact->birthday = $_POST["reyear"].'-'.$_POST["remonth"].'-'.$_POST["reday"];
-
+ if ($_POST["birthdayyear"]) {
+ if ($_POST["birthdayyear"]<=1970 && $_SERVER["WINDIR"]) {
+ # windows mktime does not support negative date timestamp so birthday is not support for old persons
+ $contact->birthday = $_POST["birthdayyear"].'-'.$_POST["birthdaymonth"].'-'.$_POST["birthdayday"];
+ //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->birthday_alert = $_POST["birthday_alert"];
@@ -53,11 +60,13 @@ print '
';
if ($_GET["action"] == 'edit')
{
- print_fiche_titre ("Edition d'un contact");
-
+ // Fiche info perso en mode edition
+
$contact = new Contact($db);
$contact->fetch($_GET["id"], $user);
+ print_fiche_titre ("Contact : ". $contact->firstname.' '.$contact->name);
+
print '