Conflicts:
	htdocs/comm/propal.php

Fix email template edition

FIX issues with entity in leave creation

FIX services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES

Fix: doublon (merge problem?)

Fix: Expensereport not compatible with multicompany

FIX 3.8 hook on group card called but not initialized

records for unknown lots to generic value 'Undefined'.

Conflicts:
	htdocs/contrat/card.php

Fix update supplier ref on supplier invoice

FIX : can't fetch by siret or siren because of first "if"

Correction for Auguria Menu Accounting Expert

Fix contract line creation

Entry cause blank windows