diff --git a/modules/articoli/actions.php b/modules/articoli/actions.php index 45bcb947c..4905cca60 100644 --- a/modules/articoli/actions.php +++ b/modules/articoli/actions.php @@ -151,7 +151,7 @@ switch (post('op')) { preg_match("/(.*?)([\d]*$)/", $serial__end, $m); $serial_end = intval($m[2]); $n_serial = abs($serial_end - $serial_start) + 1; - $serial_prefix = rtrim($serial__end,$serial_end); + $serial_prefix = rtrim($serial__end, $serial_end); $serial_pad_length = strlen($serial__end) - strlen($serial_prefix); // Altro diff --git a/modules/articoli/ajax/select.php b/modules/articoli/ajax/select.php index b7c88bd4c..51099cb1b 100644 --- a/modules/articoli/ajax/select.php +++ b/modules/articoli/ajax/select.php @@ -48,8 +48,8 @@ switch ($resource) { 'codice' => 'codice', 'descrizione' => 'descrizione', 'um' => 'um', - 'categoria' => 'categoria', - 'sottocategoria' => 'sottocategoria', + 'categoria' => 'categoria', + 'sottocategoria' => 'sottocategoria', 'idiva_vendita' => 'idiva_vendita', 'iva_vendita' => 'iva_vendita', 'idconto_vendita' => 'idconto_vendita', diff --git a/modules/articoli/import.php b/modules/articoli/import.php index 954df035a..c78d2a8ea 100644 --- a/modules/articoli/import.php +++ b/modules/articoli/import.php @@ -74,19 +74,17 @@ switch (post('op')) { ]); } } - - - // Codice --> ID IVA vendita + + // Codice --> ID IVA vendita if (!empty($data[$key]['idiva_vendita'])) { $rs_iva = $dbo->select('co_iva', 'id', [ 'codice' => $data[$key]['idiva_vendita'], ]); - - if (!empty($rs_iva[0]['id'])) { - $data[$key]['idiva_vendita'] = $rs_iva[0]['id']; - }; - } + if (!empty($rs_iva[0]['id'])) { + $data[$key]['idiva_vendita'] = $rs_iva[0]['id']; + } + } // Insert o update $insert = true; @@ -179,7 +177,7 @@ return [ 'idcategoria', ], ], - [ + [ 'field' => 'idiva_vendita', 'label' => 'Codice IVA vendita', 'names' => [ diff --git a/modules/fatture/buttons.php b/modules/fatture/buttons.php index 488945b37..59c9f4f88 100644 --- a/modules/fatture/buttons.php +++ b/modules/fatture/buttons.php @@ -42,7 +42,6 @@ if (empty($record['is_fiscale'])) { '; } - ?> + ?> + ?> '.tr('Genera').' '; - - $file = $generated ? Models\Upload::where('filename', $fattura_pa->getFilename())->where('id_record', $id_record)->first() : null; + + $file = $generated ? Models\Upload::where('filename', $fattura_pa->getFilename())->where('id_record', $id_record)->first() : null; echo ' @@ -168,18 +168,17 @@ echo ' '.tr('Visualizza').' '; - - // Scelgo quando posso inviarla - $send = Interaction::isEnabled() && $generated && in_array($record['codice_stato_fe'], ['GEN', 'ERVAL']); - + // Scelgo quando posso inviarla + $send = Interaction::isEnabled() && $generated && in_array($record['codice_stato_fe'], ['GEN', 'ERVAL']); + echo ' '.tr('Scarica').' '; - + echo ' diff --git a/plugins/revisioni/edit.php b/plugins/revisioni/edit.php index f8f90378c..4eea9bc12 100644 --- a/plugins/revisioni/edit.php +++ b/plugins/revisioni/edit.php @@ -1,4 +1,4 @@ -"; diff --git a/src/HTMLBuilder/Manager/WidgetManager.php b/src/HTMLBuilder/Manager/WidgetManager.php index 4b74d635a..97fe31e27 100644 --- a/src/HTMLBuilder/Manager/WidgetManager.php +++ b/src/HTMLBuilder/Manager/WidgetManager.php @@ -162,10 +162,10 @@ class WidgetManager implements ManagerInterface
'; - if (!empty($widget['icon'])) { - $result .= ' + if (!empty($widget['icon'])) { + $result .= ' '; - } + } $result .= ' @@ -173,12 +173,12 @@ class WidgetManager implements ManagerInterface
'; - if(!empty($widget['php_include'])){ + if (!empty($widget['php_include'])) { $result_ob = ''; ob_start(); - include(DOCROOT."/".$widget['php_include']); + include DOCROOT.'/'.$widget['php_include']; $result_ob = ob_get_contents(); ob_end_clean(); diff --git a/templates/registro_iva/body.php b/templates/registro_iva/body.php index cc7a8cdb7..966fed840 100644 --- a/templates/registro_iva/body.php +++ b/templates/registro_iva/body.php @@ -3,9 +3,9 @@ include_once __DIR__.'/../../core.php'; $dir = $_GET['dir']; -if($dir=='entrata'){ +if ($dir == 'entrata') { $tipo = 'vendite'; -}else{ +} else { $tipo = 'acquisti'; } @@ -29,13 +29,13 @@ if ('entrata' == $dir) { echo "".tr('Registro iva vendita dal _START_ al _END_ _ESERCIZIO_', [ '_START_' => Translator::dateToLocale($date_start), '_END_' => Translator::dateToLocale($date_end), - '_ESERCIZIO_' => (date('Y', strtotime($date_start))==date('Y', strtotime($date_end))? '- Esercizio '.date('Y', strtotime($date_end)): ''), + '_ESERCIZIO_' => (date('Y', strtotime($date_start)) == date('Y', strtotime($date_end)) ? '- Esercizio '.date('Y', strtotime($date_end)) : ''), ], ['upper' => true]).'

