Conflicts:
	htdocs/compta/facture/class/facture.class.php

Fix: for avoid conflict with "global $m" in memory.lib.php

Corrected typo of PR #4444

FIX: Contrat card don't consider user permissions to show active/unactive service button

Fix: missing field "label"

FIX filter by socid if from customer card

FIX List of automatic events was not visible.

he is also assigned to project (and if not assign it)

Conflicts:
	htdocs/main.inc.php

Conflicts:
	htdocs/fourn/commande/card.php

permission for.

FIX bookmark's user change after update if the user isn't superadmin