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

rename folder ref to Module Delivery

Browse Source
This commit is contained in:
Aurélien 2020-10-05 15:32:29 +02:00
parent bdd095f6bb
commit c1b0c1f6a2
No known key found for this signature in database
GPG Key ID: 296611B615F8FDF3
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/sendings.lib.php
View File

@ -56,7 +56,7 @@ function shipping_prepare_head($object)
// Take first one element of array // Take first one element of array
$tmp = reset($object->linkedObjectsIds['delivery']); $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][1] = $langs->trans("DeliveryCard");
$head[$h][2] = 'delivery'; $head[$h][2] = 'delivery';
$h++; $h++;
@ -135,7 +135,7 @@ function delivery_prepare_head($object)
$h++; $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][1] = $langs->trans("DeliveryCard");
$head[$h][2] = 'delivery'; $head[$h][2] = 'delivery';
$h++; $h++;
@ -423,7 +423,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
// Ref // Ref
print '<td>'; print '<td>';
print $receiving->getNomUrl($db); print $receiving->getNomUrl($db);
//print '<a href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>'; //print '<a href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$livraison_id.'">'.img_object($langs->trans("ShowReceiving"),'sending').' '.$objp->livraison_ref.'<a>';
print '</td>'; print '</td>';
// Qty received // Qty received
//print '<td class="center">'; //print '<td class="center">';

4
htdocs/delivery/card.php
View File

@ -22,7 +22,7 @@
*/ */
/** /**
* \file htdocs/livraison/card.php * \file htdocs/delivery/card.php
* \ingroup livraison * \ingroup livraison
* \brief Page to describe a delivery receipt * \brief Page to describe a delivery receipt
*/ */
@ -458,7 +458,7 @@ if ($action == 'create') // Create. Seems to no be used
print '<table width="100%" class="nobordernopadding"><tr><td>'; print '<table width="100%" class="nobordernopadding"><tr><td>';
print $langs->trans('IncotermLabel'); print $langs->trans('IncotermLabel');
print '<td><td class="right">'; print '<td><td class="right">';
if ($user->rights->expedition->livraison->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/livraison/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>'; if ($user->rights->expedition->livraison->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
else print '&nbsp;'; else print '&nbsp;';
print '</td></tr></table>'; print '</td></tr></table>';
print '</td>'; print '</td>';

4
htdocs/delivery/class/delivery.class.php
View File

@ -22,7 +22,7 @@
*/ */
/** /**
* \file htdocs/livraison/class/delivery.class.php * \file htdocs/delivery/class/delivery.class.php
* \ingroup delivery * \ingroup delivery
* \brief Delivery Order Management Class File * \brief Delivery Order Management Class File
*/ */
@ -725,7 +725,7 @@ class Delivery extends CommonObject
$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowReceiving").'</u>:<br>'; $label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowReceiving").'</u>:<br>';
$label .= '<b>'.$langs->trans("Status").'</b>: '.$this->ref; $label .= '<b>'.$langs->trans("Status").'</b>: '.$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') //if ($option !== 'nolink')
//{ //{

2
htdocs/expedition/card.php
View File

@ -404,7 +404,7 @@ if (empty($reshook))
$result = $object->create_delivery($user); $result = $object->create_delivery($user);
if ($result > 0) 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; exit;
} else { } else {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');