Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
This commit is contained in:
Laurent Destailleur
2014-12-22 03:14:22 +01:00
parent 90d275bd20 e6d2bc0bff
commit 2a3bb96c34
35 changed files with 7877 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/db/sqlite.class.php
View File

@@ -535,7 +535,7 @@ class DoliDBSqlite extends DoliDB
/**
* Renvoie le code erreur generique de l'operation precedente.
*
* @return string $error_num (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
* @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
*/
function errno()
{
@@ -597,7 +597,7 @@ class DoliDBSqlite extends DoliDB
/**
* Renvoie le texte de l'erreur mysql de l'operation precedente.
*
* @return string $error_text
* @return string Error text
*/
function error()
{