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	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
class	Remove old deprecated hook insertExtraFields. Triggers must be used for	2018-04-10 12:03:01 +02:00
commande	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:14 +02:00
facture	Remove old deprecated hook insertExtraFields. Triggers must be used for	2018-04-10 12:03:01 +02:00
js	Fix for 'lessone' mode	2017-09-26 15:44:40 +02:00
paiement	Fix generation of doc for supplier payment	2018-01-11 19:01:47 +01:00
product	Fix for #7697	2017-12-01 19:29:29 +01:00
card.php	Remove old deprecated hook insertExtraFields. Triggers must be used for	2018-04-10 12:03:01 +02:00
contact.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
index.php	FIX security vulnerability reported by ADLab of Venustech	2017-12-21 12:52:19 +01:00
recap-fourn.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00