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

Fix: Can disable features with CKEDITOR.

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

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

Conflicts:
	htdocs/core/class/conf.class.php

tiers dans une catégorie

Conflicts:
	htdocs/comm/propal.php

product to a customer invoice

Fix: Dump using php not not include lock on tables that are deleted.