receiving is also stored into the tracking dispatch table (not only into
stock movement table).

Conflicts:
	htdocs/core/lib/tax.lib.php

Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php

Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php

FIX empty discount where created if amount is null 

FIXED Review

Fix : Typo on merge

NEW Deliverytime

marcosgdf-bug-1827

Conflicts:
	ChangeLog

FIXED : Lost field in migration for accountancy

FIXES Webservice : fk_delivery_address not saved

FIXED #1824 Add ref_ext for Contact webservices

Update paiement.class.php

Update 3.6.0-3.7.0.sql

 Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7

they should not.

they should not.