Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
..
2017-04-27 17:16:19 +02:00
2017-07-07 20:30:04 +02:00
2017-05-10 16:41:19 +02:00
2017-04-14 11:22:48 +02:00
2017-06-27 17:27:01 +02:00
2017-05-21 02:43:51 +02:00
2017-06-06 10:53:53 +02:00
2017-06-27 17:27:01 +02:00
2017-03-20 21:29:22 +01:00
2017-07-08 18:32:34 +02:00
2017-03-20 21:29:22 +01:00
2017-05-21 02:43:51 +02:00