Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/index.php

Fix 6993 - supplier propal check min price on update line

Fix display on situation invoice

FIX 6962 Can't create shipment if no write permission on order

fix : availibity refresh

Fix 6982 missing parameter to get more informations about files

FIX #6939 new path for pictures is not used

Conflicts:
	htdocs/user/index.php

Fix : button convert was still available even if deposit was already …