";
print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
@@ -723,7 +725,7 @@ function jsinfo()
');
fclose($fp);
}
}
@@ -766,7 +767,6 @@ function write_master_file($masterfile,$main_dir)
fputs($fp, '');
fclose($fp);
}
}
@@ -928,7 +928,6 @@ function write_conf_file($conffile)
fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
fputs($fp,"\n");
- fputs($fp, '?>');
fclose($fp);
if (file_exists("$conffile"))
diff --git a/htdocs/install/etape2.php b/htdocs/install/step2.php
similarity index 91%
rename from htdocs/install/etape2.php
rename to htdocs/install/step2.php
index 8de44812222..8f27aa53767 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/step2.php
@@ -1,7 +1,8 @@
* Copyright (C) 2004-2010 Laurent Destailleur
- * Copyright (C) 2015 Cedric GROSS
+ * Copyright (C) 2015 Cedric GROSS
+ * Copyright (C) 2015 Raphaël Doursenaud
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,8 +19,8 @@
*/
/**
- * \file htdocs/install/etape2.php
- * \ingroup install
+ * \file htdocs/install/step2.php
+ * \ingroup install
* \brief Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
*/
@@ -27,7 +28,7 @@ include 'inc.php';
require_once $dolibarr_main_document_root.'/core/class/conf.class.php';
require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
-$etape = 2;
+$step = 2;
$ok = 0;
@@ -54,7 +55,7 @@ if ($dolibarr_main_db_type == "mssql") $choix=3;
if ($dolibarr_main_db_type == "sqlite") $choix=4;
if ($dolibarr_main_db_type == "sqlite3") $choix=5;
-//if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into etape2.php page');
+//if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into step2.php page');
// Now we load forced value from install.forced.php file.
$useforcedwizard=false;
@@ -62,14 +63,14 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("--- etape2: Entering etape2.php page");
+dolibarr_install_syslog("--- step2: entering step2.php page");
/*
* View
*/
-pHeader($langs->trans("CreateDatabaseObjects"),"etape4");
+pHeader($langs->trans("CreateDatabaseObjects"),"step4");
// Test if we can run a first install process
if (! is_writable($conffile))
@@ -103,11 +104,11 @@ if ($action == "set")
{
if($db->database_selected)
{
- dolibarr_install_syslog("etape2: Connexion successful to database : ".$conf->db->name);
+ dolibarr_install_syslog("step2: successful connection to database: " . $conf->db->name);
}
else
{
- dolibarr_install_syslog("etape2: Connexion failed to database : ".$conf->db->name);
+ dolibarr_install_syslog("step2: failed connection to database :" . $conf->db->name, LOG_ERR);
print "| Failed to select database ".$conf->db->name.' |  | ';
$ok = 0 ;
}
@@ -131,7 +132,7 @@ if ($action == "set")
$requestnb=0;
// To disable some code, so you can call step2 with url like
- // http://localhost/dolibarrnew/install/etape2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
+ // http://localhost/dolibarrnew/install/step2.php?action=set&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
$createtables=isset($_GET['createtables'])?GETPOST('createtables'):1;
$createkeys=isset($_GET['createkeys'])?GETPOST('createkeys'):1;
$createfunctions=isset($_GET['createfunctions'])?GETPOST('createfunction'):1;
@@ -155,7 +156,7 @@ if ($action == "set")
$ok = 0;
$handle=opendir($dir);
- dolibarr_install_syslog("Open tables directory ".$dir." handle=".$handle,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open tables directory " . $dir . " handle=" . $handle);
$tablefound = 0;
$tabledata=array();
if (is_resource($handle))
@@ -211,7 +212,7 @@ if ($action == "set")
//print "| Creation de la table $name/td>";
$requestnb++;
- dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ dolibarr_install_syslog("step2: request: " . $buffer);
$resql=$db->query($buffer,0,'dml');
if ($resql)
{
@@ -241,7 +242,7 @@ if ($action == "set")
print " | ";
print ''.$langs->trans("Error").' Failed to open file '.$dir.$file.' | ';
$error++;
- dolibarr_install_syslog("Failed to open file ".$dir.$file,LOG_ERR);
+ dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
}
}
@@ -257,7 +258,7 @@ if ($action == "set")
else
{
print '| '.$langs->trans("ErrorFailedToFindSomeFiles",$dir).' | | ';
- dolibarr_install_syslog("Failed to find files to create database in directory ".$dir,LOG_ERR);
+ dolibarr_install_syslog("step2: failed to find files to create database in directory " . $dir, LOG_ERR);
}
}
@@ -275,7 +276,7 @@ if ($action == "set")
$okkeys = 0;
$handle=opendir($dir);
- dolibarr_install_syslog("Open keys directory ".$dir." handle=".$handle,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open keys directory " . $dir . " handle=" . $handle);
$tablefound = 0;
$tabledata=array();
if (is_resource($handle))
@@ -354,7 +355,7 @@ if ($action == "set")
//print "| Creation des cles et index de la table $name: '$buffer' | ";
$requestnb++;
- dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ dolibarr_install_syslog("step2: request: " . $buffer);
$resql=$db->query($buffer,0,'dml');
if ($resql)
{
@@ -390,7 +391,7 @@ if ($action == "set")
print "";
print ''.$langs->trans("Error")." Failed to open file ".$dir.$file." | ";
$error++;
- dolibarr_install_syslog("Failed to open file ".$dir.$file,LOG_ERR);
+ dolibarr_install_syslog("step2: failed to open file " . $dir . $file, LOG_ERR);
}
}
@@ -421,7 +422,7 @@ if ($action == "set")
if (file_exists($dir.$file))
{
$fp = fopen($dir.$file,"r");
- dolibarr_install_syslog("Open function file ".$dir.$file." handle=".$fp,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open function file " . $dir . $file . " handle=" . $fp);
if ($fp)
{
$buffer='';
@@ -444,7 +445,7 @@ if ($action == "set")
$buffer=trim($buffer);
if ($buffer)
{
- dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ dolibarr_install_syslog("step2: request: " . $buffer);
print "\n";
$resql=$db->query($buffer,0,'dml');
if ($resql)
@@ -500,7 +501,7 @@ if ($action == "set")
// Insert data
$handle=opendir($dir);
- dolibarr_install_syslog("Open directory data ".$dir." handle=".$handle,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open directory data " . $dir . " handle=" . $handle);
$tablefound = 0;
$tabledata=array();
if (is_resource($handle))
@@ -526,7 +527,7 @@ if ($action == "set")
{
$name = substr($file, 0, dol_strlen($file) - 4);
$fp = fopen($dir.$file,"r");
- dolibarr_install_syslog("Open data file ".$dir.$file." handle=".$fp,LOG_DEBUG);
+ dolibarr_install_syslog("step2: open data file " . $dir . $file . " handle=" . $fp);
if ($fp)
{
$arrayofrequests=array();
@@ -555,7 +556,7 @@ if ($action == "set")
}
fclose($fp);
- dolibarr_install_syslog("Found ".$linefound." records, defined ".count($arrayofrequests)." group(s).",LOG_DEBUG);
+ dolibarr_install_syslog("step2: found " . $linefound . " records, defined " . count($arrayofrequests) . " group(s).");
$okallfile=1;
$db->begin();
@@ -569,7 +570,7 @@ if ($action == "set")
$buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
}
- //dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
+ //dolibarr_install_syslog("step2: request: " . $buffer);
$resql=$db->query($buffer,1);
if ($resql)
{
@@ -613,7 +614,7 @@ else
print 'Parameter action=set not defined';
}
-dolibarr_install_syslog("--- install/etape2.php end", LOG_INFO);
+dolibarr_install_syslog("--- step2: end");
pFooter(!$ok,$setuplang);
diff --git a/htdocs/install/etape4.php b/htdocs/install/step4.php
similarity index 92%
rename from htdocs/install/etape4.php
rename to htdocs/install/step4.php
index fc4f47f4611..5952080f475 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/step4.php
@@ -3,6 +3,7 @@
* Copyright (C) 2004 Benoit Mortier
* Copyright (C) 2004 Sebastien DiCintio
* Copyright (C) 2004-2008 Laurent Destailleur
+ * Copyright (C) 2015 Raphaël Doursenaud
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,7 +20,7 @@
*/
/**
- * \file htdocs/install/etape4.php
+ * \file htdocs/install/step4.php
* \ingroup install
* \brief Ask login and password of Dolibarr admin user
*/
@@ -42,7 +43,7 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("--- etape4: Entering etape4.php page");
+dolibarr_install_syslog("--- step4: entering step4.php page");
$err=0;
$ok = 0;
@@ -53,7 +54,7 @@ $ok = 0;
* View
*/
-pHeader($langs->trans("AdminAccountCreation"),"etape5");
+pHeader($langs->trans("AdminAccountCreation"),"step5");
// Test if we can run a first install process
if (! is_writable($conffile))
@@ -106,7 +107,7 @@ if ($db->ok)
}
-dolibarr_install_syslog("--- install/etape4.php end", LOG_INFO);
+dolibarr_install_syslog("--- step4: end");
pFooter($err,$setuplang);
diff --git a/htdocs/install/etape5.php b/htdocs/install/step5.php
similarity index 86%
rename from htdocs/install/etape5.php
rename to htdocs/install/step5.php
index da871508176..2651c45c05c 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/step5.php
@@ -1,9 +1,10 @@
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2004 Sebastien DiCintio
- * Copyright (C) 2005-2012 Regis Houssin
+/* Copyright (C) 2004 Rodolphe Quiedeville
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2004 Benoit Mortier
+ * Copyright (C) 2004 Sebastien DiCintio
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2015 Raphaël Doursenaud
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,8 +21,8 @@
*/
/**
- * \file htdocs/install/etape5.php
- * \ingroup install
+ * \file htdocs/install/step5.php
+ * \ingroup install
* \brief Last page of upgrade or install process
*/
@@ -68,7 +69,7 @@ $forcedfile="./install.forced.php";
if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
-dolibarr_install_syslog("--- etape5: Entering etape5.php page", LOG_INFO);
+dolibarr_install_syslog("--- step5: entering step5.php page");
/*
@@ -80,19 +81,19 @@ if ($action == "set")
{
if ($_POST["pass"] <> $_POST["pass_verif"])
{
- header("Location: etape4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+ header("Location: step4.php?error=1&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit;
}
if (dol_strlen(trim($_POST["pass"])) == 0)
{
- header("Location: etape4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+ header("Location: step4.php?error=2&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit;
}
if (dol_strlen(trim($_POST["login"])) == 0)
{
- header("Location: etape4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
+ header("Location: step4.php?error=3&selectlang=$setuplang".(isset($_POST["login"])?'&login='.$_POST["login"]:''));
exit;
}
}
@@ -102,7 +103,7 @@ if ($action == "set")
* View
*/
-pHeader($langs->trans("SetupEnd"),"etape5");
+pHeader($langs->trans("SetupEnd"),"step5");
print '
';
// Test if we can run a first install process
@@ -153,7 +154,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
// Active module user
$modName='modUser';
$file = $modName . ".class.php";
- dolibarr_install_syslog('install/etape5.php Load module user '.DOL_DOCUMENT_ROOT ."/core/modules/".$file, LOG_INFO);
+ dolibarr_install_syslog('step5: load module user ' . DOL_DOCUMENT_ROOT . "/core/modules/" . $file, LOG_INFO);
include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file;
$objMod = new $modName($db);
$result=$objMod->init();
@@ -188,13 +189,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
{
if ($newuser->error == 'ErrorLoginAlreadyExists')
{
- dolibarr_install_syslog('install/etape5.php AdminLoginAlreadyExists', LOG_WARNING);
+ dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
print '
'.$langs->trans("AdminLoginAlreadyExists",$_POST["login"])."
";
$success = 1;
}
else
{
- dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
+ dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR);
print '
'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'
';
}
}
@@ -203,7 +204,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
{
$db->begin();
- dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);
+ dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
if (! $resql) dol_print_error($db,'Error in setup program');
$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)");
@@ -212,7 +213,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
if ($useforcedwizard)
{
- dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
+ dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
if (! $resql) dol_print_error($db,'Error in setup program');
$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING',1).",".$db->encrypt(1,1).",'chaine',1,'Disable install warnings',0)");
@@ -232,7 +233,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
print $langs->trans("ActivateModule",$modtoactivatenew).'
';
$file=$modtoactivatenew.'.class.php';
- dolibarr_install_syslog('install/etape5.php Activate module file='.$file);
+ dolibarr_install_syslog('step5: activate module file=' . $file);
$res=dol_include_once("/core/modules/".$file);
$res=activateModule($modtoactivatenew,1);
@@ -240,7 +241,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
}
}
- dolibarr_install_syslog('install/etape5.php Remove MAIN_NOT_INSTALLED const', LOG_DEBUG);
+ dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
if (! $resql) dol_print_error($db,'Error in setup program');
@@ -271,7 +272,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
if ($tagdatabase)
{
- dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion, LOG_DEBUG);
+ dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion);
$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
if (! $resql) dol_print_error($db,'Error in setup program');
$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version for last upgrade',0)");
@@ -280,7 +281,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
}
else
{
- dolibarr_install_syslog('install/etape5.php We run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.', LOG_DEBUG);
+ dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
}
}
else
@@ -290,7 +291,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$action))
}
else
{
- dol_print_error('','install/etape5.php Unknown choice of action');
+ dol_print_error('','step5.php: unknown choice of action');
}
// May fail if parameter already defined
@@ -404,7 +405,7 @@ elseif (empty($action) || preg_match('/upgrade/i',$action))
}
else
{
- dol_print_error('','install/etape5.php Unknown choice of action');
+ dol_print_error('','step5.php: unknown choice of action');
}
@@ -413,6 +414,6 @@ else
clearstatcache();
-dolibarr_install_syslog("--- install/etape5.php Dolibarr setup finished", LOG_INFO);
+dolibarr_install_syslog("--- step5: Dolibarr setup finished");
pFooter(1,$setuplang);
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 9c2832f3623..7c9cc7fd325 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville
* Copyright (C) 2004-2010 Laurent Destailleur
* Copyright (C) 2005-2010 Regis Houssin
+ * Copyright (C) 2015 Raphaël Doursenaud
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -41,7 +42,7 @@ require_once $conffile; if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_t
require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
$grant_query='';
-$etape = 2;
+$step = 2;
$ok = 0;
@@ -70,8 +71,8 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
if ($dolibarr_main_db_type == "mssql") $choix=3;
-dolibarr_install_syslog("upgrade: Entering upgrade.php page");
-if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- upgrade: Entering upgrade.php page");
+if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
/*
@@ -145,13 +146,13 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
print '| ';
print $langs->trans("ServerConnection")." : $dolibarr_main_db_host | ".$langs->trans("OK")." | \n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerConnection") . ": $dolibarr_main_db_host " . $langs->transnoentities("OK"));
$ok = 1;
}
else
{
print "| ".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)." | ".$langs->transnoentities("Error")." | \n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok = 0;
}
@@ -161,13 +162,13 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
print '| ';
print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name." | ".$langs->trans("OK")." | \n";
- dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name");
+ dolibarr_install_syslog("upgrade: Database connection successful: " . $dolibarr_main_db_name);
$ok=1;
}
else
{
print "| ".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)." | ".$langs->trans("Error")." | \n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
$ok=0;
}
}
@@ -179,7 +180,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
$versionarray=$db->getVersionArray();
print '| '.$langs->trans("ServerVersion").' | ';
print ''.$version.' | ';
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion")." : $version");
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ServerVersion") . ": " .$version);
// Test database version requirement
$versionmindb=$db::VERSIONMIN;
@@ -189,7 +190,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
// Warning: database version too low.
print "| ".$langs->trans("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb))." | ".$langs->trans("Error")." | \n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionTooLow",join('.',$versionarray),join('.',$versionmindb)));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionTooLow", join('.', $versionarray), join('.', $versionmindb)));
$ok=0;
}
@@ -216,7 +217,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
// Warning: database version too low.
print ''.$langs->trans("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)." | ".$langs->trans("Error")." | \n";
- dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion));
+ dolibarr_install_syslog("upgrade: " . $langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration", join('.', $versionarray), $listofforbiddenversion));
$ok=0;
break;
}
@@ -246,7 +247,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
$filles=array();
$sql = "SELECT fk_categorie_mere, fk_categorie_fille";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
- dolibarr_install_syslog("upgrade: search duplicate", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade: search duplicate");
$resql = $db->query($sql);
if ($resql)
{
@@ -263,7 +264,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
}
}
- dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
+ dolibarr_install_syslog("upgrade: result is num=" . $num . " count(couples)=" . count($couples));
// If there is duplicates couples or child with two parents
if (count($couples) > 0 && $num > count($couples))
@@ -274,7 +275,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
// We delete all
$sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
- dolibarr_install_syslog("upgrade: delete association", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade: delete association");
$resqld=$db->query($sql);
if ($resqld)
{
@@ -283,7 +284,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
$sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
$sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
- dolibarr_install_syslog("upgrade: insert association", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade: insert association");
$resqli=$db->query($sql);
if (! $resqli) $error++;
}
@@ -481,6 +482,7 @@ $ret=0;
if (! $ok && isset($argv[1])) $ret=1;
dol_syslog("Exit ".$ret);
+dolibarr_install_syslog("--- upgrade: end");
pFooter(((! $ok && empty($_GET["ignoreerrors"])) || $dirmodule),$setuplang);
if ($db->connected) $db->close();
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 7b5f299d758..214a6c54fbf 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3,6 +3,7 @@
* Copyright (C) 2005-2012 Laurent Destailleur
* Copyright (C) 2005-2011 Regis Houssin
* Copyright (C) 2010 Juanjo Menent
+ * Copyright (C) 2015 Raphaël Doursenaud
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -47,7 +48,7 @@ require_once $dolibarr_main_document_root . '/core/class/menubase.class.php';
require_once $dolibarr_main_document_root . '/core/lib/files.lib.php';
$grant_query='';
-$etape = 2;
+$step = 2;
$error = 0;
@@ -74,8 +75,8 @@ if ($dolibarr_main_db_type == 'pgsql') $choix=2;
if ($dolibarr_main_db_type == 'mssql') $choix=3;
-dolibarr_install_syslog("upgrade2: Entering upgrade2.php page");
-if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("--- upgrade2: entering upgrade2.php page");
+if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized", LOG_ERR);
@@ -98,7 +99,7 @@ if (! $versionfrom && ! $versionto)
exit;
}
-pHeader('','etape5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('','step5',GETPOST("action")?GETPOST("action"):'upgrade','versionfrom='.$versionfrom.'&versionto='.$versionto);
if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
@@ -137,7 +138,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
if (!$db->connected)
{
print '| '.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).' | '.$langs->trans('Error').' | ';
- dolibarr_install_syslog('upgrade2: Failed to connect to database : '.$conf->db->name.' on '.$conf->db->host.' for user '.$conf->db->user, LOG_ERR);
+ dolibarr_install_syslog('upgrade2: failed to connect to database :' . $conf->db->name . ' on ' . $conf->db->host . ' for user ' . $conf->db->user, LOG_ERR);
$error++;
}
@@ -145,7 +146,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
{
if($db->database_selected)
{
- dolibarr_install_syslog('upgrade2: Database connection successfull : '.$dolibarr_main_db_name);
+ dolibarr_install_syslog('upgrade2: database connection successful :' . $dolibarr_main_db_name);
}
else
{
@@ -421,6 +422,7 @@ $ret=0;
if ($error && isset($argv[1])) $ret=1;
dol_syslog("Exit ".$ret);
+dolibarr_install_syslog("--- upgrade2: end");
pFooter($error,$setuplang);
if ($db->connected) $db->close();
@@ -455,7 +457,7 @@ function migrate_paiements($db,$langs,$conf)
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_paiements", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiements");
if ($resql)
{
$i = 0;
@@ -555,7 +557,7 @@ function migrate_paiements_orphelins_1($db,$langs,$conf)
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_1");
$row = array();
if ($resql)
{
@@ -681,7 +683,7 @@ function migrate_paiements_orphelins_2($db,$langs,$conf)
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiements_orphelins_2");
$row = array();
if ($resql)
{
@@ -821,7 +823,7 @@ function migrate_contracts_det($db,$langs,$conf)
$sql.= " WHERE cd.rowid IS NULL AND p.rowid IS NOT NULL";
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_contracts_det", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_det");
if ($resql)
{
$i = 0;
@@ -917,7 +919,7 @@ function migrate_links_transfert($db,$langs,$conf)
$sql.= " AND bu.fk_bank IS NULL";
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_links_transfert", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_links_transfert");
if ($resql)
{
$i = 0;
@@ -941,7 +943,7 @@ function migrate_links_transfert($db,$langs,$conf)
$sql.= ")";
print $sql.'
';
- dolibarr_install_syslog("migrate_links_transfert", LOG_DEBUG);
+ dolibarr_install_syslog("migrate_links_transfert");
if (! $db->query($sql))
{
@@ -992,7 +994,7 @@ function migrate_contracts_date1($db,$langs,$conf)
print ''.$langs->trans('MigrationContractsEmptyDatesUpdate')."
\n";
$sql="update llx_contrat set date_contrat=tms where date_contrat is null";
- dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0)
@@ -1001,7 +1003,7 @@ function migrate_contracts_date1($db,$langs,$conf)
print $langs->trans('MigrationContractsEmptyDatesNothingToUpdate')."
\n";
$sql="update llx_contrat set datec=tms where datec is null";
- dolibarr_install_syslog("upgrade2::migrate_contracts_date1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date1");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0)
@@ -1031,7 +1033,7 @@ function migrate_contracts_date2($db,$langs,$conf)
$sql.= " GROUP BY c.rowid, c.date_contrat";
$resql = $db->query($sql);
- dolibarr_install_syslog("upgrade2::migrate_contracts_date2", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date2");
if ($resql)
{
$i = 0;
@@ -1092,7 +1094,7 @@ function migrate_contracts_date3($db,$langs,$conf)
print ''.$langs->trans('MigrationContractsIncoherentCreationDateUpdate')."
\n";
$sql="update llx_contrat set datec=date_contrat where datec is null or datec > date_contrat";
- dolibarr_install_syslog("upgrade2::migrate_contracts_date3", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_date3");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0)
@@ -1120,7 +1122,7 @@ function migrate_contracts_open($db,$langs,$conf)
$sql = "SELECT c.rowid as cref FROM llx_contrat as c, llx_contratdet as cd";
$sql.= " WHERE cd.statut = 4 AND c.statut=2 AND c.rowid=cd.fk_contrat";
- dolibarr_install_syslog("upgrade2::migrate_contracts_open", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_contracts_open");
$resql = $db->query($sql);
if (! $resql) dol_print_error($db);
if ($db->affected_rows($resql) > 0) {
@@ -1190,7 +1192,7 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf)
$select_sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn';
$select_sql.= ' WHERE fk_facture_fourn IS NOT NULL';
- dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_paiementfourn_facturefourn");
$select_resql = $db->query($select_sql);
if ($select_resql)
{
@@ -1306,7 +1308,7 @@ function migrate_price_facture($db,$langs,$conf)
$sql.= " AND (((fd.total_ttc = 0 AND fd.remise_percent != 100) or fd.total_ttc IS NULL) or f.total_ttc IS NULL)";
//print $sql;
- dolibarr_install_syslog("upgrade2::migrate_price_facture", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_facture");
$resql=$db->query($sql);
if ($resql)
{
@@ -1340,7 +1342,7 @@ function migrate_price_facture($db,$langs,$conf)
$facligne->total_tva = $total_tva;
$facligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: facid=$obj->facid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+ dolibarr_install_syslog("upgrade2: line " . $rowid . ": facid=" . $obj->facid . " pu=" . $pu ." qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
print ". ";
$facligne->update_total();
@@ -1419,7 +1421,7 @@ function migrate_price_propal($db,$langs,$conf)
$sql.= " WHERE pd.fk_propal = p.rowid";
$sql.= " AND ((pd.total_ttc = 0 AND pd.remise_percent != 100) or pd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_propal", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_propal");
$resql=$db->query($sql);
if ($resql)
{
@@ -1452,7 +1454,7 @@ function migrate_price_propal($db,$langs,$conf)
$propalligne->total_tva = $total_tva;
$propalligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: propalid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+ dolibarr_install_syslog("upgrade2: Line " . $rowid . ": propalid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva. ", " . $total_ttc);
print ". ";
$propalligne->update_total();
@@ -1528,7 +1530,7 @@ function migrate_price_contrat($db,$langs,$conf)
$sql.= " WHERE cd.fk_contrat = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100 AND cd.subprice > 0) or cd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_contrat", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_contrat");
$resql=$db->query($sql);
if ($resql)
{
@@ -1561,7 +1563,7 @@ function migrate_price_contrat($db,$langs,$conf)
$contratligne->total_tva = $total_tva;
$contratligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: contratdetid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent -> $total_ht, $total_tva, $total_ttc");
+ dolibarr_install_syslog("upgrade2: Line " . $rowid . ": contratdetid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent. " -> " . $total_ht . ", " . $total_tva. " , " . $total_ttc);
print ". ";
$contratligne->update_total();
@@ -1613,7 +1615,7 @@ function migrate_price_commande($db,$langs,$conf)
$sql.= " WHERE cd.fk_commande = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_commande", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_commande");
$resql=$db->query($sql);
if ($resql)
{
@@ -1646,7 +1648,7 @@ function migrate_price_commande($db,$langs,$conf)
$commandeligne->total_tva = $total_tva;
$commandeligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+ dolibarr_install_syslog("upgrade2: Line " . $rowid . " : commandeid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global. " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
print ". ";
$commandeligne->update_total();
@@ -1727,7 +1729,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
$sql.= " WHERE cd.fk_commande = c.rowid";
$sql.= " AND ((cd.total_ttc = 0 AND cd.remise_percent != 100) or cd.total_ttc IS NULL)";
- dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_price_commande_fournisseur");
$resql=$db->query($sql);
if ($resql)
{
@@ -1760,7 +1762,7 @@ function migrate_price_commande_fournisseur($db,$langs,$conf)
$commandeligne->total_tva = $total_tva;
$commandeligne->total_ttc = $total_ttc;
- dolibarr_install_syslog("upgrade2: Line $rowid: commandeid=$obj->rowid pu=$pu qty=$qty vatrate=$vatrate remise_percent=$remise_percent remise_global=$remise_percent_global -> $total_ht, $total_tva, $total_ttc");
+ dolibarr_install_syslog("upgrade2: Line " . $rowid . ": commandeid=" . $obj->rowid . " pu=" . $pu . " qty=" . $qty . " vatrate=" . $vatrate . " remise_percent=" . $remise_percent . " remise_global=" . $remise_percent_global . " -> " . $total_ht . ", " . $total_tva . ", " . $total_ttc);
print ". ";
$commandeligne->update_total();
@@ -2448,7 +2450,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
$sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
$sql.= " WHERE t1.rowid = t2.".$field2.")";
- dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 1", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 1");
$resql = $db->query($sql);
if ($resql)
{
@@ -2514,7 +2516,7 @@ function migrate_restore_missing_links($db,$langs,$conf)
$sql.= " (SELECT t2.rowid FROM ".MAIN_DB_PREFIX.$table2." as t2";
$sql.= " WHERE t1.rowid = t2.".$field2.")";
- dolibarr_install_syslog("upgrade2:migrate_restore_missing_links DIRECTION 2", LOG_DEBUG);
+ dolibarr_install_syslog("upgrade2::migrate_restore_missing_links DIRECTION 2");
$resql = $db->query($sql);
if ($resql)
{
@@ -2779,7 +2781,7 @@ function migrate_relationship_tables($db,$langs,$conf,$table,$fk_source,$sourcet
if ($db->DDLInfoTable(MAIN_DB_PREFIX.$table))
{
- dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = ".MAIN_DB_PREFIX.$table);
+ dolibarr_install_syslog("upgrade2::migrate_relationship_tables table = " . MAIN_DB_PREFIX . $table);
$db->begin();
@@ -3304,7 +3306,7 @@ function migrate_actioncomm_element($db,$langs,$conf)
$obj = $db->fetch_object($result);
if ($obj)
{
- dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=".$field);
+ dolibarr_install_syslog("upgrade2::migrate_actioncomm_element field=" . $field);
$db->begin();
@@ -3367,7 +3369,7 @@ function migrate_mode_reglement($db,$langs,$conf)
{
$error=0;
- dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=".$elements['code'][$key]);
+ dolibarr_install_syslog("upgrade2::migrate_mode_reglement code=" . $elements['code'][$key]);
$sqlSelect = "SELECT id";
$sqlSelect.= " FROM ".MAIN_DB_PREFIX."c_paiement";
@@ -3624,7 +3626,7 @@ function migrate_directories($db,$langs,$conf,$oldname,$newname)
if (is_dir(DOL_DATA_ROOT.$oldname) && ! file_exists(DOL_DATA_ROOT.$newname))
{
- dolibarr_install_syslog("upgrade2::migrate_directories move ".DOL_DATA_ROOT.$oldname.' into '.DOL_DATA_ROOT.$newname);
+ dolibarr_install_syslog("upgrade2::migrate_directories move " . DOL_DATA_ROOT . $oldname . ' into ' . DOL_DATA_ROOT . $newname);
@rename(DOL_DATA_ROOT.$oldname,DOL_DATA_ROOT.$newname);
}
}
@@ -3774,7 +3776,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
if ($moduletoreload == 'MAIN_MODULE_AGENDA')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Agenda");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Agenda module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modAgenda.class.php';
if ($res) {
$mod=new modAgenda($db);
@@ -3784,7 +3786,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_BARCODE')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Barcode");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
if ($res) {
$mod=new modBarcode($db);
@@ -3794,7 +3796,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_CRON')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Cron");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
if ($res) {
$mod=new modCron($db);
@@ -3804,7 +3806,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_SOCIETE')
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Societe");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
if ($res) {
$mod=new modSociete($db);
@@ -3814,7 +3816,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_PRODUIT') // Permission has changed into 2.7
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Produit");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
if ($res) {
$mod=new modProduct($db);
@@ -3824,7 +3826,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_SERVICE') // Permission has changed into 2.7
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
if ($res) {
@@ -3835,7 +3837,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_COMMANDE') // Permission has changed into 2.9
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
if ($res) {
@@ -3846,7 +3848,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_FACTURE') // Permission has changed into 2.9
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
if ($res) {
$mod=new modFacture($db);
@@ -3856,7 +3858,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR') // Permission has changed into 2.9
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Fournisseur");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
if ($res) {
$mod=new modFournisseur($db);
@@ -3866,7 +3868,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Deplacement");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
if ($res) {
$mod=new modDeplacement($db);
@@ -3876,7 +3878,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_DON') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Don");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
if ($res) {
$mod=new modDon($db);
@@ -3886,7 +3888,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_ECM') // Permission has changed into 3.0 and 3.1
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
if ($res) {
$mod=new modECM($db);
@@ -3896,7 +3898,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_PAYBOX') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Paybox");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
if ($res) {
$mod=new modPaybox($db);
@@ -3906,7 +3908,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_OPENSURVEY') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Opensurvey");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
if ($res) {
$mod=new modOpenSurvey($db);
@@ -3916,7 +3918,7 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
}
if ($moduletoreload == 'MAIN_MODULE_USER') // Permission has changed into 3.0
{
- dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module User");
+ dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate User module");
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modUser.class.php';
if ($res) {
$mod=new modUser($db);
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index c119a002641..c63ce9f1ddf 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 5eb4549f0fa..a7b39cd5f34 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -69,7 +69,7 @@ function llxHeaderPaypal($title, $head = "")
// JQuery. Must be before other includes
print ''."\n";
- print ''."\n";
+ print ''."\n";
// jQuery jnotify
if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY))
{
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 698046cf708..77d92e5d8eb 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -30,14 +30,14 @@ if (empty($usedolheader))
Test page
-
+
" />
-
+
|