Laurent Destailleur 49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php

2022-04-29 17:35:36 +02:00

..

doc_generic_order_odt.modules.php

…

pdf_einstein.modules.php

…

pdf_eratosthene.modules.php

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

2022-04-29 17:32:28 +02:00

pdf_proforma.modules.php

…