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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2011-12-10 11:26:34 +01:00
commit 875a493198
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/admin/expedition.php
View File

@ -58,12 +58,13 @@ if ($action == 'specimen')
//$exp->fetch_commande(); //$exp->fetch_commande();
// Charge le modele // Charge le modele
$dir = DOL_DOCUMENT_ROOT . "/core/modules/expedition/doc/"; $dir = "/core/modules/expedition/doc/";
$file = "pdf_expedition_".$modele.".modules.php"; $file = "pdf_expedition_".$modele.".modules.php";
if (file_exists($dir.$file)) $file = dol_buildpath($dir.$file);
if (file_exists($file))
{ {
$classname = "pdf_expedition_".$modele; $classname = "pdf_expedition_".$modele;
require_once($dir.$file); require_once($file);
$obj = new $classname($db); $obj = new $classname($db);

6
htdocs/core/triggers/interface_all_Demo.class.php-NORUN
View File

@ -500,7 +500,11 @@ 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 == '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); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
} }