Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
This commit is contained in:
commit
1a14c19cd2
4 changed files with 5 additions and 5 deletions
|
|
@ -813,7 +813,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
|
|||
|
||||
$newdate = GETPOST('newdate', 'alpha');
|
||||
if (empty($newdate) || strpos($newdate, 'dayevent_') != 0) {
|
||||
header("Location: ".$backtopage);
|
||||
header("Location: ".$backtopage, true, 307);
|
||||
exit;
|
||||
}
|
||||
|
||||
|
|
@ -898,7 +898,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
|
|||
}
|
||||
}
|
||||
if (!empty($backtopage)) {
|
||||
header("Location: ".$backtopage);
|
||||
header("Location: ".$backtopage, true, 307);
|
||||
exit;
|
||||
} else {
|
||||
$action = '';
|
||||
|
|
|
|||
|
|
@ -1060,7 +1060,7 @@ class Delivery extends CommonObject
|
|||
* @param int $hideref Hide ref
|
||||
* @return int 0 if KO, 1 if OK
|
||||
*/
|
||||
public function generateDocument($modele, $outputlangs = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
|
||||
public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
|
||||
{
|
||||
global $conf, $user, $langs;
|
||||
|
||||
|
|
|
|||
|
|
@ -866,7 +866,7 @@ class Entrepot extends CommonObject
|
|||
* @param int $hideref Hide ref
|
||||
* @return int 0 if KO, 1 if OK
|
||||
*/
|
||||
public function generateDocument($modele, $outputlangs = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
|
||||
public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
|
||||
{
|
||||
global $conf, $user, $langs;
|
||||
|
||||
|
|
|
|||
|
|
@ -1163,7 +1163,7 @@ class MouvementStock extends CommonObject
|
|||
* @param int $hideref Hide ref
|
||||
* @return int 0 if KO, 1 if OK
|
||||
*/
|
||||
public function generateDocument($modele, $outputlangs = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
|
||||
public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
|
||||
{
|
||||
global $conf, $user, $langs;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue