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
..
admin	Look and feel v6	2017-05-18 13:13:18 +02:00
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-08 18:32:34 +02:00
tpl	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
card.php	Fix test on mandatory field	2017-06-30 22:40:08 +02:00
contact.php	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
document.php	FIX #6945	2017-06-06 10:53:53 +02:00
index.php	Fix: use 0 instead false	2017-06-03 11:49:59 +02:00
info.php	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
list.php	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
note.php	Work on 6.0 look and feel	2017-03-28 21:04:38 +02:00
services.php	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00