lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80,762 Commits 43 Branches 150 Tags 886 MiB
af2df62aaa
Commit Graph

318 Commits

Author SHA1 Message Date
Frédéric FRANCE
375ce04076 Update mysqli.class.php 2016-06-22 09:53:02 +02:00
Laurent Destailleur
c8a8474b69 Better practice in boolean comparison 2016-05-17 23:19:57 +02:00
Laurent Destailleur
753c5c7fc4 Fix minor error management 2016-05-17 23:14:30 +02:00
Marcos García de La Fuente
257d9b2f8d NEW #4772 Removed support for Mysql deprecated driver. Please use Mysqli instead 2016-04-17 15:39:46 +02:00
Laurent Destailleur
724610ba5b Quality fixes reported by scrutinizer 2016-04-09 15:07:55 +02:00
Raphaël Doursenaud
9eff599f97 [Qual] Mysqli: constructor cannot return a value 2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
aeb3935e31 [Qual] Mysqli: escape with the proper method 2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
87762f14b5 [Qual] Mysqli: OOP style 2016-01-13 11:55:59 +01:00
Raphaël Doursenaud
daa3ce3591 [Qual] Mysqli: set charset with recommended method 2016-01-13 11:55:59 +01:00
Laurent Destailleur
c64eac5e72 Fix doc and mysql min version 2015-12-27 17:05:56 +01:00
Laurent Destailleur
484dc5937b Fix regression in sorting 2015-12-18 18:05:07 +01:00
Raphaël Doursenaud
b45d4a2a51 [Qual] OOP detection of PHP MySQL driver 2015-12-03 22:31:13 +01:00
Raphaël Doursenaud
0c5c762c1c [Qual] More robust sorting 
Only allow valid values and discard others.
Do not use user supplied data in SQL query.
 2015-12-02 21:15:59 +01:00
Laurent Destailleur
57ea4fc23d FIX sql syntax error when sort order not defined. 2015-10-13 14:40:02 +02:00
Raphaël Doursenaud
148e8a2c23 Used OOP for mysqli connector 
Better error handling
Slightly more readable codebase
 2015-09-17 20:39:48 +02:00
tomours
9267fe367e FIX #3372 - Printing issue with Postgres and dates (SQL format) 
After connecting to the database, we force datestyle to "ISO, YMD", so dates returned by the db will have a format compatible with Dolibarr functions.
This will fix dates printing issues in mostly all pages, with a postgres db configured with "SQL, DMY" as default.
 2015-08-10 15:10:58 +02:00
Laurent Destailleur
f52b5a240a Show sql query when log level is lower than LOG_DEBUG 2015-07-22 23:33:48 +02:00
Laurent Destailleur
6f90605185 Fix: Sqlite can't be supported until alter table add constraint is 
supported by sqlite, so choice is hidden
 2015-07-12 11:44:37 +02:00
Laurent Destailleur
324d855b9c Still working on project module to uniformize way of working with other 
modules
 2015-07-04 18:20:17 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Raphaël Doursenaud
c018858e91 Deprecation of the mysql driver 
Fix #2886
 2015-05-23 20:43:21 +02:00
