[Fmsystem-commits] [16595]

[nelson . guerra]

Revision: 16595
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16595
Author:   nelson224
Date:     2017-04-19 00:23:23 -0400 (Wed, 19 Apr 2017)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.soreport.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.soreport.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.soreport.inc.php       
2017-04-18 14:07:11 UTC (rev 16594)
+++ branches/dev-syncromind-2/property/inc/class.soreport.inc.php       
2017-04-19 04:23:23 UTC (rev 16595)
@@ -215,7 +215,8 @@
                                $order = ' ORDER BY '.implode(',', 
$jsonB['order']);
                        }
                        
-                       $sql = "SELECT ".$columns.",".$func_agregates." FROM 
".$dataset['view_name']." GROUP BY ".$columns.$order;
+                       //$sql = "SELECT ".$columns.",".$func_agregates." FROM 
".$dataset['view_name']." GROUP BY ".$columns.$order;
+                       $sql = "SELECT ".$columns.",".$func_agregates." FROM 
".$dataset['view_name']." GROUP BY ROLLUP (".$columns.')'.$order;
                        
                        $this->db->query($sql, __LINE__, __FILE__);