Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php

Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php

Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php

after the @ (technical information), event if application name/version
was replaced with a constant.

level wafter a click on a href link, just add the class "reposition" on
this link.

Missing changes of PR #3927

NEW Develop multi type event filter

NEW FEATURE PROPOSAL: on propale, order or invoice creation from

llx_accounting_account ADD INDEX account_number

This will allow an imap scanner to link email

All emails sent from Dolibarr have a dedicated tracking id.

card

Fix: wrong var name

Correct pattern to match all odt var tags

FIX export propal and order with extrafields

FIX : better fix for #3805

FIX mail isn't display in title on event in mode view

[Qual] Uniformize code

Typo

some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax