forked from Wavyzz/dolibarr
Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php
Conflicts: htdocs/compta/deplacement/fiche.php htdocs/core/tpl/objectline_create.tpl.php htdocs/expedition/fiche.php