Laurent Destailleur 86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php		2017-06-18 21:13:48 +02:00
..
action	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
admin	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
mailing	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
propal	Fix look and feel v6	2017-06-14 11:28:42 +02:00
prospect	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
address.php	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
card.php	Fix do not show localtax info if not used.	2017-06-16 01:02:53 +02:00
contact.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
index.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
multiprix.php	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
recap-client.php	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
remise.php	Fix var not sanitized	2017-05-16 13:27:32 +02:00
remx.php	Fix var not sanitized	2017-05-16 13:27:32 +02:00