These were reintroduced by careless merge

http://php.net/manual/en/language.basic-syntax.phptags.php

-Fix typo

New: Add button 'cancel' to cancel edition of a note (private or public)

product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().

product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().

product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().

Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php

Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php