Laurent Destailleur 402e6bf650 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/index.php
	htdocs/compta/paiement/list.php
	htdocs/core/modules/modCron.class.php

2017-08-04 15:39:00 +02:00

..

bank

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

2017-08-04 15:39:00 +02:00

charges

Fix translation done twice into field title of array

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

deplacement

Fix translation done twice into field title of array

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

facture

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

2017-08-02 17:56:09 +02:00

journal

Update code using new css class

2017-05-10 16:41:19 +02:00

localtax

FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes

2017-07-26 21:22:53 +02:00

paiement

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

2017-08-04 15:39:00 +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

Fix translation done twice into field title of array

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

salaries

Fix translation done twice into field title of array

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

sociales

Fix translation done twice into field title of array

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

stats

Look and feel v6

2017-07-01 14:23:24 +02:00

tva

Fix translation done twice into field title of array

2017-08-02 13:31:53 +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

Fix translation done twice into field title of array

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

recap-compta.php

Fix syntax error

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