From 7ee5b72cb3a3279b08d5bfbc011d3199b98a013f Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Fri, 31 Jul 2020 14:57:23 +0200
Subject: [PATCH] Correzioni minori

---
 modules/fatture/buttons.php           |  4 +--
 modules/interventi/buttons.php        | 16 ++++++++++++
 modules/interventi/crea_documento.php | 35 +++++++++++++++++++++++++++
 modules/ordini/buttons.php            | 12 ++++-----
 modules/partitario/dettagli_conto.php |  2 +-
 modules/preventivi/buttons.php        | 12 ++++-----
 6 files changed, 66 insertions(+), 15 deletions(-)
 create mode 100644 modules/interventi/crea_documento.php

diff --git a/modules/fatture/buttons.php b/modules/fatture/buttons.php
index 24266c9db..a389f902e 100755
--- a/modules/fatture/buttons.php
+++ b/modules/fatture/buttons.php
@@ -20,8 +20,8 @@ if ($dir == 'entrata') {
     echo '
 <div class="btn-group">
     <button type="button" class="btn btn-primary unblockable dropdown-toggle '.(((!empty($record['ref_documento']) || $record['stato'] != 'Bozza') and empty($record['is_reversed'])) ? '' : 'disabled').'" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <i class="fa fa-magic"></i> '.tr('Crea').' <span class="caret"></span>
-        <span class="sr-only">Toggle Dropdown</span>
+        <i class="fa fa-magic"></i> '.tr('Crea').'
+        <span class="caret"></span>
     </button>
 
     <ul class="dropdown-menu dropdown-menu-right">
diff --git a/modules/interventi/buttons.php b/modules/interventi/buttons.php
index a1e616d26..1350f1317 100755
--- a/modules/interventi/buttons.php
+++ b/modules/interventi/buttons.php
@@ -36,3 +36,19 @@ function anteprimaFirma() {
     openModal("'.tr('Anteprima e firma').'", "'.$module->fileurl('add_firma.php').'?id_module='.$id_module.'&id_record='.$id_record.'&anteprima=1");
 }
 </script>';
+
+// Creazione altri documenti
+echo '
+<div class="btn-group">
+	<button class="btn btn-info dropdown-toggle '.(!$record['flag_completato'] ? 'disabled' : '').'" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+		<i class="fa fa-magic"></i> '.tr('Crea').'
+		<span class="caret"></span>
+	</button>
+	<ul class="dropdown-menu dropdown-menu-right">
+        <li>
+            <a data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=fattura" data-toggle="modal" data-title="'.tr('Crea fattura').'">
+                <i class="fa fa-file"></i> '.tr('Fattura').'
+            </a>
+        </li>
+    </ul>
+</div>';
diff --git a/modules/interventi/crea_documento.php b/modules/interventi/crea_documento.php
new file mode 100644
index 000000000..415011157
--- /dev/null
+++ b/modules/interventi/crea_documento.php
@@ -0,0 +1,35 @@
+<?php
+
+include_once __DIR__.'/../../core.php';
+
+use Modules\Interventi\Intervento;
+
+$documento = Intervento::find($id_record);
+
+$module = Modules::get($documento->module);
+
+if (get('documento') == 'fattura') {
+    $final_module = 'Fatture di vendita';
+    $op = 'add_documento';
+} elseif (get('documento') == 'ordine_fornitore') {
+    $final_module = 'Ordini fornitore';
+    $op = 'add_ordine_cliente';
+}  elseif (get('documento') == 'ordine') {
+    $final_module = 'Ordini cliente';
+    $op = 'add_documento';
+} else {
+    $final_module = 'Ddt di vendita';
+    $op = 'add_documento';
+}
+
+$options = [
+    'op' => $op,
+    'type' => 'ordine',
+    'module' => $final_module,
+    'button' => tr('Aggiungi'),
+    'create_document' => true,
+    'serials' => true,
+    'documento' => $documento,
+];
+
+echo App::load('importa.php', [], $options, true);
diff --git a/modules/ordini/buttons.php b/modules/ordini/buttons.php
index 535b85aad..153e6d15b 100755
--- a/modules/ordini/buttons.php
+++ b/modules/ordini/buttons.php
@@ -3,33 +3,33 @@
 include_once __DIR__.'/../../core.php';
 
 echo '
-<div class="dropdown">
+<div class="btn-group">
 	<button class="btn btn-info dropdown-toggle '.(!in_array($record['stato'], ['Fatturato', 'Evaso', 'Bozza']) ? '' : 'disabled').'" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-		<i class="fa fa-magic"></i>&nbsp;'.tr('Crea').'...
+		<i class="fa fa-magic"></i> '.tr('Crea').'
 		<span class="caret"></span>
 	</button>
 	<ul class="dropdown-menu dropdown-menu-right">
 	    <li>
             <a data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=intervento" data-toggle="modal" data-title="'.tr('Crea attività').'">
-                <i class="fa fa-wrench"></i>&nbsp;'.tr('Attività').'
+                <i class="fa fa-wrench"></i> '.tr('Attività').'
             </a>
         </li>
 
         <li>
             <a data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=ordine_fornitore" data-toggle="modal" data-title="'.tr('Crea ordine fornitore').'">
-                <i class="fa fa-file-o"></i>&nbsp;'.tr('Ordine fornitore').'
+                <i class="fa fa-file-o"></i> '.tr('Ordine fornitore').'
             </a>
         </li>
 
         <li>
             <a data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=ddt" data-toggle="modal" data-title="'.tr('Crea ddt').'">
-                <i class="fa fa-truck"></i>&nbsp;'.tr('Ddt').'
+                <i class="fa fa-truck"></i> '.tr('Ddt').'
             </a>
         </li>
 
         <li>
             <a data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=fattura" data-toggle="modal" data-title="'.tr('Crea fattura').'">
-                <i class="fa fa-file"></i>&nbsp;'.tr('Fattura').'
+                <i class="fa fa-file"></i> '.tr('Fattura').'
             </a>
         </li>
     </ul>
diff --git a/modules/partitario/dettagli_conto.php b/modules/partitario/dettagli_conto.php
index 67aefe758..6c4f62614 100755
--- a/modules/partitario/dettagli_conto.php
+++ b/modules/partitario/dettagli_conto.php
@@ -85,5 +85,5 @@ function open_movimento(id_mastrino, id_module){
 </script>';
 } else {
     echo '
-<span>&nbsp;'.tr('Nessun movimento presente').'</span>';
+<span>'.tr('Nessun movimento presente').'</span>';
 }
diff --git a/modules/preventivi/buttons.php b/modules/preventivi/buttons.php
index 4dcdcf9ea..2e44ffa48 100644
--- a/modules/preventivi/buttons.php
+++ b/modules/preventivi/buttons.php
@@ -23,35 +23,35 @@ $stati_abilitati = $dbo->fetchOne('SELECT GROUP_CONCAT(`descrizione` SEPARATOR "
 
 // Creazione altri documenti
 echo '
-<div style="margin-left:4px;" class="dropdown pull-right">
+<div class="btn-group">
     <button class="btn btn-info dropdown-toggle '.($disabled ? '' : 'disabled tip').'" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" '.($disabled ? '' : 'disabled').'  title="'.($disabled ? '' : tr('Per creare un documento deve essere inserita almeno una riga e lo stato del preventivo deve essere tra: _STATE_LIST_', [
             '_STATE_LIST_' => $stati_abilitati,
         ])).'" >
