Laurent Destailleur eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_builddoc.inc.php htdocs/core/class/html.form.class.php htdocs/core/tpl/admin_extrafields_add.tpl.php htdocs/core/tpl/admin_extrafields_edit.tpl.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/core/tpl/notes.tpl.php htdocs/main.inc.php htdocs/product/inventory/tpl/inventory.tpl.php htdocs/societe/tpl/linesalesrepresentative.tpl.php		2017-12-21 14:35:33 +01:00
..
admin	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
class	FIX Maxi debug of permission for users external or restricted to sales	2017-12-18 16:13:05 +01:00
tpl	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
card.php	Fix css	2017-12-20 21:14:22 +01:00
document.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
index.php	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
info.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
list.php	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
note.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00