diff --git a/.editorconfig b/.editorconfig old mode 100644 new mode 100755 diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100644 new mode 100755 diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md old mode 100644 new mode 100755 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md old mode 100644 new mode 100755 diff --git a/.github/STANDARD.md b/.github/STANDARD.md old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.htaccess b/.htaccess old mode 100644 new mode 100755 diff --git a/.php_cs b/.php_cs old mode 100644 new mode 100755 diff --git a/.sami b/.sami old mode 100644 new mode 100755 diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/actions.php b/actions.php old mode 100644 new mode 100755 diff --git a/add.php b/add.php old mode 100644 new mode 100755 diff --git a/ajax.php b/ajax.php old mode 100644 new mode 100755 diff --git a/ajax_complete.php b/ajax_complete.php old mode 100644 new mode 100755 diff --git a/ajax_dataload.php b/ajax_dataload.php old mode 100644 new mode 100755 diff --git a/ajax_search.php b/ajax_search.php old mode 100644 new mode 100755 diff --git a/ajax_select.php b/ajax_select.php old mode 100644 new mode 100755 diff --git a/api/index.php b/api/index.php old mode 100644 new mode 100755 diff --git a/assets/src/css/datatables.css b/assets/src/css/datatables.css old mode 100644 new mode 100755 diff --git a/assets/src/css/print/print.css b/assets/src/css/print/print.css old mode 100644 new mode 100755 diff --git a/assets/src/css/style.css b/assets/src/css/style.css old mode 100644 new mode 100755 diff --git a/assets/src/css/themes/default.css b/assets/src/css/themes/default.css old mode 100644 new mode 100755 diff --git a/assets/src/img/ajax-loader.gif b/assets/src/img/ajax-loader.gif old mode 100644 new mode 100755 diff --git a/assets/src/img/favicon.png b/assets/src/img/favicon.png old mode 100644 new mode 100755 diff --git a/assets/src/img/help.png b/assets/src/img/help.png old mode 100644 new mode 100755 diff --git a/assets/src/img/logo.png b/assets/src/img/logo.png old mode 100644 new mode 100755 diff --git a/assets/src/img/progress.gif b/assets/src/img/progress.gif old mode 100644 new mode 100755 diff --git a/assets/src/js/custom.js b/assets/src/js/custom.js old mode 100644 new mode 100755 diff --git a/assets/src/js/datatables-buttons.js b/assets/src/js/datatables-buttons.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/datatables.js b/assets/src/js/functions/datatables.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/dates.js b/assets/src/js/functions/dates.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/functions.js b/assets/src/js/functions/functions.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/hooks.js b/assets/src/js/functions/hooks.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/init.js b/assets/src/js/functions/init.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/input.js b/assets/src/js/functions/input.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/moment.js b/assets/src/js/functions/moment.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/prototypes.js b/assets/src/js/functions/prototypes.js old mode 100644 new mode 100755 diff --git a/assets/src/js/functions/select.js b/assets/src/js/functions/select.js old mode 100644 new mode 100755 diff --git a/assets/src/js/navigation.js b/assets/src/js/navigation.js old mode 100644 new mode 100755 diff --git a/assets/src/js/sidebar.js b/assets/src/js/sidebar.js old mode 100644 new mode 100755 diff --git a/assets/src/js/slider.js b/assets/src/js/slider.js old mode 100644 new mode 100755 diff --git a/assets/src/js/supersearch.js b/assets/src/js/supersearch.js old mode 100644 new mode 100755 diff --git a/assets/src/js/widgets.js b/assets/src/js/widgets.js old mode 100644 new mode 100755 diff --git a/backup/.htaccess b/backup/.htaccess old mode 100644 new mode 100755 diff --git a/bug.php b/bug.php old mode 100644 new mode 100755 diff --git a/codeception.dist.yml b/codeception.dist.yml old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/config.example.php b/config.example.php old mode 100644 new mode 100755 diff --git a/config/csrf_config.php b/config/csrf_config.php old mode 100644 new mode 100755 diff --git a/config/namespaces.php b/config/namespaces.php old mode 100644 new mode 100755 diff --git a/controller.php b/controller.php old mode 100644 new mode 100755 diff --git a/core.php b/core.php old mode 100644 new mode 100755 diff --git a/files/.htaccess b/files/.htaccess old mode 100644 new mode 100755 diff --git a/files/my_impianti/componente.ini b/files/my_impianti/componente.ini old mode 100644 new mode 100755 diff --git a/gulpfile.js b/gulpfile.js old mode 100644 new mode 100755 diff --git a/include/.htaccess b/include/.htaccess old mode 100644 new mode 100755 diff --git a/include/bottom.php b/include/bottom.php old mode 100644 new mode 100755 diff --git a/include/common/articolo.php b/include/common/articolo.php old mode 100644 new mode 100755 index 28221f363..6aaa88927 --- a/include/common/articolo.php +++ b/include/common/articolo.php @@ -7,7 +7,7 @@ $_SESSION['superselect']['idanagrafica'] = $options['idanagrafica']; $_SESSION['superselect']['idarticolo'] = $options['idarticolo']; // Articolo -if (!isset($options['edit_articolo']) || !empty($options['edit_articolo'])) { +if (empty($result['idarticolo'])) { echo '
@@ -19,91 +19,99 @@ if (!isset($options['edit_articolo']) || !empty($options['edit_articolo'])) { $articolo = $database->fetchArray('SELECT codice, descrizione FROM mg_articoli WHERE id = '.prepare($result['idarticolo']))[0]; echo ' -

'.tr('Articolo').'
'.$articolo['codice'].' - '.$articolo['descrizione'].'.

'; +

'.tr('Articolo').': '.$articolo['codice'].' - '.$articolo['descrizione'].'.

'; +} + +// Selezione impianto per gli Interventi +if ($module['name'] == 'Interventi') { + echo ' +
+
+ {[ "type": "select", "label": "'.tr('Impianto su cui installare').'", "name": "idimpianto", "value": "'.$idimpianto.'", "ajax-source": "impianti-intervento" ]} +
+
'; } echo App::internalLoad('riga.php', $result, $options); -if (!isset($options['edit_articolo']) || !empty($options['edit_articolo'])) { - // Informazioni aggiuntive - if ($module['name'] != 'Contratti' && $module['name'] != 'Preventivi') { - $disabled = empty($result['idarticolo']); - - echo ' -
-
- -
-
- -
- -
-
- -
- -
-
-
-
'; - } +// Informazioni aggiuntive +if ($module['name'] != 'Contratti' && $module['name'] != 'Preventivi') { + $disabled = empty($result['idarticolo']); echo ' - '; + + // Operazioni sui prezzi in fondo alla pagina + $("#prezzi_articolo button").attr("disabled", !$(this).val()); + + if ($(this).val()) { + $("#prezzi_articolo button").removeClass("disabled"); + } else { + $("#prezzi_articolo button").addClass("disabled"); + } + + $("#prezzi").html(""); + $("#prezzivendita").html(""); + $("#prezziacquisto").html("");'; } + +echo ' + }); +}); +'; diff --git a/include/common/conti.php b/include/common/conti.php old mode 100644 new mode 100755 diff --git a/include/common/descrizione.php b/include/common/descrizione.php old mode 100644 new mode 100755 diff --git a/include/common/form.php b/include/common/form.php old mode 100644 new mode 100755 diff --git a/include/common/importa.php b/include/common/importa.php old mode 100644 new mode 100755 diff --git a/include/common/riga.php b/include/common/riga.php old mode 100644 new mode 100755 diff --git a/include/common/sconto.php b/include/common/sconto.php old mode 100644 new mode 100755 diff --git a/include/init/configuration.php b/include/init/configuration.php old mode 100644 new mode 100755 diff --git a/include/init/init.php b/include/init/init.php old mode 100644 new mode 100755 diff --git a/include/init/requirements.php b/include/init/requirements.php old mode 100644 new mode 100755 diff --git a/include/init/update.php b/include/init/update.php old mode 100644 new mode 100755 diff --git a/include/manager.php b/include/manager.php old mode 100644 new mode 100755 diff --git a/include/src/Components/Article.php b/include/src/Components/Article.php old mode 100644 new mode 100755 diff --git a/include/src/Components/Description.php b/include/src/Components/Description.php old mode 100644 new mode 100755 diff --git a/include/src/Components/Discount.php b/include/src/Components/Discount.php old mode 100644 new mode 100755 diff --git a/include/src/Components/MorphTrait.php b/include/src/Components/MorphTrait.php old mode 100644 new mode 100755 diff --git a/include/src/Components/Row.php b/include/src/Components/Row.php old mode 100644 new mode 100755 diff --git a/include/src/Document.php b/include/src/Document.php old mode 100644 new mode 100755 diff --git a/include/src/Model.php b/include/src/Model.php old mode 100644 new mode 100755 diff --git a/include/top.php b/include/top.php old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100644 new mode 100755 diff --git a/info.php b/info.php old mode 100644 new mode 100755 diff --git a/lib/common.php b/lib/common.php old mode 100644 new mode 100755 diff --git a/lib/deprecated.php b/lib/deprecated.php old mode 100644 new mode 100755 diff --git a/lib/functions.php b/lib/functions.php old mode 100644 new mode 100755 diff --git a/lib/helpers.php b/lib/helpers.php old mode 100644 new mode 100755 diff --git a/lib/util.php b/lib/util.php old mode 100644 new mode 100755 diff --git a/locale/.htaccess b/locale/.htaccess old mode 100644 new mode 100755 diff --git a/locale/catalog.pot b/locale/catalog.pot old mode 100644 new mode 100755 index 62b6e5601..a45c2aabf --- a/locale/catalog.pot +++ b/locale/catalog.pot @@ -294,7 +294,7 @@ msgstr "" #: editor.php:334 include/common/form.php:19 #: modules/interventi/add_articolo.php:49 modules/interventi/add_righe.php:28 -#: modules/interventi/ajax_righe.php:135 +#: modules/interventi/row-list.php:135 #: modules/interventi/manage_sessione.php:15 modules/utenti/self.php:25 #: modules/utenti/user.php:80 #: plugins/pianificazione_interventi/add_articolo.php:41 @@ -396,7 +396,7 @@ msgstr "" #: modules/ddt/row-list.php:8 modules/fatture/add_intervento.php:77 #: modules/fatture/edit.php:557 modules/fatture/row-list.php:12 #: modules/interventi/add_articolo.php:96 modules/interventi/add_righe.php:57 -#: modules/interventi/ajax_righe.php:21 modules/interventi/edit.php:127 +#: modules/interventi/row-list.php:21 modules/interventi/edit.php:127 #: modules/interventi/plugins/my_impianti.interventi.php:21 #: modules/interventi/widgets/interventi.pianificazionedashboard.interventi.php:55 #: modules/iva/add.php:11 modules/iva/edit.php:45 @@ -425,7 +425,7 @@ msgstr "" #: plugins/importFE/list.php:16 #: plugins/pianificazione_interventi/add_articolo.php:91 #: plugins/pianificazione_interventi/add_righe.php:55 -#: plugins/pianificazione_interventi/ajax_righe.php:16 +#: plugins/pianificazione_interventi/row-list.php:16 #: plugins/pianificazione_interventi/edit.php:44 #: plugins/pianificazione_interventi/pianficazione.php:103 #: plugins/rinnovi_contratti/edit.php:15 templates/contratti/body.php:79 @@ -470,7 +470,7 @@ msgstr "" #: modules/contratti/plugins/contratti.consuntivo.php:187 #: modules/contratti/row-list.php:13 modules/ddt/row-list.php:9 #: modules/fatture/row-list.php:13 modules/interventi/add_articolo.php:112 -#: modules/interventi/add_righe.php:66 modules/interventi/ajax_righe.php:22 +#: modules/interventi/add_righe.php:66 modules/interventi/row-list.php:22 #: modules/ordini/row-list.php:11 #: modules/preventivi/plugins/preventivi.consuntivo.php:141 #: modules/preventivi/plugins/preventivi.consuntivo.php:174 @@ -478,7 +478,7 @@ msgstr "" #: plugins/pianificazione_interventi/add_articolo.php:100 #: plugins/pianificazione_interventi/add_righe.php:64 #: plugins/pianificazione_interventi/ajax_articoli.php:17 -#: plugins/pianificazione_interventi/ajax_righe.php:17 +#: plugins/pianificazione_interventi/row-list.php:17 #: templates/contratti/body.php:80 templates/ddt/body.php:19 #: templates/fatture/body.php:22 templates/interventi/body.php:129 #: templates/ordini/body.php:38 templates/preventivi/body.php:65 @@ -520,13 +520,13 @@ msgstr "" #: modules/ddt/row-list.php:12 modules/fatture/add_intervento.php:100 #: modules/fatture/row-list.php:16 modules/fatture/row-list.php:359 #: modules/interventi/add_articolo.php:124 modules/interventi/add_righe.php:78 -#: modules/interventi/ajax_righe.php:28 modules/ordini/row-list.php:14 +#: modules/interventi/row-list.php:28 modules/ordini/row-list.php:14 #: modules/ordini/row-list.php:238 modules/preventivi/row-list.php:16 #: modules/preventivi/row-list.php:182 #: plugins/pianificazione_interventi/add_articolo.php:120 #: plugins/pianificazione_interventi/add_righe.php:76 #: plugins/pianificazione_interventi/ajax_articoli.php:27 -#: plugins/pianificazione_interventi/ajax_righe.php:23 +#: plugins/pianificazione_interventi/row-list.php:23 #: templates/interventi/body.php:415 templates/registro_iva/bottom.php:18 #: templates/registro_iva/top.php:39 msgid "Iva" @@ -2889,11 +2889,11 @@ msgstr "" #: modules/articoli/edit.php:118 #: modules/contratti/plugins/contratti.consuntivo.php:155 #: modules/contratti/plugins/contratti.consuntivo.php:188 -#: modules/interventi/ajax_righe.php:23 +#: modules/interventi/row-list.php:23 #: modules/preventivi/plugins/preventivi.consuntivo.php:142 #: modules/preventivi/plugins/preventivi.consuntivo.php:175 #: plugins/pianificazione_interventi/ajax_articoli.php:21 -#: plugins/pianificazione_interventi/ajax_righe.php:18 +#: plugins/pianificazione_interventi/row-list.php:18 msgid "Prezzo di acquisto" msgstr "" @@ -2916,11 +2916,11 @@ msgstr "" #: modules/articoli/edit.php:151 #: modules/contratti/plugins/contratti.consuntivo.php:156 #: modules/contratti/plugins/contratti.consuntivo.php:189 -#: modules/interventi/ajax_righe.php:27 +#: modules/interventi/row-list.php:27 #: modules/preventivi/plugins/preventivi.consuntivo.php:143 #: modules/preventivi/plugins/preventivi.consuntivo.php:176 #: plugins/pianificazione_interventi/ajax_articoli.php:26 -#: plugins/pianificazione_interventi/ajax_righe.php:22 +#: plugins/pianificazione_interventi/row-list.php:22 msgid "Prezzo di vendita" msgstr "" @@ -4067,7 +4067,7 @@ msgstr "" #: modules/contratti/row-list.php:17 modules/contratti/row-list.php:144 #: modules/ddt/row-list.php:13 modules/ddt/row-list.php:205 #: modules/fatture/row-list.php:295 modules/interventi/ajax_costi.php:78 -#: modules/interventi/ajax_righe.php:29 modules/ordini/row-list.php:15 +#: modules/interventi/row-list.php:29 modules/ordini/row-list.php:15 #: modules/ordini/row-list.php:200 modules/partitario/dettagli_movimento.php:14 #: modules/preventivi/row-list.php:17 modules/preventivi/row-list.php:144 #: plugins/pianificazione_interventi/ajax_articoli.php:28 @@ -4084,10 +4084,10 @@ msgid "Imponibile" msgstr "" #: modules/contratti/row-list.php:63 modules/ddt/row-list.php:105 -#: modules/fatture/row-list.php:188 modules/interventi/ajax_righe.php:94 +#: modules/fatture/row-list.php:188 modules/interventi/row-list.php:94 #: modules/ordini/row-list.php:107 modules/preventivi/row-list.php:63 #: plugins/pianificazione_interventi/ajax_articoli.php:99 -#: plugins/pianificazione_interventi/ajax_righe.php:65 +#: plugins/pianificazione_interventi/row-list.php:65 #: templates/contratti/body.php:133 templates/ddt/body.php:95 #: templates/fatture/body.php:109 templates/interventi/body.php:186 #: templates/ordini/body.php:116 templates/preventivi/body.php:119 @@ -4095,7 +4095,7 @@ msgid "sconto _TOT_ _TYPE_" msgstr "" #: modules/contratti/row-list.php:63 modules/ddt/row-list.php:105 -#: modules/fatture/row-list.php:188 modules/interventi/ajax_righe.php:94 +#: modules/fatture/row-list.php:188 modules/interventi/row-list.php:94 #: modules/ordini/row-list.php:107 modules/preventivi/row-list.php:63 msgid "maggiorazione _TOT_ _TYPE_" msgstr "" @@ -4515,13 +4515,13 @@ msgid "Note interne." msgstr "" #: modules/ddt/row-list.php:53 modules/fatture/row-list.php:117 -#: modules/interventi/ajax_righe.php:60 modules/ordini/row-list.php:55 +#: modules/interventi/row-list.php:60 modules/ordini/row-list.php:55 #: plugins/pianificazione_interventi/ajax_articoli.php:64 msgid "_NUM_ serial mancanti" msgstr "" #: modules/ddt/row-list.php:60 modules/fatture/row-list.php:123 -#: modules/interventi/ajax_righe.php:68 modules/ordini/row-list.php:62 +#: modules/interventi/row-list.php:68 modules/ordini/row-list.php:62 #: plugins/pianificazione_interventi/ajax_articoli.php:70 #: templates/ddt/body.php:59 templates/fatture/body.php:59 #: templates/interventi/body.php:164 templates/ordini/body.php:92 @@ -5049,7 +5049,7 @@ msgstr "" msgid "Campo" msgstr "" -#: modules/import/edit.php:81 modules/interventi/ajax_righe.php:34 +#: modules/import/edit.php:81 modules/interventi/row-list.php:34 msgid "#" msgstr "" @@ -5245,15 +5245,15 @@ msgstr "" msgid "Totale righe" msgstr "" -#: modules/interventi/ajax_righe.php:129 +#: modules/interventi/row-list.php:129 msgid "Modifica articoli" msgstr "" -#: modules/interventi/ajax_righe.php:139 +#: modules/interventi/row-list.php:139 msgid "Eliminare questa riga?" msgstr "" -#: modules/interventi/ajax_righe.php:153 +#: modules/interventi/row-list.php:153 msgid "Nessuna riga presente" msgstr "" @@ -7828,7 +7828,7 @@ msgid "Nessun promemoria pianificato" msgstr "" #: plugins/pianificazione_interventi/ajax_articoli.php:124 -#: plugins/pianificazione_interventi/ajax_righe.php:91 +#: plugins/pianificazione_interventi/row-list.php:91 msgid "Modifica spesa" msgstr "" @@ -7844,15 +7844,15 @@ msgstr "" msgid "Nessun articolo caricato" msgstr "" -#: plugins/pianificazione_interventi/ajax_righe.php:24 +#: plugins/pianificazione_interventi/row-list.php:24 msgid "Subtotale" msgstr "" -#: plugins/pianificazione_interventi/ajax_righe.php:95 +#: plugins/pianificazione_interventi/row-list.php:95 msgid "Eliminare questa spesa?" msgstr "" -#: plugins/pianificazione_interventi/ajax_righe.php:109 +#: plugins/pianificazione_interventi/row-list.php:109 msgid "Nessuna riga caricata" msgstr "" diff --git a/locale/en_GB/en_GB.mo b/locale/en_GB/en_GB.mo old mode 100644 new mode 100755 diff --git a/locale/en_GB/en_GB.po b/locale/en_GB/en_GB.po old mode 100644 new mode 100755 index d5d2bd10e..fbe8e9a11 --- a/locale/en_GB/en_GB.po +++ b/locale/en_GB/en_GB.po @@ -278,7 +278,7 @@ msgid "Creazione" msgstr "Creation" #: editor.php:332 include/common/form.php:19 modules/interventi/add_articolo.php:45 modules/interventi/add_righe.php:24 -#: modules/interventi/ajax_righe.php:131 modules/interventi/manage_sessione.php:15 modules/partitario/edit_conto.php:38 +#: modules/interventi/row-list.php:131 modules/interventi/manage_sessione.php:15 modules/partitario/edit_conto.php:38 #: modules/utenti/self.php:25 modules/utenti/user.php:83 plugins/dichiarazioni_intento/edit.php:61 #: plugins/pianificazione_interventi/add_articolo.php:41 plugins/pianificazione_interventi/add_righe.php:27 #: plugins/referenti/edit.php:46 plugins/sedi/edit.php:158 @@ -366,7 +366,7 @@ msgstr "Bill" #: modules/contratti/row-list.php:9 modules/contratti/widgets/contratti.pianificazionedashboard.interventi.php:54 #: modules/dashboard/actions.php:123 modules/ddt/edit.php:297 modules/ddt/row-list.php:8 modules/fatture/add_intervento.php:73 #: modules/fatture/edit.php:621 modules/fatture/row-list.php:9 modules/interventi/add_articolo.php:92 -#: modules/interventi/add_righe.php:53 modules/interventi/ajax_righe.php:17 modules/interventi/edit.php:127 +#: modules/interventi/add_righe.php:53 modules/interventi/row-list.php:17 modules/interventi/edit.php:127 #: modules/interventi/plugins/my_impianti.interventi.php:21 #: modules/interventi/widgets/interventi.pianificazionedashboard.interventi.php:43 modules/iva/add.php:11 #: modules/iva/edit.php:45 modules/liste_newsletter/edit.php:25 modules/my_impianti/edit.php:73 @@ -384,7 +384,7 @@ msgstr "Bill" #: modules/tipi_scadenze/add.php:13 modules/tipi_scadenze/edit.php:32 modules/voci_servizio/add.php:15 #: modules/voci_servizio/edit.php:16 modules/zone/add.php:15 modules/zone/edit.php:17 plugins/importFE/generate.php:270 #: plugins/importFE/list.php:16 plugins/pianificazione_interventi/add_articolo.php:91 -#: plugins/pianificazione_interventi/add_righe.php:55 plugins/pianificazione_interventi/ajax_righe.php:16 +#: plugins/pianificazione_interventi/add_righe.php:55 plugins/pianificazione_interventi/row-list.php:16 #: plugins/pianificazione_interventi/edit.php:44 plugins/pianificazione_interventi/pianficazione.php:103 #: plugins/rinnovi_contratti/edit.php:15 templates/contratti/body.php:79 templates/ddt/body.php:18 #: templates/fatture/body.php:21 templates/interventi/body.php:114 templates/interventi/body.php:136 @@ -428,12 +428,12 @@ msgstr "Receipts to import:_COUNT_" #: modules/articoli/plugins/articoli.movimenti.php:42 modules/articoli/widgets/articoli.dashboard.php:12 #: modules/contratti/plugins/contratti.consuntivo.php:154 modules/contratti/plugins/contratti.consuntivo.php:187 #: modules/contratti/row-list.php:10 modules/ddt/row-list.php:9 modules/fatture/row-list.php:10 -#: modules/interventi/add_articolo.php:108 modules/interventi/add_righe.php:62 modules/interventi/ajax_righe.php:18 +#: modules/interventi/add_articolo.php:108 modules/interventi/add_righe.php:62 modules/interventi/row-list.php:18 #: modules/ordini/row-list.php:10 modules/preventivi/plugins/preventivi.consuntivo.php:141 #: modules/preventivi/plugins/preventivi.consuntivo.php:174 modules/preventivi/row-list.php:10 #: modules/statistiche/edit.php:204 plugins/pianificazione_interventi/add_articolo.php:100 #: plugins/pianificazione_interventi/add_righe.php:64 plugins/pianificazione_interventi/ajax_articoli.php:17 -#: plugins/pianificazione_interventi/ajax_righe.php:17 templates/contratti/body.php:80 templates/ddt/body.php:19 +#: plugins/pianificazione_interventi/row-list.php:17 templates/contratti/body.php:80 templates/ddt/body.php:19 #: templates/fatture/body.php:22 templates/interventi/body.php:140 templates/magazzino_inventario/body.php:81 #: templates/ordini/body.php:38 templates/preventivi/body.php:65 msgid "Q.tà" @@ -467,10 +467,10 @@ msgstr "Total" #: include/common/riga.php:13 include/common/sconto.php:29 modules/contratti/row-list.php:13 #: modules/contratti/row-list.php:185 modules/ddt/row-list.php:12 modules/fatture/add_intervento.php:96 #: modules/fatture/row-list.php:13 modules/fatture/row-list.php:360 modules/interventi/add_articolo.php:120 -#: modules/interventi/add_righe.php:74 modules/interventi/ajax_righe.php:24 modules/ordini/row-list.php:13 +#: modules/interventi/add_righe.php:74 modules/interventi/row-list.php:24 modules/ordini/row-list.php:13 #: modules/ordini/row-list.php:230 modules/preventivi/row-list.php:13 modules/preventivi/row-list.php:185 #: plugins/pianificazione_interventi/add_articolo.php:120 plugins/pianificazione_interventi/add_righe.php:76 -#: plugins/pianificazione_interventi/ajax_articoli.php:27 plugins/pianificazione_interventi/ajax_righe.php:23 +#: plugins/pianificazione_interventi/ajax_articoli.php:27 plugins/pianificazione_interventi/row-list.php:23 #: templates/interventi/body.php:426 templates/registro_iva/bottom.php:18 templates/registro_iva/top.php:41 msgid "Iva" msgstr "Iva" @@ -2858,9 +2858,9 @@ msgid "Acquisto" msgstr "Purchase " #: modules/articoli/edit.php:132 modules/contratti/plugins/contratti.consuntivo.php:155 -#: modules/contratti/plugins/contratti.consuntivo.php:188 modules/interventi/ajax_righe.php:19 +#: modules/contratti/plugins/contratti.consuntivo.php:188 modules/interventi/row-list.php:19 #: modules/preventivi/plugins/preventivi.consuntivo.php:142 modules/preventivi/plugins/preventivi.consuntivo.php:175 -#: plugins/pianificazione_interventi/ajax_articoli.php:21 plugins/pianificazione_interventi/ajax_righe.php:18 +#: plugins/pianificazione_interventi/ajax_articoli.php:21 plugins/pianificazione_interventi/row-list.php:18 #: templates/magazzino_inventario/body.php:82 msgid "Prezzo di acquisto" msgstr "Purchase price" @@ -2888,9 +2888,9 @@ msgid "Scorpora iva dal prezzo di vendita." msgstr "Spin off VAT from the sale price." #: modules/articoli/edit.php:171 modules/contratti/plugins/contratti.consuntivo.php:156 -#: modules/contratti/plugins/contratti.consuntivo.php:189 modules/interventi/ajax_righe.php:23 +#: modules/contratti/plugins/contratti.consuntivo.php:189 modules/interventi/row-list.php:23 #: modules/preventivi/plugins/preventivi.consuntivo.php:143 modules/preventivi/plugins/preventivi.consuntivo.php:176 -#: plugins/pianificazione_interventi/ajax_articoli.php:26 plugins/pianificazione_interventi/ajax_righe.php:22 +#: plugins/pianificazione_interventi/ajax_articoli.php:26 plugins/pianificazione_interventi/row-list.php:22 #: templates/magazzino_inventario/body.php:80 msgid "Prezzo di vendita" msgstr "Sale price" @@ -4151,7 +4151,7 @@ msgstr "Unitary cost" #: modules/contratti/row-list.php:14 modules/contratti/row-list.php:147 modules/ddt/row-list.php:13 #: modules/ddt/row-list.php:191 modules/fatture/row-list.php:296 modules/interventi/ajax_costi.php:74 -#: modules/interventi/ajax_righe.php:25 modules/ordini/row-list.php:14 modules/ordini/row-list.php:192 +#: modules/interventi/row-list.php:25 modules/ordini/row-list.php:14 modules/ordini/row-list.php:192 #: modules/preventivi/row-list.php:14 modules/preventivi/row-list.php:147 #: plugins/pianificazione_interventi/ajax_articoli.php:28 templates/contratti/body.php:85 templates/contratti/body.php:189 #: templates/contratti_cons/top.php:60 templates/fatture/footer.php:131 templates/interventi/body.php:148 @@ -4163,15 +4163,15 @@ msgid "Imponibile" msgstr "Taxable" #: modules/contratti/row-list.php:62 modules/ddt/row-list.php:102 modules/fatture/row-list.php:194 -#: modules/interventi/ajax_righe.php:90 modules/ordini/row-list.php:104 modules/preventivi/row-list.php:62 -#: plugins/pianificazione_interventi/ajax_articoli.php:99 plugins/pianificazione_interventi/ajax_righe.php:65 +#: modules/interventi/row-list.php:90 modules/ordini/row-list.php:104 modules/preventivi/row-list.php:62 +#: plugins/pianificazione_interventi/ajax_articoli.php:99 plugins/pianificazione_interventi/row-list.php:65 #: templates/contratti/body.php:133 templates/ddt/body.php:95 templates/fatture/body.php:109 templates/interventi/body.php:197 #: templates/ordini/body.php:116 templates/preventivi/body.php:119 msgid "sconto _TOT_ _TYPE_" msgstr "discount _TOT_ _TYPE_" #: modules/contratti/row-list.php:62 modules/ddt/row-list.php:102 modules/fatture/row-list.php:194 -#: modules/interventi/ajax_righe.php:90 modules/ordini/row-list.php:104 modules/preventivi/row-list.php:62 +#: modules/interventi/row-list.php:90 modules/ordini/row-list.php:104 modules/preventivi/row-list.php:62 #, fuzzy #| msgid "sconto _TOT_ _TYPE_" msgid "maggiorazione _TOT_ _TYPE_" @@ -4592,12 +4592,12 @@ msgstr "Additional notes" msgid "Note interne." msgstr "Internal note." -#: modules/ddt/row-list.php:50 modules/fatture/row-list.php:123 modules/interventi/ajax_righe.php:56 +#: modules/ddt/row-list.php:50 modules/fatture/row-list.php:123 modules/interventi/row-list.php:56 #: modules/ordini/row-list.php:52 plugins/pianificazione_interventi/ajax_articoli.php:64 msgid "_NUM_ serial mancanti" msgstr "_NUM_ serial missing " -#: modules/ddt/row-list.php:57 modules/fatture/row-list.php:129 modules/interventi/ajax_righe.php:64 +#: modules/ddt/row-list.php:57 modules/fatture/row-list.php:129 modules/interventi/row-list.php:64 #: modules/ordini/row-list.php:59 plugins/pianificazione_interventi/ajax_articoli.php:70 templates/ddt/body.php:59 #: templates/fatture/body.php:59 templates/interventi/body.php:175 templates/ordini/body.php:92 #, fuzzy @@ -5293,7 +5293,7 @@ msgstr "Column _NUM_" msgid "Campo" msgstr "Field" -#: modules/import/edit.php:81 modules/interventi/ajax_righe.php:30 +#: modules/import/edit.php:81 modules/interventi/row-list.php:30 msgid "#" msgstr "#" @@ -5494,17 +5494,17 @@ msgstr "Total travel" msgid "Totale righe" msgstr "Total travel" -#: modules/interventi/ajax_righe.php:125 +#: modules/interventi/row-list.php:125 msgid "Modifica articoli" msgstr "Edit articles" -#: modules/interventi/ajax_righe.php:149 +#: modules/interventi/row-list.php:149 #, fuzzy #| msgid "Nessuna spesa presente" msgid "Nessuna riga presente" msgstr "No expense present" -#: modules/interventi/ajax_righe.php:156 +#: modules/interventi/row-list.php:156 #, fuzzy #| msgid "Eliminare questa spesa?" msgid "Eliminare questa riga?" @@ -8493,7 +8493,7 @@ msgstr "None end date of contract or the last one has already passed, impossible msgid "Nessun promemoria pianificato" msgstr "None reminder planned" -#: plugins/pianificazione_interventi/ajax_articoli.php:124 plugins/pianificazione_interventi/ajax_righe.php:91 +#: plugins/pianificazione_interventi/ajax_articoli.php:124 plugins/pianificazione_interventi/row-list.php:91 msgid "Modifica spesa" msgstr "Spending change" @@ -8510,15 +8510,15 @@ msgstr "Delete this material?" msgid "Nessun articolo caricato" msgstr "None article loaded" -#: plugins/pianificazione_interventi/ajax_righe.php:24 +#: plugins/pianificazione_interventi/row-list.php:24 msgid "Subtotale" msgstr "Subtotal" -#: plugins/pianificazione_interventi/ajax_righe.php:95 +#: plugins/pianificazione_interventi/row-list.php:95 msgid "Eliminare questa spesa?" msgstr "Delete this expense?" -#: plugins/pianificazione_interventi/ajax_righe.php:109 +#: plugins/pianificazione_interventi/row-list.php:109 #, fuzzy msgid "Nessuna riga caricata" msgstr "None rows loaded" diff --git a/locale/it_IT/.gitignore b/locale/it_IT/.gitignore old mode 100644 new mode 100755 diff --git a/log.php b/log.php old mode 100644 new mode 100755 diff --git a/logs/.htaccess b/logs/.htaccess old mode 100644 new mode 100755 diff --git a/mail.php b/mail.php old mode 100644 new mode 100755 diff --git a/modules/aggiornamenti/actions.php b/modules/aggiornamenti/actions.php old mode 100644 new mode 100755 diff --git a/modules/aggiornamenti/edit.php b/modules/aggiornamenti/edit.php old mode 100644 new mode 100755 diff --git a/modules/aggiornamenti/modutil.php b/modules/aggiornamenti/modutil.php old mode 100644 new mode 100755 diff --git a/modules/aggiornamenti/src/UpdateHook.php b/modules/aggiornamenti/src/UpdateHook.php old mode 100644 new mode 100755 diff --git a/modules/aggiornamenti/upload_modules.php b/modules/aggiornamenti/upload_modules.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/actions.php b/modules/anagrafiche/actions.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/add.php b/modules/anagrafiche/add.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/ajax/complete.php b/modules/anagrafiche/ajax/complete.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/ajax/search.php b/modules/anagrafiche/ajax/search.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/ajax/select.php b/modules/anagrafiche/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/bulk.php b/modules/anagrafiche/bulk.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/buttons.php b/modules/anagrafiche/buttons.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/import.php b/modules/anagrafiche/import.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/init.php b/modules/anagrafiche/init.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/src/API/v1/Anagrafiche.php b/modules/anagrafiche/src/API/v1/Anagrafiche.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/src/API/v1/Sedi.php b/modules/anagrafiche/src/API/v1/Sedi.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/src/Anagrafica.php b/modules/anagrafiche/src/Anagrafica.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/src/Nazione.php b/modules/anagrafiche/src/Nazione.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/src/Tipo.php b/modules/anagrafiche/src/Tipo.php old mode 100644 new mode 100755 diff --git a/modules/anagrafiche/validation.php b/modules/anagrafiche/validation.php old mode 100644 new mode 100755 diff --git a/modules/articoli/actions.php b/modules/articoli/actions.php old mode 100644 new mode 100755 diff --git a/modules/articoli/add.php b/modules/articoli/add.php old mode 100644 new mode 100755 diff --git a/modules/articoli/ajax/complete.php b/modules/articoli/ajax/complete.php old mode 100644 new mode 100755 diff --git a/modules/articoli/ajax/search.php b/modules/articoli/ajax/search.php old mode 100644 new mode 100755 diff --git a/modules/articoli/ajax/select.php b/modules/articoli/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/articoli/buttons.php b/modules/articoli/buttons.php old mode 100644 new mode 100755 diff --git a/modules/articoli/edit.php b/modules/articoli/edit.php old mode 100644 new mode 100755 diff --git a/modules/articoli/import.php b/modules/articoli/import.php old mode 100644 new mode 100755 diff --git a/modules/articoli/init.php b/modules/articoli/init.php old mode 100644 new mode 100755 diff --git a/modules/articoli/modutil.php b/modules/articoli/modutil.php old mode 100644 new mode 100755 diff --git a/modules/articoli/plugins/articoli.giacenze.php b/modules/articoli/plugins/articoli.giacenze.php old mode 100644 new mode 100755 diff --git a/modules/articoli/plugins/articoli.lotti.php b/modules/articoli/plugins/articoli.lotti.php old mode 100644 new mode 100755 index ba2effa1d..48a22a183 --- a/modules/articoli/plugins/articoli.lotti.php +++ b/modules/articoli/plugins/articoli.lotti.php @@ -163,7 +163,7 @@ for ($i = 0; $i < count($rs2); ++$i) { $module_id = Modules::get('Interventi')['id']; // Ricerca inserimenti su interventi - $query = 'SELECT mg_articoli_interventi.*, in_interventi.codice, ( SELECT orario_inizio FROM in_interventi_tecnici WHERE idintervento=mg_articoli_interventi.idintervento LIMIT 0,1 ) AS data FROM mg_articoli_interventi JOIN in_interventi ON in_interventi.id = mg_articoli_interventi.idintervento WHERE mg_articoli_interventi.id='.prepare($vendita['id_riga_intervento']); + $query = 'SELECT in_righe_interventi.*, in_interventi.codice, ( SELECT orario_inizio FROM in_interventi_tecnici WHERE idintervento=in_righe_interventi.idintervento LIMIT 0,1 ) AS data FROM in_righe_interventi JOIN in_interventi ON in_interventi.id = in_righe_interventi.idintervento WHERE in_righe_interventi.id='.prepare($vendita['id_riga_intervento']); $data = $dbo->fetchArray($query); $id = $data[0]['idintervento']; diff --git a/modules/articoli/plugins/articoli.movimenti.php b/modules/articoli/plugins/articoli.movimenti.php old mode 100644 new mode 100755 diff --git a/modules/articoli/src/API/v1/Articoli.php b/modules/articoli/src/API/v1/Articoli.php old mode 100644 new mode 100755 diff --git a/modules/articoli/src/API/v1/Movimenti.php b/modules/articoli/src/API/v1/Movimenti.php old mode 100644 new mode 100755 diff --git a/modules/articoli/src/Articolo.php b/modules/articoli/src/Articolo.php old mode 100644 new mode 100755 diff --git a/modules/articoli/src/Categoria.php b/modules/articoli/src/Categoria.php old mode 100644 new mode 100755 diff --git a/modules/articoli/validation.php b/modules/articoli/validation.php old mode 100644 new mode 100755 diff --git a/modules/articoli/widgets/articoli.dashboard.php b/modules/articoli/widgets/articoli.dashboard.php old mode 100644 new mode 100755 diff --git a/modules/backups/actions.php b/modules/backups/actions.php old mode 100644 new mode 100755 diff --git a/modules/backups/edit.php b/modules/backups/edit.php old mode 100644 new mode 100755 diff --git a/modules/backups/src/BackupHook.php b/modules/backups/src/BackupHook.php old mode 100644 new mode 100755 diff --git a/modules/banche/actions.php b/modules/banche/actions.php old mode 100644 new mode 100755 diff --git a/modules/banche/add.php b/modules/banche/add.php old mode 100644 new mode 100755 diff --git a/modules/banche/edit.php b/modules/banche/edit.php old mode 100644 new mode 100755 diff --git a/modules/banche/init.php b/modules/banche/init.php old mode 100644 new mode 100755 diff --git a/modules/beni/actions.php b/modules/beni/actions.php old mode 100644 new mode 100755 diff --git a/modules/beni/add.php b/modules/beni/add.php old mode 100644 new mode 100755 diff --git a/modules/beni/ajax/select.php b/modules/beni/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/beni/edit.php b/modules/beni/edit.php old mode 100644 new mode 100755 diff --git a/modules/beni/init.php b/modules/beni/init.php old mode 100644 new mode 100755 diff --git a/modules/categorie_articoli/actions.php b/modules/categorie_articoli/actions.php old mode 100644 new mode 100755 diff --git a/modules/categorie_articoli/add.php b/modules/categorie_articoli/add.php old mode 100644 new mode 100755 diff --git a/modules/categorie_articoli/edit.php b/modules/categorie_articoli/edit.php old mode 100644 new mode 100755 diff --git a/modules/categorie_articoli/init.php b/modules/categorie_articoli/init.php old mode 100644 new mode 100755 diff --git a/modules/categorie_articoli/row-list.php b/modules/categorie_articoli/row-list.php old mode 100644 new mode 100755 diff --git a/modules/categorie_documenti/actions.php b/modules/categorie_documenti/actions.php old mode 100644 new mode 100755 diff --git a/modules/categorie_documenti/add.php b/modules/categorie_documenti/add.php old mode 100644 new mode 100755 diff --git a/modules/categorie_documenti/ajax/select.php b/modules/categorie_documenti/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/categorie_documenti/edit.php b/modules/categorie_documenti/edit.php old mode 100644 new mode 100755 diff --git a/modules/categorie_documenti/init.php b/modules/categorie_documenti/init.php old mode 100644 new mode 100755 diff --git a/modules/categorie_documenti/src/Categoria.php b/modules/categorie_documenti/src/Categoria.php old mode 100644 new mode 100755 diff --git a/modules/categorie_impianti/actions.php b/modules/categorie_impianti/actions.php old mode 100644 new mode 100755 diff --git a/modules/categorie_impianti/add.php b/modules/categorie_impianti/add.php old mode 100644 new mode 100755 diff --git a/modules/categorie_impianti/edit.php b/modules/categorie_impianti/edit.php old mode 100644 new mode 100755 diff --git a/modules/categorie_impianti/init.php b/modules/categorie_impianti/init.php old mode 100644 new mode 100755 diff --git a/modules/causali/actions.php b/modules/causali/actions.php old mode 100644 new mode 100755 diff --git a/modules/causali/add.php b/modules/causali/add.php old mode 100644 new mode 100755 diff --git a/modules/causali/ajax/select.php b/modules/causali/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/causali/edit.php b/modules/causali/edit.php old mode 100644 new mode 100755 diff --git a/modules/causali/init.php b/modules/causali/init.php old mode 100644 new mode 100755 diff --git a/modules/checklists/actions.php b/modules/checklists/actions.php old mode 100644 new mode 100755 diff --git a/modules/checklists/add.php b/modules/checklists/add.php old mode 100644 new mode 100755 diff --git a/modules/checklists/components/add-check.php b/modules/checklists/components/add-check.php old mode 100644 new mode 100755 diff --git a/modules/checklists/components/add-checklist.php b/modules/checklists/components/add-checklist.php old mode 100644 new mode 100755 diff --git a/modules/checklists/edit.php b/modules/checklists/edit.php old mode 100644 new mode 100755 diff --git a/modules/checklists/init.php b/modules/checklists/init.php old mode 100644 new mode 100755 diff --git a/modules/checklists/js/checklist.js b/modules/checklists/js/checklist.js old mode 100644 new mode 100755 diff --git a/modules/checklists/modutil.php b/modules/checklists/modutil.php old mode 100644 new mode 100755 diff --git a/modules/checklists/src/Check.php b/modules/checklists/src/Check.php old mode 100644 new mode 100755 diff --git a/modules/checklists/src/Checklist.php b/modules/checklists/src/Checklist.php old mode 100644 new mode 100755 diff --git a/modules/checklists/src/ChecklistItem.php b/modules/checklists/src/ChecklistItem.php old mode 100644 new mode 100755 diff --git a/modules/checklists/src/Traits/ChecklistTrait.php b/modules/checklists/src/Traits/ChecklistTrait.php old mode 100644 new mode 100755 diff --git a/modules/contratti/actions.php b/modules/contratti/actions.php old mode 100644 new mode 100755 diff --git a/modules/contratti/add.php b/modules/contratti/add.php old mode 100644 new mode 100755 diff --git a/modules/contratti/ajax.php b/modules/contratti/ajax.php old mode 100644 new mode 100755 diff --git a/modules/contratti/ajax/select.php b/modules/contratti/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/contratti/bulk.php b/modules/contratti/bulk.php old mode 100644 new mode 100755 diff --git a/modules/contratti/buttons.php b/modules/contratti/buttons.php old mode 100644 new mode 100755 diff --git a/modules/contratti/crea_documento.php b/modules/contratti/crea_documento.php old mode 100644 new mode 100755 diff --git a/modules/contratti/edit.php b/modules/contratti/edit.php old mode 100644 new mode 100755 diff --git a/modules/contratti/init.php b/modules/contratti/init.php old mode 100644 new mode 100755 diff --git a/modules/contratti/js/contratti_helper.js b/modules/contratti/js/contratti_helper.js old mode 100644 new mode 100755 diff --git a/modules/contratti/plugins/contratti.consuntivo.php b/modules/contratti/plugins/contratti.consuntivo.php old mode 100644 new mode 100755 index 25fb7d41f..25144730c --- a/modules/contratti/plugins/contratti.consuntivo.php +++ b/modules/contratti/plugins/contratti.consuntivo.php @@ -2,44 +2,11 @@ include_once __DIR__.'/../../../core.php'; -/* CONSUNTIVO */ - -// Salvo i colori e gli stati degli stati intervento su un array -$colori = []; -$stati = []; -$queryc = 'SELECT * FROM in_statiintervento'; -$rsc = $dbo->fetchArray($queryc); -for ($i = 0; $i < sizeof($rsc); ++$i) { - $colori[$rsc[$i]['idstatointervento']] = $rsc[$i]['colore']; - $stati[$rsc[$i]['idstatointervento']] = $rsc[$i]['descrizione']; -} - -$totale_costo = 0; -$totale_addebito = 0; -$totale = 0; - -$totale_stato = []; +use Modules\Interventi\Intervento; // Tabella con riepilogo interventi -$rsi = $dbo->fetchArray('SELECT in_interventi.id, in_interventi.idstatointervento, - (SELECT completato FROM in_statiintervento WHERE in_statiintervento.idstatointervento = in_interventi.idstatointervento) AS completato, - (SELECT MIN(orario_inizio) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS inizio, - (SELECT SUM(ore) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS ore, - (SELECT MIN(km) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS km - FROM co_promemoria - INNER JOIN in_interventi ON co_promemoria.idintervento=in_interventi.id - WHERE co_promemoria.idcontratto='.prepare($id_record).' -UNION - SELECT in_interventi.id, in_interventi.idstatointervento, - (SELECT completato FROM in_statiintervento WHERE in_statiintervento.idstatointervento = in_interventi.idstatointervento) AS completato, - (SELECT MIN(orario_inizio) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS inizio, - (SELECT SUM(ore) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS ore, - (SELECT MIN(km) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS km - FROM in_interventi - WHERE id_contratto = '.prepare($id_record).' -ORDER BY id DESC'); - -if (!empty($rsi)) { +$interventi = Intervento::where('id_contratto', $id_record)->get(); +if (!empty($interventi)) { echo ' @@ -52,52 +19,47 @@ if (!empty($rsi)) { '; // Tabella con i dati - foreach ($rsi as $int) { - $intervento = \Modules\Interventi\Intervento::find($int['id']); - $totale_stato[$int['idstatointervento']] = sum($totale_stato[$int['idstatointervento']], $intervento->totale_imponibile); - - // Riga intervento singolo + foreach ($interventi as $intervento) { + // Riga per il singolo intervento echo ' - + '; // Riga con dettagli echo ' - +
- - '.Modules::link('Interventi', $int['id'], tr('Intervento _NUM_ del _DATE_', [ - '_NUM_' => $int['codice'], - '_DATE_' => Translator::dateToLocale($int['inizio']), + + '.Modules::link('Interventi', $intervento->id, tr('Intervento num. _NUM_ del _DATE_', [ + '_NUM_' => $intervento->codice, + '_DATE_' => Translator::dateToLocale($intervento->inizio), ])).' - '.Translator::numberToLocale($int['ore']).' + '.numberFormat($intervento->ore_totali).' - '.Translator::numberToLocale($int['km']).' + '.numberFormat($intervento->km_totali).' - '.Translator::numberToLocale($intervento->spesa).' + '.moneyFormat($intervento->spesa).' - '.Translator::numberToLocale($intervento->imponibile).' + '.moneyFormat($intervento->imponibile).' - '.Translator::numberToLocale($intervento->totale_imponibile).' + '.moneyFormat($intervento->totale_imponibile).'
'; - /** - * Lettura sessioni di lavoro. - */ - $rst = $dbo->fetchArray('SELECT in_interventi_tecnici.*, ragione_sociale FROM in_interventi_tecnici LEFT OUTER JOIN an_anagrafiche ON in_interventi_tecnici.idtecnico=an_anagrafiche.idanagrafica WHERE idintervento='.prepare($int['id'])); - if (!empty($rst)) { + // Lettura sessioni di lavoro + $sessioni = $intervento->sessioni; + if (!empty($sessioni)) { echo ' @@ -113,28 +75,23 @@ if (!empty($rsi)) { '; - foreach ($rst as $r) { + foreach ($sessioni as $sessione) { // Visualizzo lo sconto su ore o km se c'è - $sconto_ore = ($r['sconto'] != 0) ? '
'.moneyFormat(-$r['sconto']).'' : ''; - $sconto_km = ($r['scontokm'] != 0) ? '
'.moneyFormat(-$r['scontokm']).'' : ''; - - // Aggiungo lo sconto globale nel totale ore - if ($int['sconto_globale'] > 0) { - $sconto_ore .= ' '.moneyFormat(-$int['sconto_globale']).''; - } + $sconto_ore = !empty($sessione->sconto_totale_manodopera) ? '
'.moneyFormat(-$sessione->sconto_totale_manodopera).'' : ''; + $sconto_km = !empty($sessione->sconto_totale_viaggio) ? '
'.moneyFormat(-$sessione->sconto_totale_viaggio).'' : ''; echo ' - - - - - - - - - - + + + + + + + + + + '; } @@ -142,11 +99,9 @@ if (!empty($rsi)) {
'.tr('Diritto ch.').'
'.$r['ragione_sociale'].''.$r['idtipointervento'].''.Translator::numberToLocale($r['ore']).''.Translator::numberToLocale($r['km']).''.Translator::numberToLocale($r['prezzo_ore_consuntivo_tecnico']).''.Translator::numberToLocale($r['prezzo_km_consuntivo_tecnico']).''.Translator::numberToLocale($r['prezzo_dirittochiamata_tecnico']).''.Translator::numberToLocale($r['prezzo_ore_consuntivo']).$sconto_ore.''.Translator::numberToLocale($r['prezzo_km_consuntivo']).$sconto_km.''.Translator::numberToLocale($r['prezzo_dirittochiamata']).''.$sessione->anagrafica->ragione_sociale.''.$sessione->tipo->descrizione.''.numberFormat($sessione->ore).''.numberFormat($sessione->km).''.moneyFormat($sessione->costo_manodopera).''.moneyFormat($sessione->costo_viaggio).''.moneyFormat($sessione->costo_diritto_chiamata).''.moneyFormat($sessione->prezzo_manodopera).$sconto_ore.''.moneyFormat($sessione->prezzo_viaggio).$sconto_km.''.moneyFormat($sessione->prezzo_diritto_chiamata).'
'; } - /** - * Lettura articoli utilizzati. - */ - $rst = $dbo->fetchArray('SELECT * FROM mg_articoli_interventi WHERE idintervento='.prepare($int['id'])); - if (!empty($rst)) { + // Lettura articoli utilizzati + $articoli = $intervento->articoli; + if (!$articoli->isEmpty()) { echo ' @@ -156,18 +111,17 @@ if (!empty($rsi)) { '; - foreach ($rst as $r) { - // Visualizzo lo sconto su ore o km se c'è - $sconto = ($r['sconto'] != 0) ? '
'.moneyFormat(-$r['sconto']).'' : ''; + foreach ($articoli as $articolo) { + $sconto = !empty($articolo->sconto) ? '
'.moneyFormat(-$articolo->sconto).'' : ''; echo ' - - - + + + '; } @@ -175,11 +129,9 @@ if (!empty($rsi)) {
'.tr('Prezzo di vendita').'
- '.Modules::link('Articoli', $r['idarticolo'], $r['descrizione']).(!empty($extra) ? ''.implode(', ', $extra).'' : '').' + '.Modules::link('Articoli', $articolo->idarticolo, $articolo->descrizione).' '.Translator::numberToLocale($r['qta'], 'qta').''.Translator::numberToLocale($r['prezzo_acquisto'] * $r['qta']).''.Translator::numberToLocale($r['prezzo_vendita'] * $r['qta']).$sconto.''.numberFormat($articolo->qta, 'qta').''.moneyFormat($articolo->spesa).''.moneyFormat($articolo->imponibile).$sconto.'
'; } - /** - * Lettura spese aggiuntive. - */ - $rst = $dbo->fetchArray('SELECT * FROM in_righe_interventi WHERE idintervento='.prepare($int['id'])); - if (!empty($rst)) { + // Lettura spese aggiuntive + $righe = $intervento->righe; + if (!$righe->isEmpty()) { echo ' @@ -189,18 +141,17 @@ if (!empty($rsi)) { '; - foreach ($rst as $r) { - // Visualizzo lo sconto su ore o km se c'è - $sconto = ($r['sconto'] != 0) ? '
'.moneyFormat(-$r['sconto']).'' : ''; + foreach ($righe as $riga) { + $sconto = !empty($riga->sconto) ? '
'.moneyFormat(-$riga->sconto).'' : ''; echo ' - - - + + + '; } @@ -211,15 +162,15 @@ if (!empty($rsi)) { echo ' '; - - $totale_ore_interventi += $int['ore']; - $totale_ore_completate += !empty($int['completato']) ? $int['ore'] : 0; - $totale_km += $int['km']; - $totale_costo += $intervento->spesa; - $totale_addebito += $intervento->imponibile; - $totale += $intervento->totale_imponibile; } + $array_interventi = $interventi->toArray(); + $totale_ore = sum(array_column($array_interventi, 'ore_totali')); + $totale_km = sum(array_column($array_interventi, 'km_totali')); + $totale_costo = sum(array_column($array_interventi, 'spesa')); + $totale_addebito = sum(array_column($array_interventi, 'imponibile')); + $totale = sum(array_column($array_interventi, 'totale_imponibile')); + // Totali echo ' @@ -229,27 +180,27 @@ if (!empty($rsi)) { echo ' '; echo ' '; echo ' '; echo ' '; echo ' '; @@ -261,17 +212,21 @@ if (!empty($rsi)) { '; - foreach ($totale_stato as $stato => $tot) { + $stati = $interventi->groupBy('idstatointervento'); + foreach ($stati as $interventi_collegati) { + $stato = $interventi_collegati->first()->stato; + $totale_stato = sum(array_column($interventi_collegati->toArray(), 'totale_imponibile')); + echo ' - '; } @@ -316,11 +271,11 @@ if (!empty($totale_ore_contratto)) { - + - + @@ -328,7 +283,7 @@ if (!empty($totale_ore_contratto)) { - + diff --git a/modules/contratti/row-add.php b/modules/contratti/row-add.php old mode 100644 new mode 100755 diff --git a/modules/contratti/row-edit.php b/modules/contratti/row-edit.php old mode 100644 new mode 100755 diff --git a/modules/contratti/row-list.php b/modules/contratti/row-list.php old mode 100644 new mode 100755 diff --git a/modules/contratti/src/Components/Articolo.php b/modules/contratti/src/Components/Articolo.php old mode 100644 new mode 100755 diff --git a/modules/contratti/src/Components/Descrizione.php b/modules/contratti/src/Components/Descrizione.php old mode 100644 new mode 100755 diff --git a/modules/contratti/src/Components/RelationTrait.php b/modules/contratti/src/Components/RelationTrait.php old mode 100644 new mode 100755 diff --git a/modules/contratti/src/Components/Riga.php b/modules/contratti/src/Components/Riga.php old mode 100644 new mode 100755 diff --git a/modules/contratti/src/Components/Sconto.php b/modules/contratti/src/Components/Sconto.php old mode 100644 new mode 100755 diff --git a/modules/contratti/src/Contratto.php b/modules/contratti/src/Contratto.php old mode 100644 new mode 100755 diff --git a/modules/contratti/src/Stato.php b/modules/contratti/src/Stato.php old mode 100644 new mode 100755 diff --git a/modules/contratti/variables.php b/modules/contratti/variables.php old mode 100644 new mode 100755 diff --git a/modules/contratti/widgets/contratti.pianificazionedashboard.interventi.php b/modules/contratti/widgets/contratti.pianificazionedashboard.interventi.php old mode 100644 new mode 100755 diff --git a/modules/contratti/widgets/contratti.pianificazionedashboard.php b/modules/contratti/widgets/contratti.pianificazionedashboard.php old mode 100644 new mode 100755 diff --git a/modules/contratti/widgets/contratti.ratecontrattuali.php b/modules/contratti/widgets/contratti.ratecontrattuali.php old mode 100644 new mode 100755 diff --git a/modules/contratti/widgets/contratti_scadenza.dashboard.php b/modules/contratti/widgets/contratti_scadenza.dashboard.php old mode 100644 new mode 100755 diff --git a/modules/custom_fields/actions.php b/modules/custom_fields/actions.php old mode 100644 new mode 100755 diff --git a/modules/custom_fields/add.php b/modules/custom_fields/add.php old mode 100644 new mode 100755 diff --git a/modules/custom_fields/content-info.php b/modules/custom_fields/content-info.php old mode 100644 new mode 100755 diff --git a/modules/custom_fields/edit.php b/modules/custom_fields/edit.php old mode 100644 new mode 100755 diff --git a/modules/custom_fields/init.php b/modules/custom_fields/init.php old mode 100644 new mode 100755 diff --git a/modules/dashboard/actions.php b/modules/dashboard/actions.php old mode 100644 new mode 100755 diff --git a/modules/dashboard/edit.php b/modules/dashboard/edit.php old mode 100644 new mode 100755 diff --git a/modules/dashboard/widgets/notifiche.php b/modules/dashboard/widgets/notifiche.php old mode 100644 new mode 100755 diff --git a/modules/dashboard/widgets/stampa_calendario.dashboard.php b/modules/dashboard/widgets/stampa_calendario.dashboard.php old mode 100644 new mode 100755 diff --git a/modules/ddt/actions.php b/modules/ddt/actions.php old mode 100644 new mode 100755 diff --git a/modules/ddt/add.php b/modules/ddt/add.php old mode 100644 new mode 100755 diff --git a/modules/ddt/add_ordine.php b/modules/ddt/add_ordine.php old mode 100644 new mode 100755 diff --git a/modules/ddt/ajax/search.php b/modules/ddt/ajax/search.php old mode 100644 new mode 100755 diff --git a/modules/ddt/bulk.php b/modules/ddt/bulk.php old mode 100644 new mode 100755 diff --git a/modules/ddt/buttons.php b/modules/ddt/buttons.php old mode 100644 new mode 100755 diff --git a/modules/ddt/crea_documento.php b/modules/ddt/crea_documento.php old mode 100644 new mode 100755 diff --git a/modules/ddt/edit.php b/modules/ddt/edit.php old mode 100644 new mode 100755 diff --git a/modules/ddt/init.php b/modules/ddt/init.php old mode 100644 new mode 100755 diff --git a/modules/ddt/row-add.php b/modules/ddt/row-add.php old mode 100644 new mode 100755 diff --git a/modules/ddt/row-edit.php b/modules/ddt/row-edit.php old mode 100644 new mode 100755 diff --git a/modules/ddt/row-list.php b/modules/ddt/row-list.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/Components/Articolo.php b/modules/ddt/src/Components/Articolo.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/Components/Descrizione.php b/modules/ddt/src/Components/Descrizione.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/Components/RelationTrait.php b/modules/ddt/src/Components/RelationTrait.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/Components/Riga.php b/modules/ddt/src/Components/Riga.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/Components/Sconto.php b/modules/ddt/src/Components/Sconto.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/DDT.php b/modules/ddt/src/DDT.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/Stato.php b/modules/ddt/src/Stato.php old mode 100644 new mode 100755 diff --git a/modules/ddt/src/Tipo.php b/modules/ddt/src/Tipo.php old mode 100644 new mode 100755 diff --git a/modules/ddt/variables.php b/modules/ddt/variables.php old mode 100644 new mode 100755 diff --git a/modules/emails/actions.php b/modules/emails/actions.php old mode 100644 new mode 100755 diff --git a/modules/emails/add.php b/modules/emails/add.php old mode 100644 new mode 100755 diff --git a/modules/emails/edit.php b/modules/emails/edit.php old mode 100644 new mode 100755 diff --git a/modules/emails/init.php b/modules/emails/init.php old mode 100644 new mode 100755 diff --git a/modules/emails/src/Account.php b/modules/emails/src/Account.php old mode 100644 new mode 100755 diff --git a/modules/emails/src/EmailHook.php b/modules/emails/src/EmailHook.php old mode 100644 new mode 100755 diff --git a/modules/emails/src/Mail.php b/modules/emails/src/Mail.php old mode 100644 new mode 100755 diff --git a/modules/emails/src/Receiver.php b/modules/emails/src/Receiver.php old mode 100644 new mode 100755 diff --git a/modules/emails/src/Template.php b/modules/emails/src/Template.php old mode 100644 new mode 100755 diff --git a/modules/fatture/actions.php b/modules/fatture/actions.php old mode 100644 new mode 100755 diff --git a/modules/fatture/add.php b/modules/fatture/add.php old mode 100644 new mode 100755 diff --git a/modules/fatture/add_contratto.php b/modules/fatture/add_contratto.php old mode 100644 new mode 100755 diff --git a/modules/fatture/add_ddt.php b/modules/fatture/add_ddt.php old mode 100644 new mode 100755 diff --git a/modules/fatture/add_intervento.php b/modules/fatture/add_intervento.php old mode 100644 new mode 100755 diff --git a/modules/fatture/add_ordine.php b/modules/fatture/add_ordine.php old mode 100644 new mode 100755 diff --git a/modules/fatture/add_preventivo.php b/modules/fatture/add_preventivo.php old mode 100644 new mode 100755 diff --git a/modules/fatture/add_serial.php b/modules/fatture/add_serial.php old mode 100644 new mode 100755 index f9547bf40..50fd46d9f --- a/modules/fatture/add_serial.php +++ b/modules/fatture/add_serial.php @@ -31,7 +31,7 @@ $data = [ 'id' => 'idordine', ], 'int' => [ - 'table' => 'mg_articoli_interventi', + 'table' => 'in_righe_interventi', 'id' => 'idintervento', ], ]; diff --git a/modules/fatture/ajax/search.php b/modules/fatture/ajax/search.php old mode 100644 new mode 100755 diff --git a/modules/fatture/bulk.php b/modules/fatture/bulk.php old mode 100644 new mode 100755 diff --git a/modules/fatture/buttons.php b/modules/fatture/buttons.php old mode 100644 new mode 100755 diff --git a/modules/fatture/crea_documento.php b/modules/fatture/crea_documento.php old mode 100644 new mode 100755 diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php old mode 100644 new mode 100755 diff --git a/modules/fatture/fe/components/altri_dati.php b/modules/fatture/fe/components/altri_dati.php old mode 100644 new mode 100755 diff --git a/modules/fatture/fe/components/dati_documento.php b/modules/fatture/fe/components/dati_documento.php old mode 100644 new mode 100755 diff --git a/modules/fatture/fe/document-fe.php b/modules/fatture/fe/document-fe.php old mode 100644 new mode 100755 diff --git a/modules/fatture/fe/row-fe.php b/modules/fatture/fe/row-fe.php old mode 100644 new mode 100755 diff --git a/modules/fatture/fe/style.css b/modules/fatture/fe/style.css old mode 100644 new mode 100755 diff --git a/modules/fatture/init.php b/modules/fatture/init.php old mode 100644 new mode 100755 index c4550abb2..c166d0d24 --- a/modules/fatture/init.php +++ b/modules/fatture/init.php @@ -11,6 +11,11 @@ if ($module['name'] == 'Fatture di vendita') { if (isset($id_record)) { $fattura = Modules\Fatture\Fattura::with('tipo', 'stato')->find($id_record); + $is_fiscale = false; + if (!empty($fattura)) { + $is_fiscale = $fattura->isFiscale(); + } + $record = $dbo->fetchOne('SELECT co_documenti.*, co_tipidocumento.reversed AS is_reversed, co_documenti.idagente AS idagente_fattura, @@ -34,5 +39,4 @@ if (isset($id_record)) { WHERE co_tipidocumento.dir = '.prepare($dir).' AND co_documenti.id='.prepare($id_record)); $note_accredito = $dbo->fetchArray("SELECT co_documenti.id, IF(numero_esterno != '', numero_esterno, numero) AS numero, data FROM co_documenti JOIN co_tipidocumento ON co_documenti.idtipodocumento=co_tipidocumento.id WHERE reversed = 1 AND ref_documento=".prepare($id_record)); - $is_fiscale = $fattura->isFiscale(); } diff --git a/modules/fatture/modutil.php b/modules/fatture/modutil.php old mode 100644 new mode 100755 diff --git a/modules/fatture/row-add.php b/modules/fatture/row-add.php old mode 100644 new mode 100755 diff --git a/modules/fatture/row-edit.php b/modules/fatture/row-edit.php old mode 100644 new mode 100755 diff --git a/modules/fatture/row-list.php b/modules/fatture/row-list.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Components/Articolo.php b/modules/fatture/src/Components/Articolo.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Components/Descrizione.php b/modules/fatture/src/Components/Descrizione.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Components/RelationTrait.php b/modules/fatture/src/Components/RelationTrait.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Components/Riga.php b/modules/fatture/src/Components/Riga.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Components/Sconto.php b/modules/fatture/src/Components/Sconto.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Fattura.php b/modules/fatture/src/Fattura.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Stato.php b/modules/fatture/src/Stato.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/StatoFE.php b/modules/fatture/src/StatoFE.php old mode 100644 new mode 100755 diff --git a/modules/fatture/src/Tipo.php b/modules/fatture/src/Tipo.php old mode 100644 new mode 100755 diff --git a/modules/fatture/variables.php b/modules/fatture/variables.php old mode 100644 new mode 100755 diff --git a/modules/gestione_componenti/actions.php b/modules/gestione_componenti/actions.php old mode 100644 new mode 100755 diff --git a/modules/gestione_componenti/add.php b/modules/gestione_componenti/add.php old mode 100644 new mode 100755 diff --git a/modules/gestione_componenti/ajax/select.php b/modules/gestione_componenti/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/gestione_componenti/edit.php b/modules/gestione_componenti/edit.php old mode 100644 new mode 100755 diff --git a/modules/gestione_componenti/init.php b/modules/gestione_componenti/init.php old mode 100644 new mode 100755 diff --git a/modules/gestione_documentale/actions.php b/modules/gestione_documentale/actions.php old mode 100644 new mode 100755 diff --git a/modules/gestione_documentale/add.php b/modules/gestione_documentale/add.php old mode 100644 new mode 100755 diff --git a/modules/gestione_documentale/edit.php b/modules/gestione_documentale/edit.php old mode 100644 new mode 100755 diff --git a/modules/gestione_documentale/init.php b/modules/gestione_documentale/init.php old mode 100644 new mode 100755 diff --git a/modules/import/actions.php b/modules/import/actions.php old mode 100644 new mode 100755 diff --git a/modules/import/add.php b/modules/import/add.php old mode 100644 new mode 100755 diff --git a/modules/import/edit.php b/modules/import/edit.php old mode 100644 new mode 100755 diff --git a/modules/import/init.php b/modules/import/init.php old mode 100644 new mode 100755 diff --git a/modules/impostazioni/actions.php b/modules/impostazioni/actions.php old mode 100644 new mode 100755 diff --git a/modules/impostazioni/edit.php b/modules/impostazioni/edit.php old mode 100644 new mode 100755 diff --git a/modules/impostazioni/init.php b/modules/impostazioni/init.php old mode 100644 new mode 100755 diff --git a/modules/interventi/actions.php b/modules/interventi/actions.php old mode 100644 new mode 100755 index d22df83f5..fb3f6614d --- a/modules/interventi/actions.php +++ b/modules/interventi/actions.php @@ -117,13 +117,13 @@ switch (post('op')) { ], ['idcontratto' => $idcontratto, 'id' => $idcontratto_riga]); //copio le righe dal promemoria all'intervento - $dbo->query('INSERT INTO in_righe_interventi (descrizione, qta,um,prezzo_vendita,prezzo_acquisto,idiva,desc_iva,iva,idintervento,sconto,sconto_unitario,tipo_sconto) SELECT descrizione, qta,um,prezzo_vendita,prezzo_acquisto,idiva,desc_iva,iva,'.$id_record.',sconto,sconto_unitario,tipo_sconto FROM co_promemoria_righe WHERE id_promemoria = '.$idcontratto_riga); + $dbo->query('INSERT INTO in_righe_interventi (descrizione, qta, um, prezzo_vendita, prezzo_acquisto, idiva,desc_iva, iva, idintervento, sconto, sconto_unitario, tipo_sconto) SELECT descrizione, qta,um,prezzo_vendita,prezzo_acquisto,idiva,desc_iva,iva,'.$id_record.',sconto,sconto_unitario,tipo_sconto FROM co_promemoria_righe WHERE id_promemoria = '.$idcontratto_riga); //copio gli articoli dal promemoria all'intervento - $dbo->query('INSERT INTO mg_articoli_interventi (idarticolo, idintervento,descrizione,prezzo_acquisto,prezzo_vendita,sconto, sconto_unitario, tipo_sconto,idiva,desc_iva,iva, qta, um, abilita_serial, idimpianto) SELECT idarticolo, '.$id_record.',descrizione,prezzo_acquisto,prezzo_vendita,sconto,sconto_unitario,tipo_sconto,idiva,desc_iva,iva, qta, um, abilita_serial, idimpianto FROM co_promemoria_articoli WHERE id_promemoria = '.$idcontratto_riga); + $dbo->query('INSERT INTO in_righe_interventi (idarticolo, idintervento, descrizione, prezzo_acquisto,prezzo_vendita, sconto, sconto_unitario, tipo_sconto,idiva,desc_iva,iva, qta, um, abilita_serial, idimpianto) SELECT idarticolo, '.$id_record.',descrizione,prezzo_acquisto,prezzo_vendita,sconto,sconto_unitario,tipo_sconto,idiva,desc_iva,iva, qta, um, abilita_serial, idimpianto FROM co_promemoria_articoli WHERE id_promemoria = '.$idcontratto_riga); // Copia degli allegati - $alleagti = Uploads::copy([ + $allegati = Uploads::copy([ 'id_plugin' => Plugins::get('Pianificazione interventi')['id'], 'id_record' => $idcontratto_riga, ], [ @@ -131,15 +131,15 @@ switch (post('op')) { 'id_record' => $id_record, ]); - if (!$alleagti) { + if (!$allegati) { $errors = error_get_last(); flash()->warning(tr('Errore durante la copia degli allegati')); } - // Decremento la quantità per ogni articolo copiato - $rs_articoli = $dbo->fetchArray('SELECT * FROM mg_articoli_interventi WHERE idintervento = '.$id_record.' '); - foreach ($rs_articoli as $rs_articolo) { - add_movimento_magazzino($rs_articolo['idarticolo'], -$rs_articolo['qta'], ['idintervento' => $id_record]); + // Movimento il magazziono per ogni articolo copiato + $articoli = $intervento->articoli; + foreach ($articoli as $articolo) { + $articolo->movimenta($articolo->qta); } } @@ -312,6 +312,45 @@ $riga = $intervento->getRiga($type, $id_riga); break; + case 'manage_articolo': + if (post('idriga') != null) { + $articolo = Articolo::find(post('idriga')); + } else { + $originale = ArticoloOriginale::find(post('idarticolo')); + $articolo = Articolo::build($intervento, $originale); + } + + $qta = post('qta'); + + $articolo->descrizione = post('descrizione'); + $articolo->um = post('um') ?: null; + + $articolo->id_iva = post('idiva'); + + $articolo->prezzo_unitario_acquisto = post('prezzo_acquisto') ?: 0; + $articolo->prezzo_unitario_vendita = post('prezzo'); + $articolo->sconto_unitario = post('sconto'); + $articolo->tipo_sconto = post('tipo_sconto'); + + try { + $articolo->qta = $qta; + } catch (UnexpectedValueException $e) { + flash()->error(tr('Alcuni serial number sono già stati utilizzati!')); + } + + $articolo->save(); + + if (post('idriga') != null) { + flash()->info(tr('Articolo modificato!')); + } else { + flash()->info(tr('Articolo aggiunto!')); + } + + // Collegamento all'impianto + link_componente_to_articolo($id_record, post('idimpianto'), $articolo->idarticolo, $qta); + + break; + case 'manage_sconto': if (post('idriga') != null) { $sconto = Sconto::find(post('idriga')); @@ -335,65 +374,34 @@ $riga = $intervento->getRiga($type, $id_riga); break; - /* - GESTIONE ARTICOLI - */ - - case 'editarticolo': - $idriga = post('idriga'); - $idarticolo = post('idarticolo'); - $idimpianto = post('idimpianto'); - - $idarticolo_originale = post('idarticolo_originale'); - - // Leggo la quantità attuale nell'intervento - $q = 'SELECT qta, idimpianto FROM mg_articoli_interventi WHERE idarticolo='.prepare($idarticolo_originale).' AND idintervento='.prepare($id_record); - $rs = $dbo->fetchArray($q); - $old_qta = $rs[0]['qta']; - $idimpianto = $rs[0]['idimpianto']; - - $serials = array_column($dbo->select('mg_prodotti', 'serial', ['id_riga_intervento' => $idriga]), 'serial'); - - add_movimento_magazzino($idarticolo_originale, $old_qta, ['idintervento' => $id_record]); - - // Elimino questo articolo dall'intervento - $dbo->query('DELETE FROM mg_articoli_interventi WHERE id='.prepare($idriga)); - - // Elimino il collegamento al componente - $dbo->query('DELETE FROM my_impianto_componenti WHERE idimpianto='.prepare($idimpianto).' AND idintervento='.prepare($id_record)); - - /* Ricollego l'articolo modificato all'intervento */ - /* ci può essere il caso in cui cambio idarticolo e anche qta */ - - // no break - case 'addarticolo': - $originale = ArticoloOriginale::find(post('idarticolo')); - $intervento = Intervento::find($id_record); - $articolo = Articolo::build($intervento, $originale); - - $articolo->qta = post('qta'); - $articolo->descrizione = post('descrizione'); - $articolo->prezzo_unitario_vendita = post('prezzo_vendita'); - $articolo->prezzo_acquisto = post('prezzo_acquisto'); - $articolo->um = post('um'); - - $articolo->sconto_unitario = post('sconto'); - $articolo->tipo_sconto = post('tipo_sconto'); - $articolo->id_iva = post('idiva'); - - $articolo->save(); - - aggiorna_sedi_movimenti('interventi', $id_record); - - if (!empty($serials)) { - if ($old_qta > $qta) { - $serials = array_slice($serials, 0, $qta); - } - - $articolo->serials = $serials; + case 'manage_riga': + if (post('idriga') != null) { + $riga = Riga::find(post('idriga')); + } else { + $riga = Riga::build($intervento); } - link_componente_to_articolo($id_record, $idimpianto, $idarticolo, $qta); + $qta = post('qta'); + + $riga->descrizione = post('descrizione'); + $riga->um = post('um') ?: null; + + $riga->id_iva = post('idiva'); + + $riga->prezzo_unitario_acquisto = post('prezzo_acquisto') ?: 0; + $riga->prezzo_unitario_vendita = post('prezzo'); + $riga->sconto_unitario = post('sconto'); + $riga->tipo_sconto = post('tipo_sconto'); + + $riga->qta = $qta; + + $riga->save(); + + if (post('idriga') != null) { + flash()->info(tr('Riga modificata!')); + } else { + flash()->info(tr('Riga aggiunta!')); + } break; diff --git a/modules/interventi/add.php b/modules/interventi/add.php old mode 100644 new mode 100755 diff --git a/modules/interventi/add_articolo.php b/modules/interventi/add_articolo.php deleted file mode 100644 index 4716ddf18..000000000 --- a/modules/interventi/add_articolo.php +++ /dev/null @@ -1,226 +0,0 @@ -fetchArray('SELECT idanagrafica FROM in_interventi WHERE id='.prepare($id_record)); -$idanagrafica = $rs[0]['idanagrafica']; - -$_SESSION['superselect']['idintervento'] = get('id_record'); -$_SESSION['superselect']['dir'] = 'entrata'; -$_SESSION['superselect']['idanagrafica'] = $idanagrafica; - -if (empty($idriga)) { - $op = 'addarticolo'; - $button = ' '.tr('Aggiungi'); - - // valori default - $idarticolo = ''; - $descrizione = ''; - $qta = 1; - $um = ''; - - $prezzo_acquisto = '0'; - $prezzo_vendita = '0'; - $sconto_unitario = 0; - - // Aggiunta sconto di default da listino per le vendite - $listino = $dbo->fetchOne('SELECT prc_guadagno FROM an_anagrafiche INNER JOIN mg_listini ON an_anagrafiche.idlistino_vendite=mg_listini.id WHERE idanagrafica='.prepare($idanagrafica)); - - if (!empty($listino['prc_guadagno'])) { - $sconto_unitario = $listino['prc_guadagno']; - $tipo_sconto = 'PRC'; - } - - $idimpianto = 0; - $idiva = setting('Iva predefinita'); -} else { - $op = 'editarticolo'; - $button = ' '.tr('Modifica'); - - // carico record da modificare - $q = "SELECT *, (SELECT codice FROM mg_articoli WHERE id=mg_articoli_interventi.idarticolo) AS codice_articolo, (SELECT CONCAT(codice, ' - ', descrizione) FROM mg_articoli WHERE id=mg_articoli_interventi.idarticolo) AS descrizione_articolo FROM mg_articoli_interventi WHERE id=".prepare($idriga); - $rsr = $dbo->fetchArray($q); - - $idarticolo = $rsr[0]['idarticolo']; - $codice_articolo = $rsr[0]['codice_articolo']; - $descrizione = $rsr[0]['descrizione']; - $qta = $rsr[0]['qta']; - $um = $rsr[0]['um']; - $idiva = $rsr[0]['idiva']; - - $prezzo_vendita = $rsr[0]['prezzo_vendita']; - $prezzo_acquisto = $rsr[0]['prezzo_acquisto']; - - $sconto_unitario = $rsr[0]['sconto_unitario']; - $tipo_sconto = $rsr[0]['tipo_sconto']; - - $idimpianto = $rsr[0]['idimpianto']; -} - -/* - Form di inserimento -*/ -echo ' - - - '; - -if (!empty($idarticolo)) { - echo ' - '; -} - -// Articolo -echo ' -
-
- {[ "type": "select", "label": "'.tr('Articolo').'", "name": "idarticolo", "required": 1, "value": "'.$idarticolo.'", "ajax-source": "articoli" ]} -
-
'; - -// Descrizione -echo ' -
-
- {[ "type": "textarea", "label": "'.tr('Descrizione').'", "name": "descrizione", "id": "descrizione_articolo", "required": 1, "value": '.json_encode($descrizione).' ]} -
-
'; - -// Impianto -echo ' -
-
- {[ "type": "select", "label": "'.tr('Impianto su cui installare').'", "name": "idimpianto", "value": "'.$idimpianto.'", "ajax-source": "impianti-intervento" ]} -
-
'; - -// Quantità -echo ' -
-
- {[ "type": "number", "label": "'.tr('Q.tà').'", "name": "qta", "required": 1, "value": "'.$qta.'", "decimals": "qta" ]} -
'; - -// Unità di misura -echo ' -
- {[ "type": "select", "label": "'.tr('Unità di misura').'", "icon-after": "add|'.Modules::get('Unità di misura')['id'].'", "name": "um", "value": "'.$um.'", "ajax-source": "misure" ]} -
'; - -// Iva -echo ' -
- {[ "type": "select", "label": "'.tr('Iva').'", "name": "idiva", "required": 1, "value": "'.$idiva.'", "ajax-source": "iva" ]} -
-
'; - -// Prezzo di acquisto -echo ' -
-
- {[ "type": "number", "label": "'.tr('Prezzo di acquisto (un.)').'", "name": "prezzo_acquisto", "required": 1, "value": "'.$prezzo_acquisto.'", "icon-after": "'.currency().'" ]} -
'; - -// Prezzo di vendita -echo ' -
- {[ "type": "number", "label": "'.tr('Prezzo di vendita (un.)').'", "name": "prezzo_vendita", "required": 1, "value": "'.$prezzo_vendita.'", "icon-after": "'.currency().'" ]} -
'; - -// Sconto -echo ' -
- {[ "type": "number", "label": "'.tr('Sconto unitario').'", "name": "sconto", "icon-after": "choice|untprc|'.$tipo_sconto.'", "value": "'.$sconto_unitario.'" ]} -
-
'; - -// Informazioni aggiuntive -echo ' -
-
- -
-
- -
- -
-
- -
- -
-
-
-
'; - -echo ' - '; - -echo ' - - -
-
- -
-
-'; - -echo ' -'; - -?> - - diff --git a/modules/interventi/add_firma.php b/modules/interventi/add_firma.php old mode 100644 new mode 100755 diff --git a/modules/interventi/add_righe.php b/modules/interventi/add_righe.php deleted file mode 100644 index 3c57df32f..000000000 --- a/modules/interventi/add_righe.php +++ /dev/null @@ -1,126 +0,0 @@ -fetchArray('SELECT idanagrafica FROM in_interventi WHERE id='.prepare($id_record)); -$idanagrafica = $rs[0]['idanagrafica']; - -if (empty($idriga)) { - $op = 'addriga'; - $button = ' '.tr('Aggiungi'); - - // valori default - $descrizione = ''; - $qta = 1; - $um = ''; - $prezzo_vendita = '0'; - $prezzo_acquisto = '0'; - $idiva = setting('Iva predefinita'); -} else { - $op = 'editriga'; - $button = ' '.tr('Modifica'); - - // carico record da modificare - $q = 'SELECT * FROM in_righe_interventi WHERE id='.prepare($idriga); - $rsr = $dbo->fetchArray($q); - - $descrizione = $rsr[0]['descrizione']; - $qta = $rsr[0]['qta']; - $um = $rsr[0]['um']; - $idiva = $rsr[0]['idiva']; - $prezzo_vendita = $rsr[0]['prezzo_vendita']; - $prezzo_acquisto = $rsr[0]['prezzo_acquisto']; - - $sconto_unitario = $rsr[0]['sconto_unitario']; - $tipo_sconto = $rsr[0]['tipo_sconto']; -} - -/* - Form di inserimento -*/ -echo ' - - - '; - -// Descrizione -echo ' -
-
- {[ "type": "textarea", "label": "'.tr('Descrizione').'", "id": "descrizione_riga", "name": "descrizione", "required": 1, "value": '.json_encode($descrizione).' ]} -
-
-
'; - -// Quantità -echo ' -
-
- {[ "type": "number", "label": "'.tr('Q.tà').'", "name": "qta", "required": 1, "value": "'.$qta.'", "decimals": "qta" ]} -
'; - -// Unità di misura -echo ' -
- {[ "type": "select", "label": "'.tr('Unità di misura').'", "icon-after": "add|'.Modules::get('Unità di misura')['id'].'", "name": "um", "value": "'.$um.'", "ajax-source": "misure" ]} -
'; - -// Iva -echo ' -
- {[ "type": "select", "label": "'.tr('Iva').'", "name": "idiva", "required": 1, "value": "'.$idiva.'", "ajax-source": "iva" ]} -
-
'; - -// Prezzo di acquisto -echo ' -
-
- {[ "type": "number", "label": "'.tr('Prezzo di acquisto (un.)').'", "name": "prezzo_acquisto", "required": 1, "value": "'.$prezzo_acquisto.'", "icon-after": "'.currency().'" ]} -
'; - -// Prezzo di vendita -echo ' -
- {[ "type": "number", "label": "'.tr('Prezzo di vendita (un.)').'", "name": "prezzo_vendita", "required": 1, "value": "'.$prezzo_vendita.'", "icon-after": "'.currency().'" ]} -
'; - -// Sconto unitario -echo ' -
- {[ "type": "number", "label": "'.tr('Sconto unitario').'", "name": "sconto", "icon-after": "choice|untprc|'.$tipo_sconto.'", "value": "'.$sconto_unitario.'" ]} -
-
'; - -echo ' - -
-
- -
-
-'; - -echo ' -'; - -?> - - diff --git a/modules/interventi/ajax/search.php b/modules/interventi/ajax/search.php old mode 100644 new mode 100755 diff --git a/modules/interventi/ajax/select.php b/modules/interventi/ajax/select.php old mode 100644 new mode 100755 diff --git a/modules/interventi/ajax_costi.php b/modules/interventi/ajax_costi.php old mode 100644 new mode 100755 diff --git a/modules/interventi/ajax_tecnici.php b/modules/interventi/ajax_tecnici.php old mode 100644 new mode 100755 diff --git a/modules/interventi/bulk.php b/modules/interventi/bulk.php old mode 100644 new mode 100755 diff --git a/modules/interventi/buttons.php b/modules/interventi/buttons.php old mode 100644 new mode 100755 diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php old mode 100644 new mode 100755 index 502994448..0c75f3ef7 --- a/modules/interventi/edit.php +++ b/modules/interventi/edit.php @@ -2,6 +2,8 @@ include_once __DIR__.'/../../core.php'; +$block_edit = $record['flag_completato']; + unset($_SESSION['superselect']['idanagrafica']); unset($_SESSION['superselect']['idsede_partenza']); unset($_SESSION['superselect']['idsede_destinazione']); @@ -112,7 +114,7 @@ $_SESSION['superselect']['idsede_destinazione'] = $record['idsede_destinazione']
- {[ "type": "select", "label": "", "name": "idstatointervento", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL", "value": "$idstatointervento$" ]} + {[ "type": "select", "label": "", "name": "idstatointervento", "required": 1, "values": "query=SELECT idstatointervento AS id, descrizione, colore AS _bgcolor_ FROM in_statiintervento WHERE deleted_at IS NULL", "value": "$idstatointervento$", "class": "unblockable" ]}
@@ -224,25 +226,31 @@ $_SESSION['superselect']['idsede_destinazione'] = $record['idsede_destinazione'] fileurl('add_articolo.php').'?id_module='.$id_module.'&id_record='.$id_record.'&is_articolo&idriga=0" data-toggle="tooltip" data-title="'.tr('Aggiungi articolo').'"> - '.tr('Articolo').' - '; + + '.tr('Articolo').' + '; echo ' - - '.tr('Riga').' - '; + + '.tr('Riga').' + '; +/* echo ' - - '.tr('Sconto/maggiorazione').' - '; + + '.tr('Descrizione').' + '; +*/ + echo ' + + '.tr('Sconto/maggiorazione').' + '; } // Conteggio numero articoli intervento per eventuale blocco della sede di partenza -$articoli = $dbo->fetchArray('SELECT mg_articoli_interventi.id FROM mg_articoli_interventi INNER JOIN in_interventi ON in_interventi.id=mg_articoli_interventi.idintervento WHERE in_interventi.id='.prepare($id_record)); +$articoli = $intervento->articoli; ?> @@ -254,7 +262,7 @@ $articoli = $dbo->fetchArray('SELECT mg_articoli_interventi.id FROM mg_articoli_
filepath('ajax_righe.php'); +include $structure->filepath('row-list.php'); ?>
@@ -311,7 +319,7 @@ include $structure->filepath('ajax_righe.php'); '; diff --git a/plugins/receiptFE/actions.php b/plugins/receiptFE/actions.php old mode 100644 new mode 100755 diff --git a/plugins/receiptFE/edit.php b/plugins/receiptFE/edit.php old mode 100644 new mode 100755 diff --git a/plugins/receiptFE/list.php b/plugins/receiptFE/list.php old mode 100644 new mode 100755 diff --git a/plugins/receiptFE/src/Interaction.php b/plugins/receiptFE/src/Interaction.php old mode 100644 new mode 100755 diff --git a/plugins/receiptFE/src/ReceiptHook.php b/plugins/receiptFE/src/ReceiptHook.php old mode 100644 new mode 100755 diff --git a/plugins/receiptFE/src/Ricevuta.php b/plugins/receiptFE/src/Ricevuta.php old mode 100644 new mode 100755 diff --git a/plugins/referenti/actions.php b/plugins/referenti/actions.php old mode 100644 new mode 100755 diff --git a/plugins/referenti/add.php b/plugins/referenti/add.php old mode 100644 new mode 100755 diff --git a/plugins/referenti/edit.php b/plugins/referenti/edit.php old mode 100644 new mode 100755 diff --git a/plugins/referenti/init.php b/plugins/referenti/init.php old mode 100644 new mode 100755 diff --git a/plugins/revisioni/actions.php b/plugins/revisioni/actions.php old mode 100644 new mode 100755 diff --git a/plugins/revisioni/edit.php b/plugins/revisioni/edit.php old mode 100644 new mode 100755 diff --git a/plugins/rinnovi_contratti/edit.php b/plugins/rinnovi_contratti/edit.php old mode 100644 new mode 100755 diff --git a/plugins/sedi/actions.php b/plugins/sedi/actions.php old mode 100644 new mode 100755 diff --git a/plugins/sedi/add.php b/plugins/sedi/add.php old mode 100644 new mode 100755 diff --git a/plugins/sedi/edit.php b/plugins/sedi/edit.php old mode 100644 new mode 100755 diff --git a/plugins/sedi/init.php b/plugins/sedi/init.php old mode 100644 new mode 100755 diff --git a/plugins/statistiche_anagrafiche/edit.php b/plugins/statistiche_anagrafiche/edit.php old mode 100644 new mode 100755 diff --git a/plugins/statistiche_anagrafiche/info.php b/plugins/statistiche_anagrafiche/info.php old mode 100644 new mode 100755 diff --git a/plugins/statistiche_articoli/edit.php b/plugins/statistiche_articoli/edit.php old mode 100644 new mode 100755 diff --git a/plugins/statistiche_articoli/js/prezzo.js b/plugins/statistiche_articoli/js/prezzo.js old mode 100644 new mode 100755 diff --git a/plugins/statistiche_articoli/manage_prezzi.php b/plugins/statistiche_articoli/manage_prezzi.php old mode 100644 new mode 100755 diff --git a/plugins/statistiche_articoli/src/Stats.php b/plugins/statistiche_articoli/src/Stats.php old mode 100644 new mode 100755 diff --git a/plugins/xml/AT.xsl b/plugins/xml/AT.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/DT.xsl b/plugins/xml/DT.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/EC.xsl b/plugins/xml/EC.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/MC.xsl b/plugins/xml/MC.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/MT.xsl b/plugins/xml/MT.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/NE.xsl b/plugins/xml/NE.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/NS.xsl b/plugins/xml/NS.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/RC.xsl b/plugins/xml/RC.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/SE.xsl b/plugins/xml/SE.xsl old mode 100644 new mode 100755 diff --git a/plugins/xml/asso-invoice.xsl b/plugins/xml/asso-invoice.xsl old mode 100644 new mode 100755 diff --git a/reset.php b/reset.php old mode 100644 new mode 100755 diff --git a/src/AJAX.php b/src/AJAX.php old mode 100644 new mode 100755 diff --git a/src/API/Common/Allegato.php b/src/API/Common/Allegato.php old mode 100644 new mode 100755 diff --git a/src/API/Common/Stampa.php b/src/API/Common/Stampa.php old mode 100644 new mode 100755 diff --git a/src/API/Exceptions/InternalError.php b/src/API/Exceptions/InternalError.php old mode 100644 new mode 100755 diff --git a/src/API/Exceptions/ResourceNotFound.php b/src/API/Exceptions/ResourceNotFound.php old mode 100644 new mode 100755 diff --git a/src/API/Exceptions/ServiceError.php b/src/API/Exceptions/ServiceError.php old mode 100644 new mode 100755 diff --git a/src/API/Exceptions/Unauthorized.php b/src/API/Exceptions/Unauthorized.php old mode 100644 new mode 100755 diff --git a/src/API/Interfaces/CreateInterface.php b/src/API/Interfaces/CreateInterface.php old mode 100644 new mode 100755 diff --git a/src/API/Interfaces/DeleteInterface.php b/src/API/Interfaces/DeleteInterface.php old mode 100644 new mode 100755 diff --git a/src/API/Interfaces/RetrieveInterface.php b/src/API/Interfaces/RetrieveInterface.php old mode 100644 new mode 100755 diff --git a/src/API/Interfaces/UpdateInterface.php b/src/API/Interfaces/UpdateInterface.php old mode 100644 new mode 100755 diff --git a/src/API/Manager.php b/src/API/Manager.php old mode 100644 new mode 100755 diff --git a/src/API/Resource.php b/src/API/Resource.php old mode 100644 new mode 100755 diff --git a/src/API/Response.php b/src/API/Response.php old mode 100644 new mode 100755 diff --git a/src/API/Services.php b/src/API/Services.php old mode 100644 new mode 100755 diff --git a/src/App.php b/src/App.php old mode 100644 new mode 100755 diff --git a/src/Auth.php b/src/Auth.php old mode 100644 new mode 100755 diff --git a/src/Backup.php b/src/Backup.php old mode 100644 new mode 100755 diff --git a/src/Database.php b/src/Database.php old mode 100644 new mode 100755 diff --git a/src/Extensions/EloquentCollector.php b/src/Extensions/EloquentCollector.php old mode 100644 new mode 100755 diff --git a/src/Extensions/MessageHandler.php b/src/Extensions/MessageHandler.php old mode 100644 new mode 100755 diff --git a/src/Filter.php b/src/Filter.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/HTMLBuilder.php b/src/HTMLBuilder/HTMLBuilder.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Handler/CKEditorHandler.php b/src/HTMLBuilder/Handler/CKEditorHandler.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Handler/ChoicesHandler.php b/src/HTMLBuilder/Handler/ChoicesHandler.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Handler/DateHandler.php b/src/HTMLBuilder/Handler/DateHandler.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Handler/DefaultHandler.php b/src/HTMLBuilder/Handler/DefaultHandler.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Handler/HandlerInterface.php b/src/HTMLBuilder/Handler/HandlerInterface.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Handler/MediaHandler.php b/src/HTMLBuilder/Handler/MediaHandler.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Handler/SelectHandler.php b/src/HTMLBuilder/Handler/SelectHandler.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Manager/ButtonManager.php b/src/HTMLBuilder/Manager/ButtonManager.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Manager/EmailManager.php b/src/HTMLBuilder/Manager/EmailManager.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Manager/FieldManager.php b/src/HTMLBuilder/Manager/FieldManager.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Manager/FileManager.php b/src/HTMLBuilder/Manager/FileManager.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Manager/ManagerInterface.php b/src/HTMLBuilder/Manager/ManagerInterface.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Manager/WidgetManager.php b/src/HTMLBuilder/Manager/WidgetManager.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Wrapper/HTMLWrapper.php b/src/HTMLBuilder/Wrapper/HTMLWrapper.php old mode 100644 new mode 100755 diff --git a/src/HTMLBuilder/Wrapper/WrapperInterface.php b/src/HTMLBuilder/Wrapper/WrapperInterface.php old mode 100644 new mode 100755 diff --git a/src/Hooks/CachedManager.php b/src/Hooks/CachedManager.php old mode 100644 new mode 100755 diff --git a/src/Hooks/Manager.php b/src/Hooks/Manager.php old mode 100644 new mode 100755 diff --git a/src/Import.php b/src/Import.php old mode 100644 new mode 100755 diff --git a/src/Intl/FileLoader.php b/src/Intl/FileLoader.php old mode 100644 new mode 100755 diff --git a/src/Intl/Formatter.php b/src/Intl/Formatter.php old mode 100644 new mode 100755 diff --git a/src/Models/ApiResource.php b/src/Models/ApiResource.php old mode 100644 new mode 100755 diff --git a/src/Models/Clause.php b/src/Models/Clause.php old mode 100644 new mode 100755 diff --git a/src/Models/Group.php b/src/Models/Group.php old mode 100644 new mode 100755 diff --git a/src/Models/Hook.php b/src/Models/Hook.php old mode 100644 new mode 100755 diff --git a/src/Models/Log.php b/src/Models/Log.php old mode 100644 new mode 100755 diff --git a/src/Models/Module.php b/src/Models/Module.php old mode 100644 new mode 100755 diff --git a/src/Models/Note.php b/src/Models/Note.php old mode 100644 new mode 100755 diff --git a/src/Models/OperationLog.php b/src/Models/OperationLog.php old mode 100644 new mode 100755 diff --git a/src/Models/Plugin.php b/src/Models/Plugin.php old mode 100644 new mode 100755 diff --git a/src/Models/PrintTemplate.php b/src/Models/PrintTemplate.php old mode 100644 new mode 100755 diff --git a/src/Models/Setting.php b/src/Models/Setting.php old mode 100644 new mode 100755 diff --git a/src/Models/Upload.php b/src/Models/Upload.php old mode 100644 new mode 100755 diff --git a/src/Models/User.php b/src/Models/User.php old mode 100644 new mode 100755 diff --git a/src/Models/View.php b/src/Models/View.php old mode 100644 new mode 100755 diff --git a/src/Modules.php b/src/Modules.php old mode 100644 new mode 100755 diff --git a/src/Notifications/EmailNotification.php b/src/Notifications/EmailNotification.php old mode 100644 new mode 100755 diff --git a/src/Notifications/Notification.php b/src/Notifications/Notification.php old mode 100644 new mode 100755 diff --git a/src/Notifications/NotificationInterface.php b/src/Notifications/NotificationInterface.php old mode 100644 new mode 100755 diff --git a/src/Permissions.php b/src/Permissions.php old mode 100644 new mode 100755 diff --git a/src/Plugins.php b/src/Plugins.php old mode 100644 new mode 100755 diff --git a/src/Prints.php b/src/Prints.php old mode 100644 new mode 100755 diff --git a/src/Settings.php b/src/Settings.php old mode 100644 new mode 100755 diff --git a/src/Traits/Components/NoteTrait.php b/src/Traits/Components/NoteTrait.php old mode 100644 new mode 100755 diff --git a/src/Traits/Components/UploadTrait.php b/src/Traits/Components/UploadTrait.php old mode 100644 new mode 100755 diff --git a/src/Traits/HierarchyTrait.php b/src/Traits/HierarchyTrait.php old mode 100644 new mode 100755 diff --git a/src/Traits/ManagerTrait.php b/src/Traits/ManagerTrait.php old mode 100644 new mode 100755 diff --git a/src/Traits/PathTrait.php b/src/Traits/PathTrait.php old mode 100644 new mode 100755 diff --git a/src/Traits/RecordTrait.php b/src/Traits/RecordTrait.php old mode 100644 new mode 100755 diff --git a/src/Traits/StoreTrait.php b/src/Traits/StoreTrait.php old mode 100644 new mode 100755 diff --git a/src/Translator.php b/src/Translator.php old mode 100644 new mode 100755 diff --git a/src/Update.php b/src/Update.php old mode 100644 new mode 100755 diff --git a/src/Uploads.php b/src/Uploads.php old mode 100644 new mode 100755 diff --git a/src/Util/Autofill.php b/src/Util/Autofill.php old mode 100644 new mode 100755 diff --git a/src/Util/FileSystem.php b/src/Util/FileSystem.php old mode 100644 new mode 100755 diff --git a/src/Util/Generator.php b/src/Util/Generator.php old mode 100644 new mode 100755 diff --git a/src/Util/Ini.php b/src/Util/Ini.php old mode 100644 new mode 100755 diff --git a/src/Util/Messages.php b/src/Util/Messages.php old mode 100644 new mode 100755 diff --git a/src/Util/Query.php b/src/Util/Query.php old mode 100644 new mode 100755 diff --git a/src/Util/Singleton.php b/src/Util/Singleton.php old mode 100644 new mode 100755 diff --git a/src/Util/XML.php b/src/Util/XML.php old mode 100644 new mode 100755 diff --git a/src/Util/Zip.php b/src/Util/Zip.php old mode 100644 new mode 100755 diff --git a/src/Validate.php b/src/Validate.php old mode 100644 new mode 100755 diff --git a/templates/base/bootstrap.css b/templates/base/bootstrap.css old mode 100644 new mode 100755 diff --git a/templates/base/footer.php b/templates/base/footer.php old mode 100644 new mode 100755 diff --git a/templates/base/header.php b/templates/base/header.php old mode 100644 new mode 100755 diff --git a/templates/base/logo_azienda.jpg b/templates/base/logo_azienda.jpg old mode 100644 new mode 100755 diff --git a/templates/base/settings.php b/templates/base/settings.php old mode 100644 new mode 100755 diff --git a/templates/base/style.css b/templates/base/style.css old mode 100644 new mode 100755 diff --git a/templates/contratti/body.php b/templates/contratti/body.php old mode 100644 new mode 100755 diff --git a/templates/contratti/footer.php b/templates/contratti/footer.php old mode 100644 new mode 100755 diff --git a/templates/contratti/init.php b/templates/contratti/init.php old mode 100644 new mode 100755 diff --git a/templates/contratti/settings.php b/templates/contratti/settings.php old mode 100644 new mode 100755 diff --git a/templates/contratti_cons/bottom.php b/templates/contratti_cons/bottom.php old mode 100644 new mode 100755 diff --git a/templates/contratti_cons/init.php b/templates/contratti_cons/init.php old mode 100644 new mode 100755 diff --git a/templates/contratti_cons/piece.php b/templates/contratti_cons/piece.php old mode 100644 new mode 100755 diff --git a/templates/contratti_cons/top.php b/templates/contratti_cons/top.php old mode 100644 new mode 100755 diff --git a/templates/dashboard/body.php b/templates/dashboard/body.php old mode 100644 new mode 100755 diff --git a/templates/dashboard/header.php b/templates/dashboard/header.php old mode 100644 new mode 100755 diff --git a/templates/dashboard/settings.php b/templates/dashboard/settings.php old mode 100644 new mode 100755 diff --git a/templates/ddt/body.php b/templates/ddt/body.php old mode 100644 new mode 100755 diff --git a/templates/ddt/footer.php b/templates/ddt/footer.php old mode 100644 new mode 100755 diff --git a/templates/ddt/header.php b/templates/ddt/header.php old mode 100644 new mode 100755 diff --git a/templates/ddt/init.php b/templates/ddt/init.php old mode 100644 new mode 100755 diff --git a/templates/fatturato/fatturato.html b/templates/fatturato/fatturato.html old mode 100644 new mode 100755 diff --git a/templates/fatturato/fatturato_body.html b/templates/fatturato/fatturato_body.html old mode 100644 new mode 100755 diff --git a/templates/fatturato/pdfgen.fatturato.php b/templates/fatturato/pdfgen.fatturato.php old mode 100644 new mode 100755 diff --git a/templates/fatture/body.php b/templates/fatture/body.php old mode 100644 new mode 100755 diff --git a/templates/fatture/footer.php b/templates/fatture/footer.php old mode 100644 new mode 100755 diff --git a/templates/fatture/header.php b/templates/fatture/header.php old mode 100644 new mode 100755 diff --git a/templates/fatture/init.php b/templates/fatture/init.php old mode 100644 new mode 100755 diff --git a/templates/info.php b/templates/info.php old mode 100644 new mode 100755 diff --git a/templates/interventi/body.php b/templates/interventi/body.php old mode 100644 new mode 100755 diff --git a/templates/interventi/init.php b/templates/interventi/init.php old mode 100644 new mode 100755 diff --git a/templates/magazzino_inventario/body.php b/templates/magazzino_inventario/body.php old mode 100644 new mode 100755 diff --git a/templates/magazzino_inventario/settings.php b/templates/magazzino_inventario/settings.php old mode 100644 new mode 100755 diff --git a/templates/ordini/body.php b/templates/ordini/body.php old mode 100644 new mode 100755 diff --git a/templates/ordini/header.php b/templates/ordini/header.php old mode 100644 new mode 100755 diff --git a/templates/ordini/init.php b/templates/ordini/init.php old mode 100644 new mode 100755 diff --git a/templates/partitario_mastrino/partitario.html b/templates/partitario_mastrino/partitario.html old mode 100644 new mode 100755 diff --git a/templates/partitario_mastrino/partitario_body.html b/templates/partitario_mastrino/partitario_body.html old mode 100644 new mode 100755 diff --git a/templates/partitario_mastrino/pdfgen.partitario_mastrino.php b/templates/partitario_mastrino/pdfgen.partitario_mastrino.php old mode 100644 new mode 100755 diff --git a/templates/pdfgen_variables.php b/templates/pdfgen_variables.php old mode 100644 new mode 100755 diff --git a/templates/preventivi/body.php b/templates/preventivi/body.php old mode 100644 new mode 100755 diff --git a/templates/preventivi/footer.php b/templates/preventivi/footer.php old mode 100644 new mode 100755 diff --git a/templates/preventivi/init.php b/templates/preventivi/init.php old mode 100644 new mode 100755 diff --git a/templates/preventivi/settings.php b/templates/preventivi/settings.php old mode 100644 new mode 100755 diff --git a/templates/preventivi_cons/bottom.php b/templates/preventivi_cons/bottom.php old mode 100644 new mode 100755 diff --git a/templates/preventivi_cons/init.php b/templates/preventivi_cons/init.php old mode 100644 new mode 100755 diff --git a/templates/preventivi_cons/piece.php b/templates/preventivi_cons/piece.php old mode 100644 new mode 100755 diff --git a/templates/preventivi_cons/top.php b/templates/preventivi_cons/top.php old mode 100644 new mode 100755 diff --git a/templates/registro_iva/bottom.php b/templates/registro_iva/bottom.php old mode 100644 new mode 100755 diff --git a/templates/registro_iva/footer.php b/templates/registro_iva/footer.php old mode 100644 new mode 100755 diff --git a/templates/registro_iva/init.php b/templates/registro_iva/init.php old mode 100644 new mode 100755 diff --git a/templates/registro_iva/piece.php b/templates/registro_iva/piece.php old mode 100644 new mode 100755 diff --git a/templates/registro_iva/settings.php b/templates/registro_iva/settings.php old mode 100644 new mode 100755 diff --git a/templates/registro_iva/top.php b/templates/registro_iva/top.php old mode 100644 new mode 100755 diff --git a/templates/replace.php b/templates/replace.php old mode 100644 new mode 100755 diff --git a/templates/riepilogo_interventi/bottom.php b/templates/riepilogo_interventi/bottom.php old mode 100644 new mode 100755 diff --git a/templates/riepilogo_interventi/footer.php b/templates/riepilogo_interventi/footer.php old mode 100644 new mode 100755 diff --git a/templates/riepilogo_interventi/init.php b/templates/riepilogo_interventi/init.php old mode 100644 new mode 100755 diff --git a/templates/riepilogo_interventi/piece.php b/templates/riepilogo_interventi/piece.php old mode 100644 new mode 100755 diff --git a/templates/riepilogo_interventi/top.php b/templates/riepilogo_interventi/top.php old mode 100644 new mode 100755 diff --git a/templates/scadenzario/bottom.php b/templates/scadenzario/bottom.php old mode 100644 new mode 100755 diff --git a/templates/scadenzario/footer.php b/templates/scadenzario/footer.php old mode 100644 new mode 100755 diff --git a/templates/scadenzario/init.php b/templates/scadenzario/init.php old mode 100644 new mode 100755 diff --git a/templates/scadenzario/piece.php b/templates/scadenzario/piece.php old mode 100644 new mode 100755 diff --git a/templates/scadenzario/settings.php b/templates/scadenzario/settings.php old mode 100644 new mode 100755 diff --git a/templates/scadenzario/top.php b/templates/scadenzario/top.php old mode 100644 new mode 100755 diff --git a/templates/spesometro/body.php b/templates/spesometro/body.php old mode 100644 new mode 100755 diff --git a/templates/spesometro/header.php b/templates/spesometro/header.php old mode 100644 new mode 100755 diff --git a/templates/spesometro/settings.php b/templates/spesometro/settings.php old mode 100644 new mode 100755 diff --git a/tests/_data/.gitkeep b/tests/_data/.gitkeep old mode 100644 new mode 100755 diff --git a/tests/_output/.gitignore b/tests/_output/.gitignore old mode 100644 new mode 100755 diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php old mode 100644 new mode 100755 diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php old mode 100644 new mode 100755 diff --git a/tests/_support/Helper/Acceptance.php b/tests/_support/Helper/Acceptance.php old mode 100644 new mode 100755 diff --git a/tests/_support/Helper/Common/RowHelper.php b/tests/_support/Helper/Common/RowHelper.php old mode 100644 new mode 100755 diff --git a/tests/_support/Helper/Functional.php b/tests/_support/Helper/Functional.php old mode 100644 new mode 100755 diff --git a/tests/_support/Helper/Select2.php b/tests/_support/Helper/Select2.php old mode 100644 new mode 100755 diff --git a/tests/_support/Helper/Select2Ajax.php b/tests/_support/Helper/Select2Ajax.php old mode 100644 new mode 100755 diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php old mode 100644 new mode 100755 diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php old mode 100644 new mode 100755 diff --git a/tests/_support/_generated/.gitignore b/tests/_support/_generated/.gitignore old mode 100644 new mode 100755 diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml old mode 100644 new mode 100755 diff --git a/tests/acceptance/AnagraficheCest.php b/tests/acceptance/AnagraficheCest.php old mode 100644 new mode 100755 diff --git a/tests/acceptance/BackupCest.php b/tests/acceptance/BackupCest.php old mode 100644 new mode 100755 diff --git a/tests/acceptance/ContrattiCest.php b/tests/acceptance/ContrattiCest.php old mode 100644 new mode 100755 diff --git a/tests/acceptance/DDTCest.php b/tests/acceptance/DDTCest.php old mode 100644 new mode 100755 diff --git a/tests/acceptance/FattureCest.php b/tests/acceptance/FattureCest.php old mode 100644 new mode 100755 diff --git a/tests/acceptance/OrdiniCest.php b/tests/acceptance/OrdiniCest.php old mode 100644 new mode 100755 diff --git a/tests/acceptance/PreventiviCest.php b/tests/acceptance/PreventiviCest.php old mode 100644 new mode 100755 diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php old mode 100644 new mode 100755 diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml old mode 100644 new mode 100755 diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php old mode 100644 new mode 100755 diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml old mode 100644 new mode 100755 diff --git a/tests/unit/GeneratorTest.php b/tests/unit/GeneratorTest.php old mode 100644 new mode 100755 diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php old mode 100644 new mode 100755 diff --git a/update/.htaccess b/update/.htaccess old mode 100644 new mode 100755 diff --git a/update/2_0.sql b/update/2_0.sql old mode 100644 new mode 100755 diff --git a/update/2_1.php b/update/2_1.php old mode 100644 new mode 100755 diff --git a/update/2_1.sql b/update/2_1.sql old mode 100644 new mode 100755 diff --git a/update/2_2.php b/update/2_2.php old mode 100644 new mode 100755 diff --git a/update/2_2.sql b/update/2_2.sql old mode 100644 new mode 100755 diff --git a/update/2_3.php b/update/2_3.php old mode 100644 new mode 100755 diff --git a/update/2_3.sql b/update/2_3.sql old mode 100644 new mode 100755 diff --git a/update/2_3_1.php b/update/2_3_1.php old mode 100644 new mode 100755 diff --git a/update/2_3_1.sql b/update/2_3_1.sql old mode 100644 new mode 100755 diff --git a/update/2_4.php b/update/2_4.php old mode 100644 new mode 100755 diff --git a/update/2_4.sql b/update/2_4.sql old mode 100644 new mode 100755 diff --git a/update/2_4_1.sql b/update/2_4_1.sql old mode 100644 new mode 100755 diff --git a/update/2_4_10.php b/update/2_4_10.php old mode 100644 new mode 100755 diff --git a/update/2_4_10.sql b/update/2_4_10.sql old mode 100644 new mode 100755 diff --git a/update/2_4_11.php b/update/2_4_11.php old mode 100644 new mode 100755 diff --git a/update/2_4_11.sql b/update/2_4_11.sql old mode 100644 new mode 100755 diff --git a/update/2_4_12.sql b/update/2_4_12.sql old mode 100644 new mode 100755 diff --git a/update/2_4_13.php b/update/2_4_13.php old mode 100644 new mode 100755 diff --git a/update/2_4_14.sql b/update/2_4_14.sql old mode 100644 new mode 100755 index 2a61d053f..cfa1a8155 --- a/update/2_4_14.sql +++ b/update/2_4_14.sql @@ -33,4 +33,18 @@ ALTER TABLE `co_righe_contratti` CHANGE `qta_evasa` `qta_evasa` decimal(14, 6) N ALTER TABLE `mg_articoli` CHANGE `threshold_qta` `threshold_qta` decimal(14, 6) NOT NULL; INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `filename`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `default`, `enabled`) VALUES -(NULL, (SELECT id FROM zz_modules WHERE `name`='Preventivi'), 1, 'Preventivo (solo totale)', 'Preventivo (solo totale)', 'Preventivo num. {numero} del {data}', 'preventivi', 'idpreventivo', '{\"pricing\":false, \"show_only_total\":true}', 'fa fa-print', '', '', 0, 0, 1, 1); \ No newline at end of file +(NULL, (SELECT id FROM zz_modules WHERE `name`='Preventivi'), 1, 'Preventivo (solo totale)', 'Preventivo (solo totale)', 'Preventivo num. {numero} del {data}', 'preventivi', 'idpreventivo', '{\"pricing\":false, \"show_only_total\":true}', 'fa fa-print', '', '', 0, 0, 1, 1); + +-- Unificazione righe e articoli interventi +ALTER TABLE `in_righe_interventi` ADD `abilita_serial` boolean NOT NULL DEFAULT '0' AFTER `um`; +ALTER TABLE `in_righe_interventi` ADD `idimpianto` int(11); +ALTER TABLE `in_righe_interventi` ADD `old_id` int(11); + +INSERT INTO `in_righe_interventi` (`old_id`, `idarticolo`, `idintervento`, `is_descrizione`, `is_sconto`, `descrizione`, `prezzo_acquisto`, `prezzo_vendita`, `sconto`, `sconto_unitario`, `tipo_sconto`, `idiva`, `desc_iva`, `iva`, `qta`, `um`, `abilita_serial`, `created_at`, `updated_at`, `idimpianto`) SELECT `id`, `idarticolo`, `idintervento`, `is_descrizione`, `is_sconto`, `descrizione`, `prezzo_acquisto`, `prezzo_vendita`, `sconto`, `sconto_unitario`, `tipo_sconto`, `idiva`, `desc_iva`, `iva`, `qta`, `um`, `abilita_serial`, `created_at`, `updated_at`, `idimpianto` FROM `mg_articoli_interventi`; + +UPDATE `mg_prodotti` SET `id_riga_intervento` = (SELECT `id` FROM `in_righe_interventi` WHERE `in_righe_interventi`.`old_id` = `id_riga_intervento`) WHERE `id_riga_intervento` IS NOT NULL; +ALTER TABLE `in_righe_interventi` DROP `old_id`; + +-- ALTER TABLE `in_righe_interventi` CHANGE `prezzo_acquisto` `prezzo_unitario_acquisto` decimal(12,6), +-- CHANGE `prezzo_vendita` `prezzo_unitario_vendita` decimal(12,6); +-- TODO su tutte le tabelle diff --git a/update/2_4_2.php b/update/2_4_2.php old mode 100644 new mode 100755 diff --git a/update/2_4_2.sql b/update/2_4_2.sql old mode 100644 new mode 100755 diff --git a/update/2_4_3.php b/update/2_4_3.php old mode 100644 new mode 100755 diff --git a/update/2_4_3.sql b/update/2_4_3.sql old mode 100644 new mode 100755 diff --git a/update/2_4_4.php b/update/2_4_4.php old mode 100644 new mode 100755 diff --git a/update/2_4_4.sql b/update/2_4_4.sql old mode 100644 new mode 100755 diff --git a/update/2_4_5.sql b/update/2_4_5.sql old mode 100644 new mode 100755 diff --git a/update/2_4_6.php b/update/2_4_6.php old mode 100644 new mode 100755 diff --git a/update/2_4_6.sql b/update/2_4_6.sql old mode 100644 new mode 100755 diff --git a/update/2_4_7.php b/update/2_4_7.php old mode 100644 new mode 100755 diff --git a/update/2_4_7.sql b/update/2_4_7.sql old mode 100644 new mode 100755 diff --git a/update/2_4_8.sql b/update/2_4_8.sql old mode 100644 new mode 100755 diff --git a/update/2_4_9.php b/update/2_4_9.php old mode 100644 new mode 100755 diff --git a/update/2_4_9.sql b/update/2_4_9.sql old mode 100644 new mode 100755 diff --git a/update/api.php b/update/api.php old mode 100644 new mode 100755 diff --git a/update/create_updates.sql b/update/create_updates.sql old mode 100644 new mode 100755 diff --git a/update/tables.php b/update/tables.php old mode 100644 new mode 100755 index c48e346ab..7e2c79a0a --- a/update/tables.php +++ b/update/tables.php @@ -78,7 +78,6 @@ return [ 'in_tipiintervento', 'in_vociservizio', 'mg_articoli', - 'mg_articoli_interventi', 'mg_categorie', 'mg_listini', 'mg_movimenti', diff --git a/update/v2_4_10/Anagrafica.php b/update/v2_4_10/Anagrafica.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/Article.php b/update/v2_4_10/Article.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/Components/Articolo.php b/update/v2_4_10/Components/Articolo.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/Components/Descrizione.php b/update/v2_4_10/Components/Descrizione.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/Components/RelationTrait.php b/update/v2_4_10/Components/RelationTrait.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/Components/Riga.php b/update/v2_4_10/Components/Riga.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/Components/Sconto.php b/update/v2_4_10/Components/Sconto.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/Fattura.php b/update/v2_4_10/Fattura.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/TipoAnagrafica.php b/update/v2_4_10/TipoAnagrafica.php old mode 100644 new mode 100755 diff --git a/update/v2_4_10/TipoFattura.php b/update/v2_4_10/TipoFattura.php old mode 100644 new mode 100755 diff --git a/view.php b/view.php old mode 100644 new mode 100755
'.tr('Prezzo di vendita').'
- '.$r['descrizione'].' + '.$riga->descrizione.' '.Translator::numberToLocale($r['qta'], 'qta').''.Translator::numberToLocale($r['prezzo_acquisto'] * $r['qta']).''.Translator::numberToLocale($r['prezzo_vendita'] * $r['qta']).$sconto.''.numberFormat($riga->qta, 'qta').''.moneyFormat($riga->spesa).''.moneyFormat($riga->imponibile).$sconto.'
- '.Translator::numberToLocale($totale_ore_interventi).' + '.numberFormat($totale_ore).' - '.Translator::numberToLocale($totale_km).' + '.numberFormat($totale_km).' - '.Translator::numberToLocale($totale_costo).' + '.moneyFormat($totale_costo).' - '.Translator::numberToLocale($totale_addebito).' + '.moneyFormat($totale_addebito).' - '.Translator::numberToLocale($totale).' + '.moneyFormat($totale).'
- '.$stati[$stato].': + + '.$stato->descrizione.': - '.Translator::numberToLocale($tot).' + '.moneyFormat($totale_stato).'
'.tr('Ore in contratto').': '.Translator::numberToLocale($totale_ore_contratto).'
'.tr('Ore erogate totali').': '.Translator::numberToLocale($totale_ore_interventi).''.tr('Ore residue totali').': '.Translator::numberToLocale(floatval($totale_ore_contratto) - floatval($totale_ore_interventi)).'
'.tr('Ore erogate concluse').': '.Translator::numberToLocale($totale_ore_completate).''.tr('Ore residue').': '.Translator::numberToLocale(floatval($totale_ore_contratto) - floatval($totale_ore_completate)).'