Laurent Destailleur 3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr ...

into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php

2015-05-15 02:44:43 +02:00

..

doc

Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr

2015-05-15 02:44:43 +02:00

modules_expensereport.php

Minor cosmetic changes

2015-05-15 02:34:57 +02:00