Raphaël Doursenaud
3b9388e57f Added typehinting to resultsets in database drivers 2015-05-12 19:51:41 +02:00
Raphaël Doursenaud
6558c0f1f2 Removed a bunch of unused variables 2015-05-12 19:47:15 +02:00
Raphaël Doursenaud
3fdc4ca5e0 Better type hinting for the SQLite3 database driver 2015-05-12 19:45:14 +02:00
Raphaël Doursenaud
70d36dd1e3 Better type hinting for the SQLite database driver 2015-05-12 19:30:04 +02:00
Raphaël Doursenaud
67641280a4 Fixed parameter types 2015-05-12 19:16:29 +02:00
Raphaël Doursenaud
1fdff27184 Fixed type hintings 2015-05-12 19:11:12 +02:00
Raphaël Doursenaud
053f6ae494 [Qual] Fixed missing return statements 2015-05-12 19:10:47 +02:00
Raphaël Doursenaud
27d52cf2b0 Better type hinting for DoliDB 2015-05-12 19:01:01 +02:00
Raphaël Doursenaud
ccd14c8305 Better type hinting and code structure for the PgSQL database driver 2015-05-12 18:31:12 +02:00
Raphaël Doursenaud
4a01cf1256 Better type hinting for the Database interface 2015-05-12 18:30:16 +02:00
Raphaël Doursenaud
7231ca890a Better type hinting for the MSSQL database driver 2015-05-12 18:13:24 +02:00
Raphaël Doursenaud
6e6e63db50 Better type hinting and code structure for the MySQLi database driver 2015-05-12 17:56:01 +02:00
Raphaël Doursenaud
04f5e73557 Better type hinting for MySQL database driver 2015-05-12 17:16:46 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00:00
Laurent Destailleur
8fb14b122a Fix phpcs 2015-04-06 11:28:06 +02:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00:00
Laurent Destailleur
958667ada0 Fix phpcs 2015-03-11 12:33:34 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
ec322e2e29 Revert was not complete 2015-03-11 03:03:17 +01:00
Laurent Destailleur
4b8fa00edb Merge pull request #2422 from guedel/sqlite3-dev 
Sqlite3 dev
 2015-03-11 02:54:15 +01:00
Laurent Destailleur
52e9ae5fe4 Merge pull request #2442 from delcroip/patch-2 
FIX: jdate returning -62169955200 on x64 machine
 2015-03-11 02:35:36 +01:00
Laurent Destailleur
b564b754fc Doxygen 2015-03-10 14:09:29 +01:00
delcroix Patrick
e6984bae9d FIX: jdate returning -62169955200 on x64 machine 
on x64 machine jdate return -62169955200 instead of 0 when the input is 00-00-00 00:00:00 or equivalent
same issue for mktime https://bugs.php.net/bug.php?id=53662
 2015-03-08 12:37:07 +01:00
Scrutinizer Auto-Fixer
27e99793a3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-06 02:10:01 +00:00
Laurent Destailleur
1660c1c05b Fix bug introduced with var_dump 2015-03-06 01:30:46 +01:00
Guillaume de Lestanville
dd2594692e Updating compatibility with Sqlite3 
- Replace USING syntax by IN SELECT syntax
- Fix error on database creation
- Removing test on username parameter when installing.
 2015-03-05 17:35:37 +01:00
guillaume
0ef46b06f4 Sqlite3-PDO restoration 
FR:
- Restauration de la version PDO dans sqlite.class.php et désactivation.
- Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php

EN:
- revert of the PDO version of sqlite.class.php and deactivation.
- add database class Sqlite3 into sqlite3.class.php.
 2015-03-05 10:52:37 +01:00
guillaume
1b89b8c808 Ajout de la liste des paramètres en utilisant l'instruction PRAGMA 2015-03-03 15:22:52 +01:00
guillaume
e4edafd42a Ajout de la liste des paramètres en utilisant l'instruction PRAGMA 2015-03-03 15:21:14 +01:00
guillaume
8de170bfc2 Ajout de fonctions pour le traitement des dates avec SQLITE. 2015-03-03 13:06:20 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
guillaume
4ede9295a6 Correction de la gestion d'erreur. 2015-02-27 14:06:53 +01:00
guillaume
9839420a68 Correction de la gestion d'erreur. 2015-02-25 15:44:06 +01:00
guillaume
24b069fcb0 Utilisation de la librairie Sqlite3 et création de fonctions personnalisées pour la compatibilité avec MySQL. Certains formats de date ne sont pas complètement pris en compte. 2015-02-25 14:31:41 +01:00
guillaume
207fa671b1 Mise en place de l'initialisation de la base avec PDO SQlite 2015-02-25 09:04:11 +01:00
Laurent Destailleur
2f5c94fb4a Merge pull request #2357 from KreizIT/fix_mssql 
Fix mssql
 2015-02-18 23:32:48 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
 2015-02-15 19:51:49 +01:00
