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
..
admin	Missing succes message in margin module config page	2013-05-19 12:19:31 +02:00
lib	fix bugs on margin reports	2013-10-05 10:21:38 +02:00
tabs	Merge remote-tracking branch 'origin/3.4' into develop	2013-10-07 16:17:51 +02:00
agentMargins.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-10-07 16:17:51 +02:00
customerMargins.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-10-07 16:17:51 +02:00
index.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
productMargins.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-10-07 16:17:51 +02:00