Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: management of time spent in task card

Browse Source
This commit is contained in:
Regis Houssin
2010-02-24 10:57:37 +00:00
parent ca30725757
commit 04cd6e919a
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/categorie.class.php
View File

@@ -248,7 +248,7 @@ class Categorie
// Appel des triggers // Appel des triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php"); include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db); $interface=new Interfaces($this->db);
$result=$interface->run_triggers('CATEGORY_UPDATE',$this,$user,$langs,$conf); $result=$interface->run_triggers('CATEGORY_MODIFY',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; } if ($result < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers // Fin appel triggers

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

@@ -347,7 +347,7 @@ class InterfaceDemo
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
elseif ($action == 'CATEGORY_UPDATE') elseif ($action == 'CATEGORY_MODIFY')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
@@ -361,7 +361,7 @@ class InterfaceDemo
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
elseif ($action == 'PROJECT_UPDATE') elseif ($action == 'PROJECT_MODIFY')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
@@ -375,7 +375,7 @@ class InterfaceDemo
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
elseif ($action == 'TASK_UPDATE') elseif ($action == 'TASK_MODIFY')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
@@ -389,7 +389,7 @@ class InterfaceDemo
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }
elseif ($action == 'TASK_TIMESPENT_UPDATE') elseif ($action == 'TASK_TIMESPENT_MODIFY')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }

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

@@ -113,6 +113,16 @@ class Project extends CommonObject
{ {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet"); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet");
$result = $this->id; $result = $this->id;
if (! $notrigger)
{
// Call triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('PROJECT_CREATE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// End call triggers
}
} }
else else
{ {
@@ -154,6 +164,16 @@ class Project extends CommonObject
dol_syslog("Project::Update sql=".$sql,LOG_DEBUG); dol_syslog("Project::Update sql=".$sql,LOG_DEBUG);
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {
if (! $notrigger)
{
// Call triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('PROJECT_MODIFY',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// End call triggers
}
$result = 0; $result = 0;
} }
else else
@@ -326,7 +346,7 @@ class Project extends CommonObject
* \brief Supprime le projet dans la base * \brief Supprime le projet dans la base
* \param Utilisateur * \param Utilisateur
*/ */
function delete($user) function delete($user, $notrigger=0)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
@@ -335,6 +355,16 @@ class Project extends CommonObject
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
if (! $notrigger)
{
// Call triggers
include_once(DOL_DOCUMENT_ROOT . "/interfaces.class.php");
$interface=new Interfaces($this->db);
$result=$interface->run_triggers('PROJECT_DELETE',$this,$user,$langs,$conf);
if ($result < 0) { $error++; $this->errors=$interface->errors; }
// End call triggers
}
return 1; return 1;
} }
else else