From 48f100c06858ef2a7946d81f04f3734834824741 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Feb 2010 00:57:27 +0000 Subject: [PATCH] Fix: Wrong module numbering for project --- htdocs/includes/modules/project/mod_project_simple.php | 3 ++- htdocs/includes/modules/project/mod_project_universal.php | 3 ++- htdocs/projet/fiche.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/includes/modules/project/mod_project_simple.php b/htdocs/includes/modules/project/mod_project_simple.php index 53ef702d1ab..8b33ac4a2c5 100644 --- a/htdocs/includes/modules/project/mod_project_simple.php +++ b/htdocs/includes/modules/project/mod_project_simple.php @@ -90,7 +90,8 @@ class mod_project_simple extends ModeleNumRefProjects return -1; } - $date=$project->date_c; + $date=empty($project->date_c)?dol_now():$project->date_c; + //$yymm = strftime("%y%m",time()); $yymm = strftime("%y%m",$date); $num = sprintf("%04s",$max+1); diff --git a/htdocs/includes/modules/project/mod_project_universal.php b/htdocs/includes/modules/project/mod_project_universal.php index 4efa78ed0d3..7df265565f2 100644 --- a/htdocs/includes/modules/project/mod_project_universal.php +++ b/htdocs/includes/modules/project/mod_project_universal.php @@ -119,7 +119,8 @@ class mod_project_universal extends ModeleNumRefProjects return 0; } - $numFinal=get_next_value($db,$mask,'projet','ref','',$objsoc->code_client,$project->date_c); + $date=empty($project->date_c)?dol_now():$project->date_c; + $numFinal=get_next_value($db,$mask,'projet','ref','',$objsoc->code_client,$date); return $numFinal; } diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index ff3a08def96..b7327dd64d7 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -21,7 +21,7 @@ /** * \file htdocs/projet/fiche.php * \ingroup projet - * \brief Fiche projet + * \brief Project card * \version $Id$ */ @@ -260,6 +260,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) $modProject = new $obj; $defaultref = $modProject->getNextValue($soc,$project); } + if (empty($defaultref)) $defaultref=''; // Ref