Laurent Destailleur 2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ...

Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php

2017-04-11 11:43:54 +02:00

..

bank

FIX Enter a direct bank transaction

2017-04-08 01:25:52 +02:00

charges

Miscellaneous fixes

2016-11-12 12:40:06 +01:00

deplacement

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

facture

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

2017-04-11 11:43:54 +02:00

journal

Fix deprecated value given to dol_print_date

2016-08-25 10:07:19 +02:00

localtax

Fix more security fixes

2016-12-18 17:27:06 +01:00

paiement

FIX bank account not visible on payment card

2017-04-02 21:42:16 +02:00

payment_sc

Fix more security fixes

2016-12-18 17:27:06 +01:00

prelevement

FIX #6404

2017-03-03 15:11:41 +01:00

resultat

Fix several bugs

2017-01-22 13:19:07 +01:00

salaries

Fix : missing language file in salaries index

2017-03-24 06:38:26 +01:00

sociales

FIX total payed wrong

2017-01-18 13:28:02 +01:00

stats

Fix margin pagination

2016-12-27 02:01:27 +01:00

tva

FIX #6476

2017-03-03 14:08:19 +01: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 more security fixes

2016-12-18 17:27:06 +01:00

facture.php

FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry

2017-04-09 14:29:40 +02:00

index.php

Fix list of supplier proposals

2017-02-17 01:41:33 +01:00

paiement_charge.php

Fix css and look 5.0

2017-01-22 12:13:32 +01:00

paiement.php

Fix: [Payments] Properly escape variable for JS

2017-02-17 16:16:41 +01:00

recap-compta.php

Fix dol_banner

2017-01-01 19:53:05 +01:00