Commit Graph

255 Commits

Author SHA1 Message Date
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
96215ccea5 Fix bad operator for and 2015-02-03 13:05:28 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
Laurent Destailleur
12ae552486 Fix: Option to make pg_dump/restore 2014-09-17 17:38:07 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/theme/eldy/graph-color.php
2014-08-15 02:28:16 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use
dol_delete_recursive
2014-08-13 12:42:55 +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
Marcos García de La Fuente
ac824728bc Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Laurent Destailleur
90a5f6c7ef Qual: Remove end php tag. 2014-07-08 01:02:30 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +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
Laurent Destailleur
ed49f88446 Fix: deleting files into backup system tools.
Fix: Dump using php not not include lock on tables that are deleted.
2014-03-31 00:19:31 +02:00
Grand Philippe
c5689b86b4 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 09:43:21 +01:00
Laurent Destailleur
469dd03673 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
Laurent Destailleur
ecb1f490ae Fix: Option drop tables was broken 2013-11-01 17:20:36 +01:00
Laurent Destailleur
60d4033e59 Fix: Option drop tables was broken 2013-11-01 17:19:25 +01:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
36c73c4798 Look: Beautify backup page. 2013-07-28 17:25:58 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
5ad1cbbfa5 Fix: Filter lost during navigation 2013-03-16 15:04:27 +01:00
Laurent Destailleur
8fe233ac9b New: Add info tip 2013-03-14 09:50:02 +01:00
Laurent Destailleur
2f3ed04023 Add info if session are encrypted 2013-01-19 17:56:26 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
6942700ce7 New: Direct jump to edit page 2013-01-14 15:18:15 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Laurent Destailleur
0cf89eac08 Doxygen 2012-09-08 02:17:08 +02:00
Laurent Destailleur
2e2f156839 Fix: title 2012-09-05 16:20:51 +02:00
Laurent Destailleur
bda132b07f Fix: [ bug #254 ] Database backup not working with complex passwords 2012-08-26 00:33:37 +02:00
Marcos García
44cc4ae949 Some strings weren't being translated
Thanks to @grandoc and I.D & L (idl-mp.com) for the french translations
2012-08-23 08:46:22 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00