diff --git a/htdocs/expedition/agenda.php b/htdocs/expedition/agenda.php index e693b599d1a..9cb65576474 100644 --- a/htdocs/expedition/agenda.php +++ b/htdocs/expedition/agenda.php @@ -27,6 +27,13 @@ // Load Dolibarr environment require '../main.inc.php'; +/** + * @var Conf $conf + * @var DoliDB $db + * @var HookManager $hookmanager + * @var Translate $langs + * @var User $user + */ require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php'; @@ -38,14 +45,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/expedition.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php'; -/** - * @var Conf $conf - * @var DoliDB $db - * @var HookManager $hookmanager - * @var Translate $langs - * @var User $user - */ - // Load translation files required by the page $langs->loadLangs(array("sendings", "other")); diff --git a/htdocs/expedition/messaging.php b/htdocs/expedition/messaging.php index d05d6066586..40d6b2b028f 100644 --- a/htdocs/expedition/messaging.php +++ b/htdocs/expedition/messaging.php @@ -22,18 +22,11 @@ /** * \file htdocs/expedition/messaging.php * \ingroup shipping - * \brief Page with events on Shipping + * \brief Page with events on Shipments */ // Load Dolibarr environment require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; -require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php'; -require_once DOL_DOCUMENT_ROOT . '/core/lib/expedition.lib.php'; -require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php'; -require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php'; - - /** * @var Conf $conf * @var DoliDB $db @@ -41,6 +34,11 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php'; * @var Translate $langs * @var User $user */ +require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/expedition.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT . '/core/lib/sendings.lib.php'; // Load translation files required by the page $langs->load("sendings"); @@ -78,7 +76,7 @@ if (GETPOST('actioncode', 'array')) { $search_rowid = GETPOST('search_rowid'); $search_agenda_label = GETPOST('search_agenda_label'); -$hookmanager->initHooks(array('shippingcardinfo')); +$hookmanager->initHooks(array('shippingcardinfo', 'globalcard')); // Security check $id = GETPOSTINT("id"); @@ -101,7 +99,7 @@ $object = new Expedition($db); if ($id > 0 || !empty($ref)) { $object->fetch($id, $ref); $object->fetch_thirdparty(); - $object->info($object->id); + //$object->info($object->id); } $parameters = array('id' => $socid);