Florian HENRY eca9408c91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql

2014-08-12 12:37:31 +02:00

..

bank

Fix: Too many parameter

2014-08-01 14:51:40 +02:00

charges

Merge branch 'syslog' of github.com:marcosgdf/dolibarr into

2014-07-04 13:43:50 +02:00

deplacement

Migrated old error notifications to the """new""" system

2014-07-20 01:43:46 +02:00

dons

Migrated old error notifications to the """new""" system

2014-07-20 01:43:46 +02:00

facture

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2014-08-12 12:37:31 +02:00

journal

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

localtax

Fix: Too many parameter

2014-08-01 14:51:40 +02:00

paiement

Migrated old error notifications to the """new""" system

2014-07-20 01:43:46 +02:00

payment_sc

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

prelevement

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

resultat

More substitutions

2014-06-12 11:31:53 +02:00

salaries

Deprecating arbitrary use of dol_htmloutput* functions

2014-07-20 02:32:13 +02:00

sociales

Deprecating arbitrary use of dol_htmloutput* functions

2014-07-20 02:32:13 +02:00

stats

More substitutions

2014-06-12 11:31:53 +02:00

tva

Fix: Too many parameter

2014-08-01 14:51:40 +02:00

ventilation

Removed closing php tag

2014-05-03 18:18:44 +02:00

ajaxpayment.php

Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode

2014-07-30 15:47:19 +02:00

clients.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

facture.php

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

2014-08-08 01:26:53 +02:00

hrm.php

Add label on search boxes

2014-07-11 13:26:02 +02:00

index.php

Add label on search boxes

2014-07-11 13:26:02 +02:00

paiement_charge.php

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

2014-05-06 23:58:17 +02:00

paiement.php

Fix: select_date accepts -1, '' or a date but not '0'

2014-05-25 14:51:56 +02:00

recap-compta.php

Removed closing php tag

2014-05-03 18:18:44 +02:00