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-15 17:41:09 +01:00
27 changed files with 2888 additions and 7714 deletions

View File

@@ -113,14 +113,6 @@ if (!empty($module_options) && $module_options != 'menu' && $module_options != '
</tfoot>
</table>';
$bulk = null;
if (file_exists($docroot.$directory.'/custom/bulk.php')) {
$bulk = include $docroot.$directory.'/custom/bulk.php';
} elseif (file_exists($docroot.$directory.'/bulk.php')) {
$bulk = include $docroot.$directory.'/bulk.php';
}
$bulk = (array) $bulk;
echo '
<div class="row" data-target="'.$table_id.'">
<div class="col-xs-12 col-md-5">