';
- /**
- * 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)) {
'.tr('Diritto ch.').' |
';
- 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 '
- '.$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).' |
';
}
@@ -142,11 +99,9 @@ if (!empty($rsi)) {
';
}
- /**
- * 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)) {
'.tr('Prezzo di vendita').' |
';
- 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 '
- '.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.' |
';
}
@@ -175,11 +129,9 @@ if (!empty($rsi)) {
';
}
- /**
- * 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)) {
'.tr('Prezzo di vendita').' |
';
- 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 '
- '.$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.' |
';
}
@@ -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 '
- '.Translator::numberToLocale($totale_ore_interventi).'
+ '.numberFormat($totale_ore).'
| ';
echo '
- '.Translator::numberToLocale($totale_km).'
+ '.numberFormat($totale_km).'
| ';
echo '
- '.Translator::numberToLocale($totale_costo).'
+ '.moneyFormat($totale_costo).'
| ';
echo '
- '.Translator::numberToLocale($totale_addebito).'
+ '.moneyFormat($totale_addebito).'
| ';
echo '
- '.Translator::numberToLocale($totale).'
+ '.moneyFormat($totale).'
|
';
@@ -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 '
|
-
- '.$stati[$stato].':
+ |
+ '.$stato->descrizione.':
|
- '.Translator::numberToLocale($tot).'
+ '.moneyFormat($totale_stato).'
|
';
}
@@ -316,11 +271,11 @@ if (!empty($totale_ore_contratto)) {
'.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)).' |
@@ -328,7 +283,7 @@ if (!empty($totale_ore_contratto)) {
'.tr('Ore erogate concluse').': |
'.Translator::numberToLocale($totale_ore_completate).' |
-
+
'.tr('Ore residue').': |
'.Translator::numberToLocale(floatval($totale_ore_contratto) - floatval($totale_ore_completate)).' |
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 '
-';
-
-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 '
-';
-
-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
|