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

Merge pull request #14758 from aspangaro/10.0p44

Browse Source 
FIX Yogosha report 4430 (backport)
This commit is contained in:
Laurent Destailleur 2020-09-20 17:27:03 +02:00 committed by GitHub
commit 15820a6b1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/fourn/facture/rapport.php
View File

@ -45,7 +45,7 @@ if ($user->societe_id > 0)
$dir = $conf->fournisseur->facture->dir_output.'/payments'; $dir = $conf->fournisseur->facture->dir_output.'/payments';
if (! $user->rights->societe->client->voir || $socid) $dir.='/private/'.$user->id; // If user has no permission to see all, output dir is specific to user if (! $user->rights->societe->client->voir || $socid) $dir.='/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
$year = $_GET["year"]; $year = GETPOST("year", 'int');
if (! $year) { $year=date("Y"); } if (! $year) { $year=date("Y"); }
@ -67,7 +67,7 @@ if ($action == 'builddoc')
// We save charset_output to restore it because write_file can change it if needed for // We save charset_output to restore it because write_file can change it if needed for
// output format that does not support UTF8. // output format that does not support UTF8.
$sav_charset_output=$outputlangs->charset_output; $sav_charset_output=$outputlangs->charset_output;
if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0) if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0)
{ {
$outputlangs->charset_output=$sav_charset_output; $outputlangs->charset_output=$sav_charset_output;
} }
@ -77,7 +77,7 @@ if ($action == 'builddoc')
dol_print_error($db, $obj->error); dol_print_error($db, $obj->error);
} }
$year = $_POST["reyear"]; $year = GETPOST("reyear", 'int');
} }

3
htdocs/reception/stats/month.php
View File

@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
require_once DOL_DOCUMENT_ROOT.'/reception/class/receptionstats.class.php'; require_once DOL_DOCUMENT_ROOT.'/reception/class/receptionstats.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$year = GETPOST("year", 'int');
/* /*
* View * View
@ -42,7 +43,7 @@ $mesg = '';
print load_fiche_titre($langs->trans("StatisticsOfReceptions").' '.$_GET["year"], $mesg); print load_fiche_titre($langs->trans("StatisticsOfReceptions").' '.$_GET["year"], $mesg);
$stats = new ReceptionStats($db); $stats = new ReceptionStats($db);
$data = $stats->getNbReceptionByMonth($_GET["year"]); $data = $stats->getNbReceptionByMonth(GETPOST("year", 'int'));
dol_mkdir($conf->reception->dir_temp); dol_mkdir($conf->reception->dir_temp);