diff --git a/editor.php b/editor.php index e1fae0a7d..bd7b132d2 100755 --- a/editor.php +++ b/editor.php @@ -107,26 +107,25 @@ if (empty($record) || !$has_access) {
'; if (!empty($record['deleted_at'])) { - - $operation = $dbo->fetchOne("SELECT zz_operations.created_at, username FROM zz_operations INNER JOIN zz_users ON zz_operations.id_utente = zz_users.id WHERE op='delete' AND id_module=".prepare($id_module)." AND id_record=".prepare($id_module)." ORDER BY zz_operations.created_at DESC"); - - if (!empty($operation['username'])){ - $info = tr('Il record è stato eliminato il _DATE_ da _USER_ ,', [ + $operation = $dbo->fetchOne("SELECT zz_operations.created_at, username FROM zz_operations INNER JOIN zz_users ON zz_operations.id_utente = zz_users.id WHERE op='delete' AND id_module=".prepare($id_module).' AND id_record='.prepare($id_record).' ORDER BY zz_operations.created_at DESC'); + + if (!empty($operation['username'])) { + $info = tr('Il record è stato eliminato il _DATE_ da _USER_', [ '_DATE_' => Translator::timestampToLocale($operation['created_at']), '_USER_' => $operation['username'], - ]); + ]).'. '; } echo '
-
-
- '.$info.' '.tr('Ripristinare il record?').' +
+
+ '.$info.''.tr('Ripristinare il record?').'
-
- +
+
diff --git a/include/init/init.php b/include/init/init.php index 8945f85c4..a500e397a 100644 --- a/include/init/init.php +++ b/include/init/init.php @@ -195,16 +195,15 @@ if (!$has_settings) {
'; - - foreach ($settings as $setting => $required) { - if (empty(setting($setting))) { - echo ' + foreach ($settings as $setting => $required) { + if (empty(setting($setting))) { + echo '
'.Settings::input($setting, $required).'
'; - } } + } echo '
diff --git a/lib/functions.js b/lib/functions.js index e86c3a8ff..f8784e8a2 100644 --- a/lib/functions.js +++ b/lib/functions.js @@ -1643,7 +1643,7 @@ function submitAjax(form, data = {}, callback = null, errorCallback = null) { if (data) { response = JSON.parse(data); - callback(response); + if (callback) callback(response); } $("#main_loading").fadeOut(); @@ -1680,7 +1680,7 @@ function submitAjax(form, data = {}, callback = null, errorCallback = null) { toastr["error"](data); - errorCallback(data); + if (errorCallback) errorCallback(data); } }); } diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php index 67ef2df6f..7e8977b57 100644 --- a/modules/anagrafiche/edit.php +++ b/modules/anagrafiche/edit.php @@ -586,7 +586,7 @@ if (!empty($elementi)) { '_DOC_' => $elemento['tipo_documento'], '_NUM_' => !empty($elemento['numero_esterno']) ? $elemento['numero_esterno'] : $elemento['numero'], '_DATE_' => Translator::dateToLocale($elemento['data']), - '_DELETED_AT_' => (!empty($elemento['deleted_at']) ? tr('Eliminato il:').' '.Translator::dateToLocale($elemento['deleted_at']) : '') , + '_DELETED_AT_' => (!empty($elemento['deleted_at']) ? tr('Eliminato il:').' '.Translator::dateToLocale($elemento['deleted_at']) : ''), ]); //se non è un preventivo è un ddt o una fattura diff --git a/modules/anagrafiche/validation.php b/modules/anagrafiche/validation.php index ff04f1a8a..73f31d9f1 100644 --- a/modules/anagrafiche/validation.php +++ b/modules/anagrafiche/validation.php @@ -25,6 +25,7 @@ switch ($name) { case 'codice_fiscale': $disponibile = Anagrafica::where([ ['codice_fiscale', $value], + ['codice_fiscale', '<>', ''], ['idanagrafica', '<>', $id_record], ])->count() == 0; @@ -50,6 +51,7 @@ switch ($name) { case 'partita_iva': $disponibile = Anagrafica::where([ ['piva', $value], + ['piva', '<>', ''], ['idanagrafica', '<>', $id_record], ])->count() == 0; diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php index bd6096c05..a71db258d 100644 --- a/modules/fatture/edit.php +++ b/modules/fatture/edit.php @@ -690,20 +690,20 @@ if (in_array($record[$field_name], $user->sedi)) { '; -?> diff --git a/modules/fatture/init.php b/modules/fatture/init.php index a1cc7d11c..9c40c6eeb 100644 --- a/modules/fatture/init.php +++ b/modules/fatture/init.php @@ -11,7 +11,7 @@ if ($module['name'] == 'Fatture di vendita') { if (isset($id_record)) { $fattura = Modules\Fatture\Fattura::with('tipo', 'stato')->find($id_record); - $record = $dbo->fetchOne('SELECT *, + $record = $dbo->fetchOne('SELECT co_documenti.*, co_tipidocumento.reversed AS is_reversed, co_documenti.idagente AS idagente_fattura, co_documenti.note, diff --git a/modules/preventivi/edit.php b/modules/preventivi/edit.php index 46edb2fc3..3a7cbfa48 100644 --- a/modules/preventivi/edit.php +++ b/modules/preventivi/edit.php @@ -43,7 +43,9 @@ $_SESSION['superselect']['idanagrafica'] = $record['idanagrafica'];
{[ "type": "select", "label": "", "name": "idreferente", "value": "$idreferente$", "ajax-source": "referenti" ]} diff --git a/plugins/exportFE/edit.php b/plugins/exportFE/edit.php index eabdcee13..53abc5971 100644 --- a/plugins/exportFE/edit.php +++ b/plugins/exportFE/edit.php @@ -257,25 +257,43 @@ echo '
'; -if ($generated) { - echo ' +echo ' '; -} diff --git a/plugins/referenti/actions.php b/plugins/referenti/actions.php index d4609e22e..f185445cd 100644 --- a/plugins/referenti/actions.php +++ b/plugins/referenti/actions.php @@ -44,6 +44,7 @@ switch ($operazione) { case 'deletereferente': $dbo->query('DELETE FROM `an_referenti` WHERE `id`='.prepare($id_record)); + $dbo->query('UPDATE co_preventivi SET idreferente = 0 WHERE `idreferente` = '.prepare($id_record)); flash()->info(tr('Referente eliminato!')); diff --git a/plugins/statistiche_anagrafiche/info.php b/plugins/statistiche_anagrafiche/info.php index 2c8568050..b230e9397 100644 --- a/plugins/statistiche_anagrafiche/info.php +++ b/plugins/statistiche_anagrafiche/info.php @@ -47,7 +47,7 @@ elseif ($anagrafica->isTipo('Tecnico')) { } $totale_interventi = 0; -foreach ($interventi as $intervento){ +foreach ($interventi as $intervento) { $costi = get_costi_intervento($intervento['id']); $totale_interventi += $costi['totale_scontato'];