diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index bfafc7b0ac9..5fc813d0f4d 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -6,6 +6,7 @@ ProjectsArea=Projects area NewProject=New project AddProject=Add project DeleteAProject=Supprimer un projet +OfficerProject=Officer project ConfirmDeleteAProject=Are you sure you want to delete this project ? LastProjects=Last %s projects AllProjects=All projects diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 14a494dd0eb..765f0c145e6 100755 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -6,6 +6,7 @@ ProjectsArea=Espace projet NewProject=Nouveau projet AddProject=Créer projet DeleteAProject=Supprimer un projet +OfficerProject=Responsable du projet ConfirmDeleteAProject=Êtes-vous sûr de vouloir supprimer ce projet ? LastProjects=Les %s derniers projets AllProjects=Tous les projets diff --git a/htdocs/project.class.php b/htdocs/project.class.php index 3886d0152ad..25a9a74c0f6 100644 --- a/htdocs/project.class.php +++ b/htdocs/project.class.php @@ -27,17 +27,20 @@ \version $Revision$ */ +require_once(DOL_DOCUMENT_ROOT ."/commonobject.class.php"); + /** \class Project \brief Classe permettant la gestion des projets */ -class Project +class Project extends CommonObject { var $id; var $db; var $ref; var $title; var $socid; + var $user_resp_id; /** * \brief Constructeur de la classe @@ -58,8 +61,9 @@ class Project { if (trim($this->ref)) { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet (ref, title, fk_soc, fk_user_creat, dateo) "; - $sql .= " VALUES ('".addslashes($this->ref)."', '".addslashes($this->title)."', $this->socid, ".$user->id.",now()) ;"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."projet (ref, title, fk_soc, fk_user_creat, fk_user_resp, dateo) "; + $sql.= " VALUES ('".addslashes($this->ref)."', '".addslashes($this->title)."'"; + $sql.= ", ".$this->socid.", ".$user->id.", ".$this->user_resp_id.", now()) ;"; if ($this->db->query($sql) ) { @@ -88,9 +92,10 @@ class Project if (strlen(trim($this->ref)) > 0) { $sql = "UPDATE ".MAIN_DB_PREFIX."projet"; - $sql .= " SET ref='$this->ref'"; - $sql .= " , title = '$this->title'"; - $sql .= " WHERE rowid = ".$this->id; + $sql.= " SET ref='".$this->ref."'"; + $sql.= ", title = '".$this->title."'"; + $sql.= ", fk_user_resp = ".$this->user_resp_id; + $sql.= " WHERE rowid = ".$this->id; if ($this->db->query($sql) ) { @@ -119,8 +124,9 @@ class Project function fetch($rowid) { - $sql = "SELECT title, ref, fk_soc FROM ".MAIN_DB_PREFIX."projet"; - $sql .= " WHERE rowid=".$rowid; + $sql = "SELECT title, ref, fk_soc, fk_user_creat, fk_user_resp, fk_statut, note"; + $sql.= " FROM ".MAIN_DB_PREFIX."projet"; + $sql.= " WHERE rowid=".$rowid; $resql = $this->db->query($sql); if ($resql) @@ -129,11 +135,15 @@ class Project { $obj = $this->db->fetch_object($resql); - $this->id = $rowid; - $this->ref = $obj->ref; - $this->title = $obj->title; - $this->titre = $obj->title; - $this->societe->id = $obj->fk_soc; + $this->id = $rowid; + $this->ref = $obj->ref; + $this->title = $obj->title; + $this->titre = $obj->title; + $this->note = $obj->note; + $this->societe->id = $obj->fk_soc; + $this->user_author_id = $obj->fk_user_creat; + $this->user_resp_id = $obj->fk_user_resp; + $this->statut = $obj->fk_statut; $this->db->free($resql); diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index 9e5aa0af001..6451ee7fca7 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -68,9 +68,10 @@ if ($projetid && !$user->rights->commercial->client->voir) if ($_POST["action"] == 'add' && $user->rights->projet->creer) { $pro = new Project($db); - $pro->socid = $_GET["socid"]; - $pro->ref = $_POST["ref"]; - $pro->title = $_POST["title"]; + $pro->socid = $_GET["socid"]; + $pro->ref = $_POST["ref"]; + $pro->title = $_POST["title"]; + $pro->user_resp_id = $_POST["officer_project"]; $result = $pro->create($user); if ($result > 0) @@ -92,9 +93,10 @@ if ($_POST["action"] == 'update' && $user->rights->projet->creer) if (!(empty($_POST["id"]) || empty($_POST["ref"]) || empty($_POST["title"]))) { $projet = new Project($db); - $projet->id = $_POST["id"]; - $projet->ref = $_POST["ref"]; - $projet->title = $_POST["title"]; + $projet->id = $_POST["id"]; + $projet->ref = $_POST["ref"]; + $projet->title = $_POST["title"]; + $projet->user_resp_id = $_POST["officer_project"]; $projet->update($user); $_GET["id"]=$projet->id; // On retourne sur la fiche projet @@ -129,6 +131,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes" && $user- llxHeader("",$langs->trans("Project"),"Projet"); +$html = new Form($db); if ($_GET["action"] == 'create' && $user->rights->projet->creer) { @@ -147,13 +150,20 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer) // Label print '
| '.$langs->trans("Ref").' | '.$projet->ref.' |
| '.$langs->trans("Label").' | '.$projet->title.' |
| '.$langs->trans("Company").' | '.$projet->societe->getNomUrl(1).' |
| '.$langs->trans("OfficerProject").' | '.$projet->user->fullname.' |