diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index 256a7e71721..923eff12936 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -25,8 +25,8 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); -require_once(DOL_DOCUMENT_ROOT.'/task.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); +require_once(DOL_DOCUMENT_ROOT.'/projet/tasks/task.class.php'); $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index b86f581e580..6e103f6354e 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/user.class.php"); require_once(DOL_DOCUMENT_ROOT."/cactioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formactions.class.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $langs->load("companies"); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index d61e0f7ac20..67ed8a78dde 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -41,7 +41,7 @@ $langs->load('bills'); $langs->load('orders'); $langs->load('products'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index afb33a55610..b0b93088f1e 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -22,14 +22,14 @@ /** \file htdocs/comm/propal/apercu.php \ingroup propal - \brief Page de l'onglet aper�u d'une propal + \brief Page de l'onglet apercu d'une propal \version $Id$ */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); $langs->load('propal'); $langs->load("bills"); diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index c910c6f9e1e..d3640e94489 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -30,7 +30,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 376c9437c12..f4b381195d9 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index e2970e314cc..be2ceb67bfa 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if (! $user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index de3fb6647f3..0b880c07abc 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -36,7 +36,7 @@ require_once(DOL_DOCUMENT_ROOT.'/discount.class.php'); require_once(DOL_DOCUMENT_ROOT.'/paiement.class.php'); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php'); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php'); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT.'/contrat/contrat.class.php'); diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index a892f162fc2..18827516a70 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -30,7 +30,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if (!$user->rights->facture->lire) diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 9056b03d461..d9bef577db3 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -27,7 +27,7 @@ require("./pre.inc.php"); require_once("./facture-rec.class.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/product.class.php"); diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index a4237599667..b7238519e7b 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -31,7 +31,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php'); $langs->load('companies'); diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index f43b70d1484..cdd6768524b 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -28,7 +28,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); diff --git a/htdocs/expedition/commande.php b/htdocs/expedition/commande.php index 4556ec206eb..f5190d656af 100644 --- a/htdocs/expedition/commande.php +++ b/htdocs/expedition/commande.php @@ -29,7 +29,7 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/product.class.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php"); diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 34d641323e5..b0e0275e890 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -19,16 +19,16 @@ */ /** - \file htdocs/fichinter/apercu.php - \ingroup fichinter - \brief Page de l'onglet aper�u d'une fiche d'intervention - \version $Id$ -*/ + * \file htdocs/fichinter/apercu.php + * \ingroup fichinter + * \brief Page de l'onglet apercu d'une fiche d'intervention + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/fichinter/fichinter.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); $langs->load('interventions'); diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index f5e4f30fe3a..afef8f26794 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php"); if ($conf->projet->enabled) { require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); - require_once(DOL_DOCUMENT_ROOT."/project.class.php"); + require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); } if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php")) { diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 60e642c6842..a93cb811c39 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -30,7 +30,7 @@ require('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT.'/includes/modules/supplier_order/modules_commandefournisseur.php'); require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); $langs->load('orders'); $langs->load('sendings'); diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 0d9025a9732..e7bc6bbfda5 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.commande.class.php"; require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.product.class.php"; require_once DOL_DOCUMENT_ROOT."/lib/fourn.lib.php"; require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); $langs->load('orders'); $langs->load('sendings'); diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 2a9ac2a7683..b2ce054b9db 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT.'/fourn/facture/paiementfourn.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/product.class.php'); -if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/project.class.php'); +if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php'); // If socid provided by ajax company selector if (! empty($_REQUEST['socid_id'])) diff --git a/htdocs/html.formother.class.php b/htdocs/html.formother.class.php index 3499d0fe58f..f1c032f45fb 100644 --- a/htdocs/html.formother.class.php +++ b/htdocs/html.formother.class.php @@ -213,7 +213,7 @@ class FormOther { global $user, $langs; - require_once(DOL_DOCUMENT_ROOT."/project.class.php"); + require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); //print $modeproject.'-'.$modetask; $project=new Project($this->db); diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index 19f4792f145..6daf800068b 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php @@ -26,8 +26,8 @@ */ require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); diff --git a/htdocs/projet/activity/list.php b/htdocs/projet/activity/list.php index 95cf731d0f2..24adcf8b14e 100644 --- a/htdocs/projet/activity/list.php +++ b/htdocs/projet/activity/list.php @@ -30,12 +30,12 @@ require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); $mode=$_REQUEST["mode"]; -$projetid=''; -$projetid=isset($_GET["id"])?$_GET["id"]:$_POST["projetid"]; +$projectid=''; +$projectid=isset($_GET["id"])?$_GET["id"]:$_POST["projetid"]; // Security check if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'projet', $projetid); +$result = restrictedArea($user, 'projet', $projectid); /* * Actions @@ -43,16 +43,16 @@ $result = restrictedArea($user, 'projet', $projetid); if ($_POST["action"] == 'createtask' && $user->rights->projet->creer) { - $project = new Project($db); - - $result = $project->fetch($_GET["id"]); + $task = new Task($db); + + $task->fk_task_parent = $_POST["task_parent"]?$_POST["task_parent"]:0; + $task->label = $_POST["task_name"]; + + $result = $task->create($user); if ($result == 0) { - $task_parent = $_POST["task_parent"]?$_POST["task_parent"]:0; - $project->CreateTask($user, $_POST["task_name"], $task_parent); - - Header("Location:fiche.php?id=".$project->id); + Header("Location:fiche.php?id=".$projectid); exit; } } diff --git a/htdocs/projet/activity/pre.inc.php b/htdocs/projet/activity/pre.inc.php index 23e37735717..e97b47c2b8b 100644 --- a/htdocs/projet/activity/pre.inc.php +++ b/htdocs/projet/activity/pre.inc.php @@ -24,8 +24,8 @@ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index d3b146309bf..e79b9eda977 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -24,7 +24,7 @@ */ require ("./pre.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php'); diff --git a/htdocs/projet/pre.inc.php b/htdocs/projet/pre.inc.php index eb17cc3af82..47b3a83d5be 100644 --- a/htdocs/projet/pre.inc.php +++ b/htdocs/projet/pre.inc.php @@ -25,7 +25,7 @@ */ require ("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/project.class.php b/htdocs/projet/project.class.php similarity index 99% rename from htdocs/project.class.php rename to htdocs/projet/project.class.php index 72e32fbf9b3..77f1f79addd 100644 --- a/htdocs/project.class.php +++ b/htdocs/projet/project.class.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/project.class.php + * \file htdocs/projet/project.class.php * \ingroup projet * \brief Fichier de la classe de gestion des projets * \version $Id$ diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index eb59defd24c..7565b0d5e35 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -27,8 +27,8 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php"); $projetid=''; diff --git a/htdocs/projet/tasks/pre.inc.php b/htdocs/projet/tasks/pre.inc.php index 2c88ac7a421..a7cd6186d9f 100644 --- a/htdocs/projet/tasks/pre.inc.php +++ b/htdocs/projet/tasks/pre.inc.php @@ -23,8 +23,8 @@ * \version $Id$ */ require ("../../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/project.class.php"); -require_once(DOL_DOCUMENT_ROOT."/task.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php"); +require_once(DOL_DOCUMENT_ROOT."/projet/tasks/task.class.php"); $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/task.class.php b/htdocs/projet/tasks/task.class.php similarity index 93% rename from htdocs/task.class.php rename to htdocs/projet/tasks/task.class.php index 99c711e7372..8e1d1308c5b 100644 --- a/htdocs/task.class.php +++ b/htdocs/projet/tasks/task.class.php @@ -17,7 +17,7 @@ */ /** - * \file task.class.php + * \file htdocs/projet/tasks/task.class.php * \ingroup project * \brief This file is a CRUD class file for Task (Create/Read/Update/Delete) * \version $Id$ @@ -89,28 +89,20 @@ class Task extends CommonObject // Put here code to add control on parameters values // Insert request - $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task("; - - $sql.= "fk_projet,"; - $sql.= "fk_task_parent,"; - $sql.= "title,"; - $sql.= "duration_effective,"; - $sql.= "fk_user_creat,"; - $sql.= "statut,"; - $sql.= "note"; - - + $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task ("; + $sql.= "fk_projet"; + $sql.= ", fk_task_parent"; + $sql.= ", label"; + $sql.= ", duration_effective"; + $sql.= ", fk_user_creat"; + $sql.= ", note_private"; $sql.= ") VALUES ("; - - $sql.= " ".(! isset($this->fk_projet)?'NULL':"'".$this->fk_projet."'").","; - $sql.= " ".(! isset($this->fk_task_parent)?'NULL':"'".$this->fk_task_parent."'").","; - $sql.= " ".(! isset($this->title)?'NULL':"'".$this->title."'").","; - $sql.= " ".(! isset($this->duration_effective)?'NULL':"'".$this->duration_effective."'").","; - $sql.= " ".(! isset($this->fk_user_creat)?'NULL':"'".$this->fk_user_creat."'").","; - $sql.= " ".(! isset($this->statut)?'NULL':"'".$this->statut."'").","; - $sql.= " ".(! isset($this->note)?'NULL':"'".$this->note."'").""; - - + $sql.= $this->fk_projet; + $sql.= ", ".$this->fk_task_parent; + $sql.= ", '".addslashes($this->label)."'"; + $sql.= ", ".(! isset($this->duration_effective)?'NULL':"'".$this->duration_effective."'").","; + $sql.= ", ".$user->id; + $sql.= ", '".addslashes($this->note_private)."'"; $sql.= ")"; $this->db->begin();