From 08a86fa03dcc5ee4c46f9b001de3cccafed17b2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 20 Jun 2017 12:17:13 +0200
Subject: [PATCH] Start #6981
---
htdocs/commande/stats/index.php | 6 +++---
htdocs/core/lib/files.lib.php | 2 +-
htdocs/fourn/commande/list.php | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 8967e22a160..ed9f8906804 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -76,7 +76,7 @@ if ($mode == 'customer')
if ($mode == 'supplier')
{
$title=$langs->trans("OrdersStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
- $dir=$conf->fournisseur->dir_output.'/commande/temp';
+ $dir=$conf->fournisseur->commande->dir_temp;
}
llxHeader('', $title);
@@ -322,7 +322,7 @@ foreach ($data as $val)
while (! empty($year) && $oldyear > $year+1)
{ // If we have empty year
$oldyear--;
-
+
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
print '<td align="right">0</td>';
@@ -334,7 +334,7 @@ foreach ($data as $val)
print '</tr>';
}
-
+
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
print '<td align="right">'.$val['nb'].'</td>';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7f2be7f5a3d..6257bcb08db 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1912,7 +1912,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
{
if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed=1;
- $original_file=$conf->fournisseur->dir_output.'/commande/temp/'.$original_file;
+ $original_file=$conf->fournisseur->commande->dir_temp.'/'.$original_file;
}
// Wrapping pour les images des stats factures
elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 0b988e4d96b..3e3fe658155 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1111,7 +1111,7 @@ if ($resql)
// Other picto tool
print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
$filename=dol_sanitizeFileName($obj->ref);
- $filedir=$conf->fournisseur->dir_output.'/commande' . '/' . dol_sanitizeFileName($obj->ref);
+ $filedir=$conf->fournisseur->dir_output.'/commande/' . dol_sanitizeFileName($obj->ref);
print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
print '</td></tr></table>';
--
GitLab