1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-06-05 22:09:38 +02:00

Merge branch 'master' into 2.4

This commit is contained in:
Thomas Zilio
2018-02-11 20:24:29 +01:00
23 changed files with 279 additions and 236 deletions

View File

@ -96,7 +96,7 @@ if (!empty($module_query) && $module_query != 'menu' && $module_query != 'custom
unset($pieces[$cont - 1]);
}
$module_query = implode('ORDER', $pieces).' ORDER BY `'.$total['order_by'][$order['column']].'` '.$order['dir'];
$module_query = implode('ORDER', $pieces).' ORDER BY '.$total['order_by'][$order['column']].' '.$order['dir'];
}
// Calcolo di eventuali somme