forked from Wavyzz/dolibarr
of overlapped text into delivery receipts. Conflicts: htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
of overlapped text into delivery receipts. Conflicts: htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php