diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 217b920b8c3..ceb7cc98886 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -58,12 +58,13 @@ if ($action == 'specimen') //$exp->fetch_commande(); // Charge le modele - $dir = DOL_DOCUMENT_ROOT . "/core/modules/expedition/doc/"; + $dir = "/core/modules/expedition/doc/"; $file = "pdf_expedition_".$modele.".modules.php"; - if (file_exists($dir.$file)) + $file = dol_buildpath($dir.$file); + if (file_exists($file)) { $classname = "pdf_expedition_".$modele; - require_once($dir.$file); + require_once($file); $obj = new $classname($db); diff --git a/htdocs/core/triggers/interface_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_all_Demo.class.php-NORUN index 0c79524f3da..8c02ba961d2 100644 --- a/htdocs/core/triggers/interface_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_all_Demo.class.php-NORUN @@ -500,7 +500,11 @@ class InterfaceDemo { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); } - elseif ($action == 'SHIPPINGL_DELETE') + elseif ($action == 'SHIPPING_DELETE') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + } + elseif ($action == 'SHIPPING_BUILDDOC') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); }