diff --git a/templates/scadenzario/init.php b/templates/scadenzario/init.php
index 42f529dc4..843527a30 100755
--- a/templates/scadenzario/init.php
+++ b/templates/scadenzario/init.php
@@ -19,6 +19,8 @@
include_once __DIR__.'/../../core.php';
+use Modules\Fatture\Fattura;
+
$date_start = $_SESSION['period_start'];
$date_end = $_SESSION['period_end'];
@@ -49,6 +51,17 @@ if (!empty($search_filters)) {
$module_query = str_replace('1=1', '1=1 AND ABS(`co_scadenziario`.`pagato`) < ABS(`co_scadenziario`.`da_pagare`) ', $module_query);
+// Scelgo la query in base alla scadenza
+if (isset($id_record)) {
+ $record = $dbo->fetchOne('SELECT * FROM co_scadenziario WHERE id = '.prepare($id_record));
+ $documento = Fattura::find($record['iddocumento']);
+ if (!empty($documento)) {
+ $module_query = str_replace('1=1', '1=1 AND co_scadenziario.iddocumento='.prepare($documento->id), $module_query);
+ } else {
+ $module_query = str_replace('1=1', '1=1 AND co_scadenziario.id='.prepare($id_record), $module_query);
+ }
+}
+
// Filtri derivanti dai permessi (eventuali)
$module_query = Modules::replaceAdditionals($id_module, $module_query);
diff --git a/templates/scadenzario/top.php b/templates/scadenzario/top.php
index cd27ddf36..b0c4ca13f 100755
--- a/templates/scadenzario/top.php
+++ b/templates/scadenzario/top.php
@@ -19,12 +19,21 @@
include_once __DIR__.'/../../core.php';
-echo '
-
'.tr('Scadenze dal _START_ al _END_', [
- '_START_' => Translator::dateToLocale($date_start),
- '_END_' => Translator::dateToLocale($date_end),
- ], ['upper' => true]).'
+if (isset($id_record)) {
+ echo '
+ '.tr('Scadenza _ANAG_', [
+ '_ANAG_' => $records[0]['Anagrafica'],
+ ], ['upper' => true]).'
';
+} else {
+ echo '
+ '.tr('Scadenze dal _START_ al _END_', [
+ '_START_' => Translator::dateToLocale($date_start),
+ '_END_' => Translator::dateToLocale($date_end),
+ ], ['upper' => true]).'
+
';
+}
+echo '
diff --git a/update/2_4_34.sql b/update/2_4_34.sql
index 4051042b9..a55ede6f6 100644
--- a/update/2_4_34.sql
+++ b/update/2_4_34.sql
@@ -46,4 +46,8 @@ ALTER TABLE `in_fasceorarie` ADD `deleted_at` TIMESTAMP NULL AFTER `include_bank
UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `in_fasceorarie` WHERE 1=1 AND deleted_at IS NULL HAVING 2=2' WHERE `zz_modules`.`name` = 'Fasce orarie';
-- Stampa Barcode bulk
-INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `filename`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `default`, `enabled`, `created_at`, `updated_at`) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli'), '0', 'Barcode bulk', 'Barcode', 'Barcode', 'barcode_bulk', '', '', 'fa fa-print', '', '', '0', '1', '1', '1');
\ No newline at end of file
+INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `filename`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `predefined`, `default`, `enabled`, `created_at`, `updated_at`) VALUES (NULL, (SELECT `id` FROM `zz_modules` WHERE `name` = 'Articoli'), '0', 'Barcode bulk', 'Barcode', 'Barcode', 'barcode_bulk', '', '', 'fa fa-print', '', '', '0', '1', '1', '1');
+
+-- Stampa scadenza
+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` = 'Scadenzario'), 1, 'Scadenza', 'Scadenza', 'Scadenza', 'scadenzario', '', '', 'fa fa-print', '', '', 0, 0, 1, 1);