Fix: a minor error was locking the full upgrade process.

Try to continue work on position of menu entries.

module.

uninstalled (conflict between 'margin' and 'margins').

Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php

Conflicts:
	htdocs/install/mysql/migration/repair.sql

them).

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php