| '.$langs->trans('Model').' | ';
print '';
@@ -438,18 +461,7 @@ if ($action == 'create' && empty($mesgs))
print ' | ';
print ' |
';
// Private note
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index aa685e11ab3..9369a6341b0 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -98,7 +98,7 @@ $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MA
$object=new Facture($db);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('invoicecard'));
+$hookmanager->initHooks(array('invoicelist'));
$now=dol_now();
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index f5bdfb0d0db..d0599d75ef9 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2071,6 +2071,48 @@ class ContratLigne
return -2;
}
}
+
+ /**
+ * Load elements linked to contract (only intervention for the moment)
+ *
+ * @param User $user Objet type
+ * @return array $elements array of linked elements
+ */
+ function get_element_list($type)
+ {
+ $elements = array();
+
+ $sql = '';
+ if ($type == 'intervention')
+ $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "fichinter WHERE fk_contrat=" . $this->id;
+ if (! $sql) return -1;
+
+ //print $sql;
+ dol_syslog(get_class($this)."::get_element_list sql=" . $sql);
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $nump = $this->db->num_rows($result);
+ if ($nump)
+ {
+ $i = 0;
+ while ($i < $nump)
+ {
+ $obj = $this->db->fetch_object($result);
+ $elements[$i] = $obj->rowid;
+ $i++;
+ }
+ $this->db->free($result);
+ /* Return array */
+ return $elements;
+ }
+ }
+ else
+ {
+ dol_print_error($this->db);
+ }
+ }
+
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9f543529379..0e647baeb55 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -223,10 +223,9 @@ function dol_getprefix()
/**
* Make an include_once using default root and alternate root if it fails.
- * WARNING: In most cases, you should not use this function:
* To link to a core file, use include(DOL_DOCUMENT_ROOT.'/pathtofile')
* To link to a module file from a module file, use include './mymodulefile';
- * To link to a module file from a core file, then this function can be used
+ * To link to a module file from a core file, then this function can be used (call by hook / trigger / speciales pages)
*
* @param string $relpath Relative path to file (Ie: mydir/myfile, ../myfile, ...)
* @param string $classname Class name
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 830974f7a4b..c4ded22f591 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004 Sebastien Di Cintio