Laurent Destailleur dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang

2018-09-24 10:14:38 +02:00

..

bank

FIX Projet is not prefilled when created from overwiew page

2018-05-01 14:15:11 +02:00

charges

Fix a lot of request to use the IN getentity instead of =

2017-11-23 15:06:16 +01:00

deplacement

Fix scrutinizer bugs

2017-12-15 22:14:28 +01:00

facture

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

2018-09-24 10:14:38 +02:00

journal

Clean code

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

localtax

Fix log and duplicate vat_by_date function

2018-03-27 14:37:29 +02:00

paiement

Update paiement.class.php

2018-06-22 14:34:59 +02:00

payment_sc

Fix creation of tax payment

2017-10-07 21:27:18 +02:00

prelevement

FIX : Pagination on withdraw request list

2018-08-10 15:05:21 +02:00

resultat

FIX Data on income/expense report was always 0

2018-03-27 14:16:59 +02:00

salaries

Fix not employee must not appear on page to create salaries

2017-12-18 11:55:34 +01:00

sociales

Fix name of file saved from tax document tab

2018-01-12 17:39:20 +01:00

stats

Fix SQLi reported by op7ica

2018-03-15 01:55:16 +01:00

tva

Fix log and duplicate vat_by_date function

2018-03-27 14:37:29 +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

Fix properties into tooltip

2018-02-05 00:36:54 +01:00

paiement_charge.php

Look and feel v6

2017-10-16 20:53:23 +02:00

paiement.php

Fix regeneration of PDF after creation of payment.

2018-02-02 10:37:10 +01:00

recap-compta.php

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

2018-05-30 11:09:53 +02:00