Laurent Destailleur 0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/card.php htdocs/compta/prelevement/line.php htdocs/core/class/commonobject.class.php htdocs/core/lib/functions2.lib.php htdocs/core/tpl/card_presend.tpl.php htdocs/expensereport/class/expensereport.class.php htdocs/fourn/class/fournisseur.commande.class.php		2020-10-22 17:55:38 +02:00
..
api_expensereports.class.php	Fix escaping	2020-09-20 01:30:36 +02:00
expensereport_ik.class.php	add new rule	2020-05-21 15:05:19 +02:00
expensereport_rule.class.php	add new rule	2020-05-21 15:05:19 +02:00
expensereport.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-10-22 17:55:38 +02:00
expensereportstats.class.php	Fix escaping	2020-09-20 02:30:53 +02:00
index.html
paymentexpensereport.class.php	add new rule	2020-05-21 15:05:19 +02:00