Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php

FIX Using parm instead of this in function pdfGetHeightForHtmlContent

FIX : Translate group perms as it is done into user perms

FIX: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated

not.

old behaviour.

FIX Bad name of table into sql request llx_accountingaccount instead of llx_accounting_account

FIX 3.8 large expense note

FIX #5343

Greece VAT 23 -> 24

FIX PHP 5.3 compatibility

and profid does not exists for other countries

Conflicts:
	htdocs/compta/facture.php

and profid does not exists for other countries

Fix: Accountancy - Access rights

solve situation.

FIX #5087