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

..

doc

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

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

mod_propale_marbre.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

mod_propale_saphir.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modules_propale.php

Fix: $hookmanager is a global object

2013-01-26 10:35:30 +01:00