forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/accountancy/supplier/index.php
Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/accountancy/supplier/index.php