Laurent Destailleur 141258f514 Merge remote-tracking branch 'origin/3.4' into develop ...

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

2013-10-07 16:17:51 +02:00

..

productMargins.php

fix bugs on margin reports

2013-10-05 10:21:38 +02:00

thirdpartyMargins.php

Merge remote-tracking branch 'origin/3.4' into develop

2013-10-07 16:17:51 +02:00