module.

some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.

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

Fix: Can disable features with CKEDITOR.

e-mailing

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