Conflicts:
	htdocs/core/lib/json.lib.php

Conflicts:
	htdocs/core/lib/price.lib.php

Conflicts:
	ChangeLog
	htdocs/adherents/class/adherent.class.php
	htdocs/core/lib/price.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/supplier_proposal/list.php

Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php

Conflicts:
	htdocs/core/lib/functions2.lib.php

Conflicts:
	htdocs/public/payment/newpayment.php

fix #7361  
Function generateDocument was missing for Class Fichinter

Conflicts:
	htdocs/fichinter/class/fichinter.class.php

Fix: some problems with medias in multicompany

Fix: missing salaries upgrade reload module

Fix: avoid htmlentities

Fix: missing parameters for filter and sort (contact list)

Fix: avoid warning