-        <i class="fa fa-magic"></i>&nbsp;'.tr('Crea').'...
+        <i class="fa fa-magic"></i> '.tr('Crea').'
         <span class="caret"></span>
     </button>
     <ul class="dropdown-menu dropdown-menu-right">
         <li>
 		    <a class="'.($disabled ? '' : 'disabled').'" data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=contratto" data-toggle="modal" data-title="'.tr('Crea contratto').'">
-                <i class="fa fa-file-o"></i>&nbsp;'.tr('Contratto').'
+                <i class="fa fa-file-o"></i> '.tr('Contratto').'
             </a>
 		</li>
 
 		<li>
 		    <a class="'.($disabled ? '' : 'disabled').'" data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=ordine" data-toggle="modal" data-title="'.tr('Crea ordine cliente').'">
-                <i class="fa fa-file-o"></i>&nbsp;'.tr('Ordine cliente').'
+                <i class="fa fa-file-o"></i> '.tr('Ordine cliente').'
             </a>
 		</li>
 
 		<li>
 		    <a class="'.($disabled ? '' : 'disabled').'" data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=ddt" data-toggle="modal" data-title="'.tr('Crea ordine cliente').'">
-                <i class="fa fa-truck"></i>&nbsp;'.tr('DDT in uscita').'
+                <i class="fa fa-truck"></i> '.tr('DDT in uscita').'
             </a>
 		</li>
 
 		<li>
             <a class="'.($disabled ? '' : 'disabled').'" data-href="'.$structure->fileurl('crea_documento.php').'?id_module='.$id_module.'&id_record='.$id_record.'&documento=fattura" data-toggle="modal" data-title="'.tr('Crea fattura').'">
-                <i class="fa fa-file"></i>&nbsp;'.tr('Fattura').'
+                <i class="fa fa-file"></i> '.tr('Fattura').'
             </a>
         </li>
 	</ul>