Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php

FIX create shipment with lot and extrafield

Fix: increase max-width when use externals modules

Fix: Search all  is lost on lists when pagination or when the columns…

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php

Conflicts:
	htdocs/admin/dict.php
	htdocs/fourn/class/fournisseur.commande.class.php

fix : bad name

Fix miss entity column in llx_multicurrency_rate

FIX: Problem of presentation with index supplier command

FIX: fileconf.php redundant else blocks

FIX #5705 Supplier Order's lines array initalisation

FIX: vat dictionary should allow enter and edit multiple values for localtaxes, separated by: (ex -19:-15)