diff --git a/include/manager.php b/include/manager.php index c828d3a41..1b03f987c 100755 --- a/include/manager.php +++ b/include/manager.php @@ -181,12 +181,12 @@ if (!empty($type) && $type != 'menu' && $type != 'custom') { -
'; +
'; if (!empty($bulk) && $structure->permission == 'rw' && empty($id_plugin)) { echo ' - '; +
'; } echo ' diff --git a/modules/anagrafiche/buttons.php b/modules/anagrafiche/buttons.php index d1268598f..11a6270c8 100755 --- a/modules/anagrafiche/buttons.php +++ b/modules/anagrafiche/buttons.php @@ -23,64 +23,64 @@ use Models\Module; if (in_array($id_cliente, $tipi_anagrafica) or in_array($id_fornitore, $tipi_anagrafica)) { echo '
- - + echo' +
'; + } if (in_array($id_agente, $tipi_anagrafica)) { // Aggiunta liquidazione provvigioni per agente echo ' - '; + '; } diff --git a/modules/contratti/edit.php b/modules/contratti/edit.php index da66b5c96..04038e394 100755 --- a/modules/contratti/edit.php +++ b/modules/contratti/edit.php @@ -367,17 +367,14 @@ if (!$block_edit) { diff --git a/modules/dashboard/edit.php b/modules/dashboard/edit.php index fd3f4153b..ec35a72be 100755 --- a/modules/dashboard/edit.php +++ b/modules/dashboard/edit.php @@ -144,7 +144,7 @@ foreach ($tipi_intervento as $tipo) { echo '
  • - + @@ -180,7 +180,7 @@ foreach ($tecnici_disponibili as $tecnico) { echo '
  • - + @@ -286,7 +286,7 @@ if (!empty($risultati_da_programmare)) { echo ' - diff --git a/modules/fatture/buttons.php b/modules/fatture/buttons.php index 007815b5b..c802af726 100755 --- a/modules/fatture/buttons.php +++ b/modules/fatture/buttons.php @@ -39,20 +39,20 @@ if ($dir == 'entrata' || !empty($abilita_autofattura)) { if ($dir == 'entrata') { echo ' '; } elseif (!empty($abilita_autofattura)) { echo ' '; } echo ' diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php index e7d3a33e7..352fa5655 100755 --- a/modules/fatture/edit.php +++ b/modules/fatture/edit.php @@ -904,50 +904,40 @@ if (!$block_edit) { diff --git a/modules/interventi/buttons.php b/modules/interventi/buttons.php index a54940eb8..7bfd71fd1 100755 --- a/modules/interventi/buttons.php +++ b/modules/interventi/buttons.php @@ -68,11 +68,9 @@ echo ' '; */ diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php index 3b08c2b1c..29749c8b9 100755 --- a/modules/interventi/edit.php +++ b/modules/interventi/edit.php @@ -497,35 +497,25 @@ if (!$block_edit) { diff --git a/modules/ordini/buttons.php b/modules/ordini/buttons.php index 3f31d9b8e..5d072e118 100755 --- a/modules/ordini/buttons.php +++ b/modules/ordini/buttons.php @@ -45,39 +45,30 @@ echo ' '; diff --git a/modules/ordini/edit.php b/modules/ordini/edit.php index 77eca5634..594cfd6ec 100755 --- a/modules/ordini/edit.php +++ b/modules/ordini/edit.php @@ -287,24 +287,20 @@ if (!$block_edit) { diff --git a/modules/preventivi/buttons.php b/modules/preventivi/buttons.php index 0b0a14b75..4c046da86 100644 --- a/modules/preventivi/buttons.php +++ b/modules/preventivi/buttons.php @@ -58,41 +58,29 @@ echo ' '; diff --git a/modules/preventivi/edit.php b/modules/preventivi/edit.php index 3aab8c210..2d4a237a8 100755 --- a/modules/preventivi/edit.php +++ b/modules/preventivi/edit.php @@ -275,17 +275,14 @@ if (!$block_edit) { diff --git a/modules/primanota/edit.php b/modules/primanota/edit.php index 54d3f6bf9..c0bcd27c6 100755 --- a/modules/primanota/edit.php +++ b/modules/primanota/edit.php @@ -47,7 +47,7 @@ if (sizeof($rs_doc) > 0) { Toggle Dropdown @@ -57,20 +57,19 @@ if (sizeof($rs_doc) > 0) {

    - - -
      fetchArray('SELECT `dir` FROM `co_tipidocumento` INNER JOIN `co_documenti` ON `co_tipidocumento`.`id`=`co_documenti`.`idtipodocumento` WHERE `co_documenti`.`id`='.prepare($rs_doc[$i]['iddocumento'])); $id_modulo = ($rs[0]['dir'] == 'entrata') ? (new Module())->getByField('title', 'Fatture di vendita', Models\Locale::getPredefined()->id)->id_record : (new Module())->getByField('title', 'Fatture di acquisto', Models\Locale::getPredefined()->id); ?> -
      • + + +
    diff --git a/plugins/importFE/generate.php b/plugins/importFE/generate.php index 0b149cc2d..6186e4500 100755 --- a/plugins/importFE/generate.php +++ b/plugins/importFE/generate.php @@ -570,7 +570,7 @@ if (!empty($righe)) { -
    +
    diff --git a/src/HTMLBuilder/Manager/ButtonManager.php b/src/HTMLBuilder/Manager/ButtonManager.php index 3e26e8637..1ae31e4bc 100755 --- a/src/HTMLBuilder/Manager/ButtonManager.php +++ b/src/HTMLBuilder/Manager/ButtonManager.php @@ -168,23 +168,23 @@ class ButtonManager implements ManagerInterface '.($predefined === false ? $this->defaultText($options).' ' : '').' Toggle Dropdown -
      '; +
      '; foreach ($list as $i => $element) { - $result .= ' -
    • '.$this->link([ + $result .= + $this->link([ 'type' => $options['type'], 'id' => $element['id'], 'id_module' => $options['id_module'], 'id_record' => $options['id_record'], - 'class' => false, + 'class' => 'dropdown-item', 'parameters' => $options['parameters'], 'html_id' => $options['html_id'].'_'.$i, - ]).'
      • '; + ]); } $result .= ' -
    +
    '; } elseif ($count == 1) { $result = $this->link([