From c1b0c1f6a224c759271e02bfd472d75b2543a8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien?= Date: Mon, 5 Oct 2020 15:32:29 +0200 Subject: [PATCH] rename folder ref to Module Delivery --- htdocs/core/lib/sendings.lib.php | 6 +++--- htdocs/delivery/card.php | 4 ++-- htdocs/delivery/class/delivery.class.php | 4 ++-- htdocs/expedition/card.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 554332fe4db..45be5148612 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -56,7 +56,7 @@ function shipping_prepare_head($object) // Take first one element of array $tmp = reset($object->linkedObjectsIds['delivery']); - $head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$tmp; + $head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$tmp; $head[$h][1] = $langs->trans("DeliveryCard"); $head[$h][2] = 'delivery'; $h++; @@ -135,7 +135,7 @@ function delivery_prepare_head($object) $h++; } - $head[$h][0] = DOL_URL_ROOT."/livraison/card.php?id=".$object->id; + $head[$h][0] = DOL_URL_ROOT."/delivery/card.php?id=".$object->id; $head[$h][1] = $langs->trans("DeliveryCard"); $head[$h][2] = 'delivery'; $h++; @@ -423,7 +423,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '') // Ref print ''; print $receiving->getNomUrl($db); - //print ''.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.''; + //print ''.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.''; print ''; // Qty received //print ''; diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php index 7c796b70a97..794717aa044 100644 --- a/htdocs/delivery/card.php +++ b/htdocs/delivery/card.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/livraison/card.php + * \file htdocs/delivery/card.php * \ingroup livraison * \brief Page to describe a delivery receipt */ @@ -458,7 +458,7 @@ if ($action == 'create') // Create. Seems to no be used print '
'; print $langs->trans('IncotermLabel'); print ''; - if ($user->rights->expedition->livraison->creer) print ''.img_edit().''; + if ($user->rights->expedition->livraison->creer) print ''.img_edit().''; else print ' '; print '
'; print ''; diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php index d7bd0856e74..c226ad94083 100644 --- a/htdocs/delivery/class/delivery.class.php +++ b/htdocs/delivery/class/delivery.class.php @@ -22,7 +22,7 @@ */ /** - * \file htdocs/livraison/class/delivery.class.php + * \file htdocs/delivery/class/delivery.class.php * \ingroup delivery * \brief Delivery Order Management Class File */ @@ -725,7 +725,7 @@ class Delivery extends CommonObject $label = img_picto('', $this->picto).' '.$langs->trans("ShowReceiving").':
'; $label .= ''.$langs->trans("Status").': '.$this->ref; - $url = DOL_URL_ROOT.'/livraison/card.php?id='.$this->id; + $url = DOL_URL_ROOT.'/delivery/card.php?id='.$this->id; //if ($option !== 'nolink') //{ diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 86ec2ee5c38..2c62758e774 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -404,7 +404,7 @@ if (empty($reshook)) $result = $object->create_delivery($user); if ($result > 0) { - header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result); + header("Location: ".DOL_URL_ROOT.'/delivery/card.php?action=create_delivery&id='.$result); exit; } else { setEventMessages($object->error, $object->errors, 'errors');