From 24b28d65e464b2be533cbdecd0650f58930424c2 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 23 Aug 2013 10:57:29 +0200
Subject: [PATCH] fix margin reports bugs (wrong group by + jquery syntax
 error)

Conflicts:
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
---
 htdocs/margin/agentMargins.php    | 2 +-
 htdocs/margin/customerMargins.php | 4 ++--
 htdocs/margin/productMargins.php  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index bb12125a345d3..459537e15063b 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -160,7 +160,7 @@
 if ($agentid > 0)
   $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname, f.type";
 else
-  $sql.= " GROUP BY u.rowid, s.nom, s.rowid, s.code_client, s.client, u.login, u.lastname, u.firstname, f.type ";
+  $sql.= " GROUP BY u.rowid";
 $sql.= " ORDER BY $sortfield $sortorder ";
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 67bf8cef506c5..484f86ad9e0ff 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -178,7 +178,7 @@
 if ($client)
   $sql.= " GROUP BY f.rowid, s.rowid, s.nom, s.code_client, s.client, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type ";
 else
-  $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.rowid, f.type ";
+  $sql.= " GROUP BY s.rowid";
 $sql.= " ORDER BY $sortfield $sortorder ";
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -293,7 +293,7 @@
 <script type="text/javascript">
 $(document).ready(function() {
 
-  $("div.fiche form input.button['type=submit']").hide();
+  $("div.fiche form input.button[type=submit]").hide();
 
   $("#socid").change(function() {
      $("div.fiche form").submit();
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index e50534d1f7f07..bb95b4105f96d 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -182,7 +182,8 @@
 if ($id > 0)
   $sql.= " GROUP BY f.rowid, d.fk_product, p.label, p.rowid, p.fk_product_type, p.ref, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.type";
 else
-  $sql.= " GROUP BY d.fk_product, p.label, p.rowid, p.fk_product_type, p.ref, f.facnumber, f.total, f.datef, f.paye, f.fk_statut, f.rowid, f.type";
+  $sql.= " GROUP BY d.fk_product";
+
 $sql.= " ORDER BY $sortfield $sortorder ";
 // TODO: calculate total to display then restore pagination
 //$sql.= $db->plimit($conf->liste_limit +1, $offset);