loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-03 17:27:29 +01:00
Code Issues Releases Activity

Fix dichiarazione intento su data fattura

Browse Source
This commit is contained in:
Beppe 2021-01-05 11:24:42 +01:00
parent eb801d0fde
commit 1f1721db61
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/anagrafiche/ajax/select.php
View File

@ -342,8 +342,10 @@ switch ($resource) {
$filter[] = 'id='.prepare($element); $filter[] = 'id='.prepare($element);
} }
$where[] = 'data_inizio < NOW()'; $where[] = '( '.prepare($superselect['data']).' BETWEEN data_inizio AND data_fine)';
$where[] = 'data_fine > NOW()';
//$where[] = 'data_inizio < NOW()';
//$where[] = 'data_fine > NOW()';
if (empty($filter)) { if (empty($filter)) {
$where[] = 'deleted_at IS NULL'; $where[] = 'deleted_at IS NULL';
} }

2
modules/fatture/edit.php
View File

@ -353,7 +353,7 @@ elseif ($record['stato'] == 'Bozza') {
if ($dir == 'entrata') { if ($dir == 'entrata') {
echo ' echo '
<div class="col-md-3"> <div class="col-md-3">
{[ "type": "select", "label": "'.tr("Dichiarazione d'intento").'", "name": "id_dichiarazione_intento", "ajax-source": "dichiarazioni_intento", "select-options": {"idanagrafica": '.$record['idanagrafica'].'}, "value": "$id_dichiarazione_intento$" ]} {[ "type": "select", "label": "'.tr("Dichiarazione d'intento").'", "name": "id_dichiarazione_intento", "ajax-source": "dichiarazioni_intento", "select-options": {"idanagrafica": '.$record['idanagrafica'].', "data": "'.$record['data'].'"},"value": "$id_dichiarazione_intento$" ]}
</div>'; </div>';
} }
echo ' echo '