Laurent Destailleur
d80baaea69
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
2018-12-04 14:29:47 +01:00
..
2018-10-24 02:58:29 +02:00
2018-09-07 13:32:56 +02:00
2018-06-13 22:52:24 +02:00
2018-12-04 14:29:47 +01:00
2018-05-27 09:27:09 +02:00
2018-06-14 12:01:19 +02:00
2018-10-09 02:15:38 +11:00
2018-05-27 09:27:09 +02:00
2018-08-12 20:08:20 +02:00
2018-05-30 21:38:57 +02:00
2018-09-07 13:32:56 +02:00
2018-09-07 13:32:56 +02:00
2018-06-26 11:18:31 +02:00
2018-06-17 14:33:29 +02:00
2018-05-10 11:48:18 +02:00
2018-06-17 14:33:29 +02:00
2018-08-16 01:14:42 +02:00
2018-06-17 14:33:29 +02:00
2018-06-17 14:33:29 +02:00
2018-06-17 14:33:29 +02:00