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_generic_proposal_odt.modules.php	Use MAIN_DOC_USE_TIMING on proposals (ODT)	2013-04-26 08:48:44 +02:00
pdf_azur.modules.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-10-07 16:17:51 +02:00