Skip to content

Commit 32025e5

Browse files
committed
fix: 1051 Relazioni anagrafiche blocca modifica documenti esistenti
1 parent c51bcdf commit 32025e5

6 files changed

Lines changed: 9 additions & 8 deletions

File tree

modules/anagrafiche/ajax/select.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
case 'clienti':
2727
$id_azienda = setting('Azienda predefinita');
2828
$tipologia = Tipo::where('name', 'Cliente')->first()->id;
29+
$force_selected = $superselect['force_selected'] ?? false;
30+
2931
$query = "SELECT
3032
`an_anagrafiche`.`idanagrafica` AS id,
3133
`an_anagrafiche`.`lat`,
@@ -82,7 +84,7 @@
8284
foreach ($rs as $k => $r) {
8385
$rs[$k] = array_merge($r, [
8486
'text' => $r['descrizione'],
85-
'disabled' => $r['is_bloccata'],
87+
'disabled' => $force_selected ? 0 : $r['is_bloccata'],
8688
]);
8789
}
8890

modules/contratti/edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<div class="row">
7676
<div class="col-md-4">
7777
'.Modules::link('Anagrafiche', $record['idanagrafica'], null, null, 'class="pull-right"').'
78-
{[ "type": "select", "label": "'.tr('Cliente').'", "name": "idanagrafica", "id": "idanagrafica_c", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti" ]}
78+
{[ "type": "select", "label": "'.tr('Cliente').'", "name": "idanagrafica", "id": "idanagrafica_c", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti", "select-options": '.json_encode(['force_selected' => $record['idanagrafica'] ? 'true' : 'false']).' ]}
7979
</div>
8080
8181
<div class="col-md-4">

modules/fatture/edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313

314314
if ($dir == 'entrata') {
315315
?>
316-
{[ "type": "select", "label": "<?php echo tr('Cliente'); ?>", "name": "idanagrafica", "required": 1, "ajax-source": "clienti", "help": "<?php echo tr("In caso di autofattura indicare l'azienda: ").stripslashes((string) $database->fetchOne('SELECT `ragione_sociale` FROM `an_anagrafiche` WHERE `idanagrafica` = '.prepare(setting('Azienda predefinita')))['ragione_sociale']); ?>", "value": "$idanagrafica$" ]}
316+
{[ "type": "select", "label": "<?php echo tr('Cliente'); ?>", "name": "idanagrafica", "required": 1, "ajax-source": "clienti", "select-options": <?php echo json_encode(['force_selected' => $record['idanagrafica'] ? 'true' : 'false']); ?>, "help": "<?php echo tr("In caso di autofattura indicare l'azienda: ").stripslashes((string) $database->fetchOne('SELECT `ragione_sociale` FROM `an_anagrafiche` WHERE `idanagrafica` = '.prepare(setting('Azienda predefinita')))['ragione_sociale']); ?>", "value": "$idanagrafica$" ]}
317317
<?php
318318
} else {
319319
?>

modules/interventi/edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<div class="row">
7676
<div class="col-md-3">
7777
'.Modules::link('Anagrafiche', $record['idanagrafica'], null, null, 'class="pull-right"').'
78-
{[ "type": "select", "label": "'.tr('Cliente').'", "name": "idanagrafica", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti", "readonly": "'.($user['gruppo'] == 'Clienti' ? '1' : $record['flag_completato']).'" ]}
78+
{[ "type": "select", "label": "'.tr('Cliente').'", "name": "idanagrafica", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti", "select-options": '.json_encode(['force_selected' => $record['idanagrafica'] ? 'true' : 'false']).', "readonly": "'.($user['gruppo'] == 'Clienti' ? '1' : $record['flag_completato']).'" ]}
7979
</div>
8080
<div class="col-md-3">
8181
{[ "type": "select", "label": "'.tr('Zona').'", "name": "idzona", "values": "query=SELECT id, CONCAT_WS( \' - \', nome, descrizione) AS descrizione FROM an_zone ORDER BY nome", "value": "$idzona$" , "placeholder": "'.tr('Nessuna zona').'", "extra": "readonly", "help":"'.tr('La zona viene definita automaticamente in base al cliente selezionato.').'" ]}

modules/ordini/edit.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,8 @@
9696
echo Modules::link('Anagrafiche', $record['idanagrafica'], null, null, 'class="pull-right"');
9797

9898
if ($dir == 'entrata') {
99-
?>
100-
{[ "type": "select", "label": "<?php echo tr('Cliente'); ?>", "name": "idanagrafica", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti" ]}
101-
<?php
99+
echo'
100+
{[ "type": "select", "label": "'.tr('Cliente').'", "name": "idanagrafica", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti", "select-options": '.json_encode(['force_selected' => $record['idanagrafica'] ? 'true' : 'false']).']}';
102101
} else {
103102
?>
104103
{[ "type": "select", "label": "<?php echo tr('Fornitore'); ?>", "name": "idanagrafica", "required": 1, "ajax-source": "fornitori", "value": "$idanagrafica$" ]}

modules/preventivi/edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<div class="row">
6464
<div class="col-md-4">
6565
'.Modules::link('Anagrafiche', $record['idanagrafica'], null, null, 'class="pull-right"').'
66-
{[ "type": "select", "label": "'.tr('Cliente').'", "name": "idanagrafica", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti" ]}
66+
{[ "type": "select", "label": "'.tr('Cliente').'", "name": "idanagrafica", "required": 1, "value": "$idanagrafica$", "ajax-source": "clienti", "select-options": '.json_encode(['force_selected' => $record['idanagrafica'] ? 'true' : 'false']).' ]}
6767
</div>
6868
6969
<div class="col-md-4">

0 commit comments

Comments
 (0)