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

Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql

2017-09-01 17:34:57 +02:00

..

bank

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

2017-09-01 17:34:57 +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-09-01 17:34:57 +02:00

journal

Uniformize code of accounting report

2017-08-31 15:44:36 +02:00

localtax

Uniformize code of accounting report

2017-08-31 15:44:36 +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

Work on accounting reports.

2017-08-31 22:38:30 +02:00

salaries

Fix translation done twice into field title of array

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

sociales

Fix missing $form

2017-08-22 10:02:45 +02:00

stats

Work on accounting reports.

2017-08-31 22:38:30 +02:00

tva

Uniformize code of accounting report

2017-08-31 15:44:36 +02:00

ajaxpayment.php

…

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