Laurent Destailleur 4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/html.form.class.php		2018-06-13 23:04:08 +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	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-06-13 23:04:08 +02:00
commande	Update card.php	2018-06-13 20:02:38 +02:00
facture	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-04-13 23:27:14 +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	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-25 15:27:31 +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	add hook on balence pages	2018-05-29 16:29:14 +02:00