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
..
action	FIX Maxi debug of permission for users external or restricted to sales	2017-12-18 16:13:05 +01:00
admin	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
mailing	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
propal	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-21 14:35:33 +01:00
prospect	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
address.php	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
card.php	Error management after extrafield update	2017-10-24 19:04:40 +02:00
contact.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
index.php	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
multiprix.php	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 12:52:19 +01:00
recap-client.php	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
remise.php	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
remx.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-13 22:01:56 +02:00