forked from Wavyzz/dolibarr
Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/contrat/list.php htdocs/don/class/api_donations.class.php htdocs/societe/class/societe.class.php
Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/contrat/list.php htdocs/don/class/api_donations.class.php htdocs/societe/class/societe.class.php