diff --git a/modules/banche/add.php b/modules/banche/add.php index 5dfa66e69..ca5b6abe5 100644 --- a/modules/banche/add.php +++ b/modules/banche/add.php @@ -8,7 +8,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "nome", "value": "" ]} + {[ "type": "text", "label": "", "name": "nome", "required": "1", "value": "" ]}
diff --git a/modules/banche/edit.php b/modules/banche/edit.php index 4575498f5..1d1bdfcc0 100644 --- a/modules/banche/edit.php +++ b/modules/banche/edit.php @@ -18,7 +18,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "nome", "value": "$nome$" ]} + {[ "type": "text", "label": "", "name": "nome", "required": "1", "value": "$nome$" ]}
{[ "type": "text", "label": "", "name": "filiale", "value": "$filiale$" ]} @@ -30,7 +30,7 @@ include_once __DIR__.'/../../core.php';
- {[ "type": "text", "label": "", "name": "iban", "class": "alphanumeric-mask", "maxlength": 32, "value": "$iban$" ]} + {[ "type": "text", "label": "", "name": "iban", "required": "1", "class": "alphanumeric-mask", "maxlength": 32, "value": "$iban$" ]}
{[ "type": "text", "label": "", "name": "bic", "class": "alphanumeric-mask", "maxlength": 11, "value": "$bic$" ]} diff --git a/modules/fatture/edit.php b/modules/fatture/edit.php index c62682b3a..80b6f4064 100644 --- a/modules/fatture/edit.php +++ b/modules/fatture/edit.php @@ -151,7 +151,7 @@ $_SESSION['superselect']['ddt'] = $dir;
- {[ "type": "select", "label": "", "name": "idbanca", "required": 0, "values": "query=SELECT id, nome AS descrizione FROM co_banche WHERE deleted = 0 ORDER BY nome ASC", "value": "$idbanca$" ]} + {[ "type": "select", "label": "", "name": "idbanca", "required": 0, "values": "query=SELECT id, CONCAT (nome, ' - ' , iban) AS descrizione FROM co_banche WHERE deleted = 0 ORDER BY nome ASC", "value": "$idbanca$" ]}
diff --git a/templates/fatture/header.php b/templates/fatture/header.php index e6536aef0..06cb5b34e 100644 --- a/templates/fatture/header.php +++ b/templates/fatture/header.php @@ -12,7 +12,7 @@ $default_header$ $tipo_doc$
- +

'.tr('Nr. documento', [], ['upper' => true]).'

diff --git a/templates/fatture/settings.php b/templates/fatture/settings.php index ac0c57975..9f63798c5 100644 --- a/templates/fatture/settings.php +++ b/templates/fatture/settings.php @@ -1,6 +1,6 @@ 75, - 'footer-height' => 60, + 'header-height' => 80, + 'footer-height' => 55, ]; diff --git a/update/2_4_1.sql b/update/2_4_1.sql index 16d688f15..e457c1989 100644 --- a/update/2_4_1.sql +++ b/update/2_4_1.sql @@ -67,3 +67,6 @@ INSERT INTO `zz_widgets` (`id`, `name`, `type`, `id_module`, `location`, `class` -- Stampa calendario INSERT INTO `zz_prints` (`id`, `id_module`, `is_record`, `name`, `title`, `directory`, `previous`, `options`, `icon`, `version`, `compatibility`, `order`, `main`, `default`, `enabled`) VALUES (NULL, '1', '1', 'Stampa calendario', 'Stampa calendario', 'dashboard', '', '', 'fa fa-print', '', '', '0', '1', '1', '1'); + +-- Rimosso group by nome banche +UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `co_banche` WHERE 1=1 AND deleted = 0 HAVING 2=2' WHERE `zz_modules`.`name` = 'Banche';