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

Fix: Errors in postgreSQL support

Browse Source
This commit is contained in:
Laurent Destailleur 2009-10-26 01:22:40 +00:00
parent 96de7b0ab7
commit bf4b183bfb
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/install/etape5.php
View File

@ -179,7 +179,7 @@ if ($_POST["action"] == "set" || preg_match('/upgrade/i',$_POST["action"]))
else else
{ {
dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR); dolibarr_install_syslog('install/etape5.php FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
print '<br>'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'<br><br>'; print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
} }
} }

2
htdocs/langs/en_US/admin.lang
View File

@ -722,7 +722,7 @@ RestoreDesc3=* Restore the data, from a backup dump file, into the database of t
ForcedToByAModule = This rule is forced to <b>%s</b> by an activated module ForcedToByAModule = This rule is forced to <b>%s</b> by an activated module
PreviousDumpFiles=Available database backup dump files PreviousDumpFiles=Available database backup dump files
WeekStartOnDay=First day of week WeekStartOnDay=First day of week
RunningUpdateProcessMayBeRequired=Le lancement du processus de mise a jour semble requis (La version des programme %s differe de la version de la base %s)
##### Module password generation ##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually.

1
htdocs/langs/fr_FR/admin.lang
View File

@ -722,6 +722,7 @@ RestoreDesc3 = * Recharger depuis le fichier dump sauvegardé, la base de donné
ForcedToByAModule = Cette règle est forcée à <b>%s</b> par un des modules activés ForcedToByAModule = Cette règle est forcée à <b>%s</b> par un des modules activés
PreviousDumpFiles=Fichiers disponibles de sauvegarde de la base de donnée PreviousDumpFiles=Fichiers disponibles de sauvegarde de la base de donnée
WeekStartOnDay=Premier jour de la semaine WeekStartOnDay=Premier jour de la semaine
RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s)
##### Module password generation = undefined ##### Module password generation = undefined
PasswordGenerationStandard = Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés. PasswordGenerationStandard = Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés.

4
htdocs/lib/databases/pgsql.lib.php
View File

@ -603,7 +603,7 @@ class DoliDb
*/ */
function idate($param) function idate($param)
{ {
return adodb_strftime("%Y%m%d%H%M%S",$param); return "'".adodb_strftime("%Y-%m-%d %H:%M:%S",$param)."'";
} }
/** /**
@ -968,7 +968,7 @@ class DoliDb
*/ */
function getDefaultCollationDatabase() function getDefaultCollationDatabase()
{ {
$resql=$this->query('SHOW SERVER_ENCODING'); $resql=$this->query('SHOW LC_COLLATE');
$liste=$this->fetch_array($resql); $liste=$this->fetch_array($resql);
return $liste['lc_collate']; return $liste['lc_collate'];
} }