KreizIT
7d51ae6789 Fix typo 2015-02-14 16:33:05 +01:00
KreizIT
0c0c442248 Make MS SQL working 2015-02-14 16:27:00 +01:00
Laurent Destailleur
c596fa1475 Introduce a protection to avoid migration if database has critical bugs 
making data lost.
 2015-02-14 12:24:16 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Marcos García de La Fuente
a9ba2f3179 Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7 2015-02-02 11:48:57 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
d18770c1e7 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-12-26 04:16:08 +01:00
Laurent Destailleur
77e48f8c3e Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768 2014-12-26 04:12:58 +01:00
Marcos García de La Fuente
1d39c1acc2 Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script 2014-12-26 00:12:16 +01:00
Marcos García de La Fuente
f4def9ea28 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers 2014-12-26 00:07:24 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
beaec59ab6 PHPCS 2014-12-20 00:29:53 +01:00
Laurent Destailleur
df066c3741 Fix: PHPCS 2014-12-05 20:34:36 +01:00
Laurent Destailleur
5f353c39d1 Fix: PHPCS 2014-12-05 20:18:30 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
7bd27a13fa Fix: missing host and port into object 2014-10-26 19:41:06 +01:00
Laurent Destailleur
5c5f725a34 Fix scrutinizer 2014-10-05 01:22:17 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
12ae552486 Fix: Option to make pg_dump/restore 2014-09-17 17:38:07 +02:00
Laurent Destailleur
2d14e53b45 Fix: Pb with pgsql 2014-08-30 20:00:42 +02:00
Laurent Destailleur
f6be7d7930 Fix: Pb with pgsql 2014-08-30 19:58:38 +02:00
Laurent Destailleur
be6f99c10e Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/db/mysql.class.php
	htdocs/core/db/mysqli.class.php
	htdocs/core/lib/ajax.lib.php
 2014-08-17 19:34:12 +02:00
Laurent Destailleur
dd9a08120f Fix: no ' on command to create user on pgsql 2014-08-17 17:13:00 +02:00
Laurent Destailleur
b0ebaec0da Fix: Add more log and missing error message 2014-08-17 12:43:24 +02:00
Laurent Destailleur
8eac8c0c84 Avoid duplicate logs 2014-08-15 19:29:19 +02:00
Laurent Destailleur
852b78f79f Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for 
constants into database driver classes.
 2014-08-01 00:53:29 +02:00
Laurent Destailleur
9fff30416a Qual: Remove usage of getStaticMember function dir constants. 2014-07-31 20:12:21 +02:00
Laurent Destailleur
9e91baca36 Fix: Log must be done before query. 2014-07-27 23:23:29 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
74ee3e9823 Improved SQL error logging 2014-06-13 01:52:57 +02:00
Marcos García de La Fuente
2e2cecb6c7 Undefined constant 2014-06-13 01:48:11 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
d1d4c6d8a5 Increased SQL Error to LOG_ERROR level 2014-06-12 11:45:32 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Marcos García de La Fuente
ae4bd4445e Moved dol_syslog query log to the database handler and decreased report level to DEBUG 2014-06-09 15:49:54 +02:00
Laurent Destailleur
56d71f0da0 Fix: edit form 
Fix: pgsql driver
 2014-05-29 19:56:15 +02:00
Laurent Destailleur
b75dea98ee Fix: sql syntax 2014-05-29 19:46:32 +02:00
Laurent Destailleur
7a670c5bc7 Fix: pgsql driver not complete 
Conflicts:
	htdocs/core/db/pgsql.class.php
 2014-05-29 19:39:34 +02:00
Laurent Destailleur
e8ec0f524f Fix: pgsql driver not complete 2014-05-29 19:30:51 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Laurent Destailleur
300e430024 Fix: If user already exists but permissions not set, it was not possible 
to install Dolibarr.
 2014-05-23 16:13:00 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Florian HENRY
a421d9f60f Fix notice pgsql method 2014-05-13 18:54:57 +02:00
Florian HENRY
8274b49fc1 Avoid notice during PGSQL installation 
$unescapeslashquot
 2014-05-13 18:50:35 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2014-05-06 23:58:17 +02:00
