Add feature to order to invoice on supplier part
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
set ref_supplier for contract field
Fix for travis syntax
Add cache excel export on harddrive with
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
changelog
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
Fix travis (strange I didn't update this file)
Expedition lines from same orderline merged.

When there are more expedition lines from same orderline key, merge them
and get source warehouses. Usefull future possibility for creating
shippinglines with same products from multiple warehouses.
@KreizIT also changed some batch related items.
Fix deliveryorder qty and remainingqty positions
Minor look enhancement
Fix migration sql for inserting accounting records

Migration SQL could not insert accounting records because datec was set
to NOT NULL
Add hook formatEvent and fix bug into per user view.
Fix: edit event
New: Can use color of type of event into dictionnary.
Fix: Event update
Sync from transifex
Merge pull request #1916 from FHenry/develop

Add feature to order to invoice on supplier part
Merge pull request #1937 from fappels/develop

Expedition lines from same orderline merged.
Sync from transifex.
Fix var not initialized.
Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.