'; } elseif ('uscita' == $dir) { echo "".tr('Registro iva acquisto dal _START_ al _END_ _ESERCIZIO_', [ '_START_' => Translator::dateToLocale($date_start), '_END_' => Translator::dateToLocale($date_end), - '_ESERCIZIO_' => (date('Y', strtotime($date_start))==date('Y', strtotime($date_end))? '- Esercizio '.date('Y', strtotime($date_end)): ''), + '_ESERCIZIO_' => (date('Y', strtotime($date_start)) == date('Y', strtotime($date_end)) ? '- Esercizio '.date('Y', strtotime($date_end)) : ''), ], ['upper' => true]).'

'; } @@ -62,18 +62,18 @@ for ($i = 0; $i < sizeof($rs); ++$i) { echo ' '; if ($rs[$i]['numero'] == $rs[$i - 1]['numero']) { - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; } else { - echo " ".$rs[$i]['numero'].''; - echo " ".$rs[$i]['numero_esterno'].''; - echo " ".date('d/m/Y', strtotime($rs[$i]['data'])).''; - echo " ".$rs[$i]['codice_tipo_documento_fe'].''; - echo " ".$rs[$i]['codice_anagrafica']." / ".tr($rs[$i]['ragione_sociale'], [], ['upper' => true]).''; + echo ' '.$rs[$i]['numero'].''; + echo ' '.$rs[$i]['numero_esterno'].''; + echo ' '.date('d/m/Y', strtotime($rs[$i]['data'])).''; + echo ' '.$rs[$i]['codice_tipo_documento_fe'].''; + echo ' '.$rs[$i]['codice_anagrafica'].' / '.tr($rs[$i]['ragione_sociale'], [], ['upper' => true]).''; echo " ".Translator::numberToLocale(get_totale_fattura($rs[$i]['iddocumento'])).' €'; } diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php index 4f8e39312..e3a9dd03c 100644 --- a/tests/_support/FunctionalTester.php +++ b/tests/_support/FunctionalTester.php @@ -1,6 +1,5 @@ fillField('#descrizione_riga', $descrizione); $t->fillField('#qta', $qta); - $t->fillField("#prezzo", $prezzo); + $t->fillField('#prezzo', $prezzo); if (!empty($sconto)) { $t->fillField('#sconto', $sconto); diff --git a/tests/_support/Helper/Select2Ajax.php b/tests/_support/Helper/Select2Ajax.php index 93c12f72a..7d169fbb1 100644 --- a/tests/_support/Helper/Select2Ajax.php +++ b/tests/_support/Helper/Select2Ajax.php @@ -1,4 +1,6 @@ -