Laurent Destailleur
7a452519e7 Try to fix [ bug #1363 ] Unable to update from 3.5.1 to 3.5.2 2014-05-06 22:00:54 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
abfb8b2317 Corrected Database.interface doc 2014-05-03 13:27:24 +02:00
Marcos García de La Fuente
0d129617cb Corrected Database.interface::fetch_object doc 2014-05-03 13:24:42 +02:00
Raphaël Doursenaud
98120862f7 Qual: Moved duplicate method to base method 2014-04-23 12:15:18 +02:00
Raphaël Doursenaud
16ede7c52c Qual: Moved duplicate methods to base method 2014-04-23 11:12:06 +02:00
Raphaël Doursenaud
5cbb1dd96d Qual: Removed useless method 
The method is already in the DoliDB base class
 2014-04-23 11:07:00 +02:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
104f2873da Qual: Remove code to fix dynamically bad code. 2014-03-15 22:30:40 +01:00
Raphaël Doursenaud
a23f6d6a85 Database: factorized lastqueryerror() 2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
7df97b7cfb Database: factorized lasterror() 2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
f894df1d9e Database: factorized lastquerry() 2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
e4e78bdd3e Database: factorized getLabel() 2014-03-15 08:41:43 +01:00
Raphaël Doursenaud
3f6b175879 Database: factorized getVersionArray() 2014-03-15 06:40:13 +01:00
Raphaël Doursenaud
73d957f158 Database: factorized common properties 2014-03-15 06:38:52 +01:00
Raphaël Doursenaud
f91e2ec7b2 Database: factorized begin() 2014-03-15 06:17:12 +01:00
Raphaël Doursenaud
739a566156 Database: factorized lasterrno() 2014-03-15 06:07:46 +01:00
Raphaël Doursenaud
0ab6fcaaca Database: factorized idate() 2014-03-15 06:04:16 +01:00
Raphaël Doursenaud
64fbefdb7c Database: factorized ifsql() 2014-03-15 05:55:02 +01:00
Raphaël Doursenaud
eb86abff94 Database: factorized jdate() 2014-03-15 05:54:51 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Marcos García de La Fuente
20262a0164 Fix bug #1295: Error when creating an agenda extrafield with a number as reference 2014-03-10 23:58:16 +01:00
Laurent Destailleur
32c81588b0 Fix: doxygen 2014-03-07 10:54:57 +01:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Laurent Destailleur
1790f905c9 Removed some code specific to databases and use instead correct abstract 
method of drivers.
 2014-02-25 18:25:17 +01:00
Laurent Destailleur
a797a5e665 Clean comment and make some implementations 2014-02-24 09:52:48 +01:00
Raphaël Doursenaud
0a74467296 Added FIXMEs and TODOs on all dummy methods in database drivers 2014-02-21 14:57:19 +01:00
Raphaël Doursenaud
501ffb12b3 Added dummy methods according to interface for Microsoft SQL and PostgreSQL 
Please implement if you have the required knowledge
 2014-02-21 14:52:21 +01:00
Raphaël Doursenaud
283fec164e Implemented rollback according to interface for Microsoft SQL and PostgreSQL 2014-02-21 14:40:10 +01:00
Raphaël Doursenaud
894ac6fdc0 Added missing method to mysqli class 2014-02-21 14:27:29 +01:00
Raphaël Doursenaud
ea14ca10cd Extracted mysql interface 2014-02-21 14:23:32 +01:00
Laurent Destailleur
80046a5310 Qual: Mutualize code 2014-02-06 20:40:01 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Raphaël Doursenaud
875f9d55c7 Fixed tinyint for PostgreSQL in a more generic way 2013-09-11 17:34:35 +02:00
Raphaël Doursenaud
5426db63ff Added an abstract DolibDB class 2013-09-10 12:29:55 +02:00
Raphaël Doursenaud
465d59ba82 Don't call non static class statically 2013-09-05 16:44:57 +02:00
Raphaël Doursenaud
0c0740cac7 Don't call non static class statically 2013-09-05 16:43:22 +02:00
Laurent Destailleur
696ad07871 LF 2013-06-26 16:45:42 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00