lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: management of time spent in task card

Browse Source
This commit is contained in:
Regis Houssin 2010-02-24 10:30:26 +00:00
parent d2dbbca945
commit dd06f2af7e
4 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
htdocs/includes/triggers/interface_all_Demo.class.php-NORUN
View File

@ -145,7 +145,7 @@ class InterfaceDemo
}
// Companies
elseif ($action == 'COMPANY_CREATE')
elseif ($action == 'COMPANY_CREATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
@ -352,6 +352,48 @@ class InterfaceDemo
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'CATEGORY_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
// Projects
elseif ($action == 'PROJECT_CREATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'PROJECT_UPDATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'PROJECT_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
// Project tasks
elseif ($action == 'TASK_CREATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'TASK_UPDATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'TASK_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
// Task time spent
elseif ($action == 'TASK_TIMESPENT_CREATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'TASK_TIMESPENT_UPDATE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}
elseif ($action == 'TASK_TIMESPENT_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
}

2
htdocs/langs/en_US/projects.lang
View File

@ -69,6 +69,8 @@ ConfirmReOpenAProject=Are you sure you want to re-open this project ?
ProjectContact=Project contacts
ActionsOnProject=Actions on project
YouAreNotContactOfProject=You are not a contact of this private project
DeleteATimeSpent=Delete time spent
ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader

8
htdocs/langs/fr_FR/projects.lang
View File

@ -61,14 +61,16 @@ NotOwnerOfProject=Non responsable de ce projet privé
AffectedTo=Affecté à
CantRemoveProject=Ce projet ne peut être supprimé car il est référencé par de nombreux objets (factures, commandes ou autre). voir la liste sur l'onglet Reférents.
ValidateProject=Valider projet
ConfirmValidateProject=Etes-vous sur de vouloir valider ce projet ?
ConfirmValidateProject=Etes-vous sûr de vouloir valider ce projet ?
CloseAProject=Clore projet
ConfirmCloseAProject=Etes-vous sur de vouloir clore ce projet ?
ConfirmCloseAProject=Etes-vous sûr de vouloir clore ce projet ?
ReOpenAProject=Réouvrir projet
ConfirmReOpenAProject=Etes-vous sur de vouloir rouvrir ce projet ?
ConfirmReOpenAProject=Etes-vous sûr de vouloir rouvrir ce projet ?
ProjectContact=Contacts projet
ActionsOnProject=Actions sur le projet
YouAreNotContactOfProject=Vous n'etes pas contact de ce projet privé
DeleteATimeSpent=Suppression du temps consommé
ConfirmDeleteATimeSpent=Etes-vous de vouloir supprimer ce temps consommé ?
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Chef de projet
TypeContact_project_external_PROJECTLEADER=Chef de projet

6
htdocs/projet/project.class.php
View File

@ -75,7 +75,7 @@ class Project extends CommonObject
* \param user Id utilisateur qui cree
* \return int <0 si ko, id du projet cree si ok
*/
function create($user)
function create($user, $notrigger=0)
{
// Check parameters
if (! trim($this->ref))
@ -131,7 +131,7 @@ class Project extends CommonObject
* @param unknown_type $user
* @return unknown
*/
function update($user)
function update($user, $notrigger=0)
{
// Clean parameters
$this->title = trim($this->title);
@ -326,7 +326,7 @@ class Project extends CommonObject
* \brief Supprime le projet dans la base
* \param Utilisateur
*/
function delete($user)
function delete($user, $notrigger=0)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
$sql.= " WHERE rowid=".$this->id;