diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 1cb4f148fea..551ce3c55b1 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2006 Andre Cianfarani * @@ -20,19 +20,15 @@ */ /** - \file htdocs/comm/addpropal.php - \ingroup propal - \brief Page d'ajout d'une proposition commmercial - \version $Id$ + * \file htdocs/comm/addpropal.php + * \ingroup propal + * \brief Page to add a new commercial proposal + * \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); -if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) -{ - require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); -} if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); $langs->load("propal"); @@ -76,9 +72,17 @@ if ($_GET["action"] == 'create') $propal = new Propal($db); $propal->date=time(); + $numpr=''; $obj = $conf->global->PROPALE_ADDON; - $modPropale = new $obj; - $numpr = $modPropale->getNextValue($soc,$propal); + if ($obj) + { + if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php")) + { + require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".$conf->global->PROPALE_ADDON.".php"); + $modPropale = new $obj; + $numpr = $modPropale->getNextValue($soc,$propal); + } + } // Fix pour modele numerotation qui deconne // Si numero deja pris (ne devrait pas arriver), on incremente par .num+1 diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index c067c8d3ce3..f2c9361745a 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -28,6 +28,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load("projects"); @@ -72,7 +73,7 @@ if ($_POST["action"] == 'add' && $user->rights->projet->creer) if (! $error) { $project = new Project($db); - + $project->ref = $_POST["ref"]; $project->title = $_POST["title"]; $project->socid = $_POST["socid"]; @@ -243,8 +244,22 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) print ''; print ''; + $project = new Project($db); + + $defaultref=''; + $obj = $conf->global->PROJECT_ADDON; + if ($obj) + { + if (! empty($conf->global->PROJECT_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/project/".$conf->global->PROJECT_ADDON.".php")) + { + require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/".$conf->global->PROJECT_ADDON.".php"); + $modProject = new $obj; + $defaultref = $modProject->getNextValue($soc,$project); + } + } + // Ref - print ''; + print ''; // Label print ''; @@ -450,7 +465,7 @@ else print ""; print "
\n"; - + if ($_GET['action'] != 'presend') { print '
'.$langs->trans("Ref").'*
'.$langs->trans("Ref").'*
'.$langs->trans("Label").'*
'; @@ -513,7 +528,7 @@ else print '
'; } - + }