Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php

Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php

Fix: add possibility to change width type to prevent some display issues

Correct typo

FIX : subscription never filled with "yes"

Fix vitual product virtual stock

Work on supplier credit/deposit note

FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them

Update companies.lang

FIX : translation missing

Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php

Ajout du Gabon