standard to replace current one.

been superseed by another one.

Conflicts:
	htdocs/product/stock/product.php

Conflicts:
	htdocs/product/stock/product.php

Clean language files for direct print module.

instead of empty string.

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