Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php

not livraison->dir_output who not exist

FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode

FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it

FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list

FIX #6673 Missing "nature" table header in thirdparty list

FIX #6671 Cannot remove thirdparty type with "#" in its name

FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry

FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key

FIX #6623 User card shows "Return to list" link even if the user has no rights to list users

FIX: dont get empty "Incoterms : - " string if no incoterm

FIX: dont lose supplier ref if no supplier price in database

fix: missing attribute update

Corrected translation errors and little bug showing a non-available button to a restricted user

FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode

Close #6679

FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it

Close #6680

FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list

Close #6675

Close #6673

Close #6671

Close #6669

Close #6613

Close #6623

Conflicts:
	htdocs/filefunc.inc.php

FIX : Categories Bank vs categories transactions

HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to
restore the inline images feature.