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-14 11:22:48 +02:00
2017-07-08 18:32:34 +02:00
2016-12-26 18:21:18 +01:00
2017-06-27 14:02:01 +02:00
2017-06-27 14:02:01 +02:00
2017-04-14 13:02:29 +02:00
2017-06-27 14:02:01 +02:00
2017-06-20 12:17:13 +02:00
2017-06-27 14:02:01 +02:00
2017-06-11 10:37:58 +02:00