Laurent Destailleur ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang		2018-04-12 13:31:14 +02:00
..
ajax	Fix sql field can't be named 'offset' (reserved word).	2017-10-26 18:30:01 +02:00
class	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:14 +02:00
payment	FIX Create payment of expense report	2018-03-27 12:09:34 +02:00
stats	Escape all status	2017-09-08 13:23:12 +02:00
tpl	NEW Look and feel v8: Use a different picto for delete and unlink	2018-03-18 19:13:42 +01:00
card.php	Remove old deprecated hook insertExtraFields. Triggers must be used for	2018-04-10 12:03:01 +02:00
document.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
export_csv.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
index.html
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 16:00:52 +02:00
list.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-07 12:30:30 +02:00
note.php	Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY	2018-03-10 18:40:45 +01:00