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

develop

Conflicts:
	ChangeLog
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/resultat/index.php

2014-09-16 21:09:53 +02:00

..

bank

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

2014-09-15 22:58:39 +02:00

charges

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

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

deplacement

Fix: Missing status "refunded".

2014-09-06 17:16:24 +02:00

dons

Add Dunning into compta report

2014-09-16 21:05:57 +02:00

facture

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

2014-09-15 22:58:39 +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

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

2014-09-15 22:58:39 +02:00

resultat

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

2014-09-16 21:09:53 +02:00

salaries

Payment Salaries :: Add field required & control on it

2014-09-03 21:48:15 +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

Payment VAT :: Add control on field required

2014-09-03 21:47:46 +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

Fix: Trigger error not reported

2014-09-15 11:48:50 +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

trigger on total

2014-08-12 11:40:24 +02:00

recap-compta.php

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

2014-09-13 19:10:05 +02:00