put it and to fix the calculation method.

when a filter is done on a period + a specific product.

develop

Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang

Add multilang management in ODT models

Conflicts:
	htdocs/contact/fiche.php

Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php

and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php

fix bugs on margin calculation and margin reports