Regis Houssin cbd8cb8cb7 Fix: missing merge conflict

2017-09-15 17:32:49 +02:00

..

bank

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

2017-09-15 16:45:49 +02:00

charges

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

2017-08-22 18:49:40 +02:00

deplacement

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

facture

Fix: missing merge conflict

2017-09-15 17:32:49 +02:00

journal

Clean code

2017-09-05 10:16:08 +02:00

localtax

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

paiement

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

2017-09-15 16:45:49 +02:00

payment_sc

Fix var not sanitized

2017-05-16 13:27:32 +02:00

prelevement

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

resultat

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

2017-09-14 12:07:19 +02:00

salaries

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

2017-09-15 16:45:49 +02:00

sociales

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

2017-09-15 16:45:49 +02:00

stats

Standardize code

2017-09-05 09:43:22 +02:00

tva

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

2017-09-15 16:45:49 +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

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

index.php

Update index.php

2017-07-18 14:35:11 +02:00

paiement_charge.php

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

paiement.php

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

2017-09-14 12:07:19 +02:00

recap-compta.php

Fix syntax error

2017-06-08 14:55:12 +02:00