Conflicts:
	htdocs/core/modules/modProjet.class.php
	htdocs/filefunc.inc.php

Conflicts:
	htdocs/core/class/html.formprojet.class.php

Conflicts:
	htdocs/core/class/html.formprojet.class.php

draft)

an addreplace hook.

in fact $dir is not used in the function

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

Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php

Fix pdf invoice with situation

Replace "Cotisation" class with its new name "Subscription"

FIX bug margin calcul by user with multicompany