| '.$langs->trans("DateActionStart").' | ';
if (! $object->fulldayevent) print dol_print_date($object->datep,'dayhour');
else print dol_print_date($object->datep,'day');
if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
print ' | ';
- print ''."\n";
+ print ' | '."\n";
print ' |
';
// Location
- print '| '.$langs->trans("ActionAffectedTo").' | ';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1059d1af07d..82d838a30c8 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2035,6 +2035,8 @@ abstract class CommonObject
*/
function setStatut($status,$elementId='',$elementType='')
{
+ global $user,$langs,$conf;
+
$elementId = (!empty($elementId)?$elementId:$this->id);
$elementTable = (!empty($elementType)?$elementType:$this->table_element);
@@ -2050,9 +2052,36 @@ abstract class CommonObject
dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
if ($this->db->query($sql))
{
- $this->db->commit();
- $this->statut = $status;
- return 1;
+ if (! $error)
+ {
+ $trigkey='';
+ if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFYBILLED';
+
+ if ($trigkey)
+ {
+ // Appel des triggers
+ include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ $interface=new Interfaces($this->db);
+ $result=$interface->run_triggers($trigkey,$this,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++; $this->errors=$interface->errors;
+ }
+ // Fin appel triggers
+ }
+ }
+
+ if (! $error)
+ {
+ $this->db->commit();
+ $this->statut = $status;
+ return 1;
+ }
+ else
+ {
+ $this->db->rollback();
+ dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR);
+ return -1;
+ }
}
else
{
@@ -2133,8 +2162,10 @@ abstract class CommonObject
* @param array $optionsArray Array resulting of call of extrafields->fetch_name_optionals_label()
* @return int <0 if error, 0 if no optionals to find nor found, 1 if a line is found and optional loaded
*/
- function fetch_optionals($rowid,$optionsArray='')
+ function fetch_optionals($rowid='',$optionsArray='')
{
+ if (empty($rowid)) $rowid=$this->id;
+
if (! is_array($optionsArray))
{
// optionsArray not already loaded, so we load it
@@ -2143,7 +2174,6 @@ abstract class CommonObject
$optionsArray = $extrafields->fetch_name_optionals_label($this->table_element);
}
-
// Request to get complementary values
if (count($optionsArray) > 0)
{
@@ -2170,7 +2200,7 @@ abstract class CommonObject
if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
{
// we can add this attribute to adherent object
- $this->array_options["options_$key"]=$value;
+ $this->array_options["options_".$key]=$value;
}
}
}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index d5d16efc2e9..a25115be878 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -514,7 +514,7 @@ class ExtraFields
/**
- * Load array this->attribute_label
+ * Load array this->attribute_xxx like attribute_label, attribute_type, ...
*
* @param string $elementtype Type of element ('adherent', 'commande', societe', 'facture', 'propal', 'product', ...)
* @param boolean $forceload Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 50a9cced421..e441dbe5e96 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -60,7 +60,9 @@ class Interfaces
// Check parameters
if (! is_object($object) || ! is_object($conf)) // Error
{
- dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_ERR);
+ $this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+ dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
+ $this->errors[]=$this->error;
return -1;
}
if (! is_object($user) || ! is_object($langs)) // Warning
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 35849720e7d..fda7aa00832 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -60,9 +60,13 @@ $userstatic=new User($db);
-
-
+
-
+
-
+
|