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
..
tpl	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 13:32:16 +01:00
card.php	Fix several pb in links to projects on create page	2017-12-12 10:37:51 +01:00
contact.php	Complete work on dol_banner	2016-12-26 18:21:18 +01:00
dispatch.php	Fix dispatch not adapted for label to ref change for warehouse	2017-12-01 12:57:56 +01:00
document.php	FIX #6981	2017-10-06 14:07:28 +02:00
index.php	Replace deprecated dol_print_graph with DolGraph	2017-11-23 20:24:05 +01:00
info.php	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
list.php	Filter on date extrafield timestamp and datetime disabled (not possible	2017-12-20 18:30:41 +01:00
note.php	Fix reception of product interface	2017-06-27 14:02:01 +02:00
orderstoinvoice.php	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00