1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-03 09:17:37 +01:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Thomas Zilio 2020-03-30 18:48:54 +02:00
commit 23c2c0fa16
2 changed files with 4 additions and 1 deletions

View File

@ -50,7 +50,7 @@ $_SESSION['superselect']['idanagrafica'] = $record['idanagrafica'];
<?php
} else {
?>
{[ "type": "select", "label": "<?php echo tr('Stato'); ?>", "name": "idstatoordine", "required": 1, "values": "query=SELECT * FROM or_statiordine WHERE descrizione IN('Bozza', 'Accettato')", "value": "$idstatoordine$", "class": "unblockable" ]}
{[ "type": "select", "label": "<?php echo tr('Stato'); ?>", "name": "idstatoordine", "required": 1, "values": "query=SELECT * FROM or_statiordine WHERE descrizione IN('Bozza', 'Accettato', 'Inviato')", "value": "$idstatoordine$", "class": "unblockable" ]}
<?php
}
} else {

View File

@ -488,3 +488,6 @@ INSERT INTO `zz_api_resources` (`id`, `version`, `type`, `resource`, `class`, `e
(NULL, 'v1', 'create', 'impianti_intervento', 'Modules\\Interventi\\API\\v1\\Impianti', '1'),
(NULL, 'v1', 'retrieve', 'rapportino', 'Modules\\Interventi\\API\\v1\\Rapportino', '1'),
(NULL, 'v1', 'create', 'rapportino', 'Modules\\Interventi\\API\\v1\\Rapportino', '1');
-- Aggiunta stato "Inviato" agli ordini fornitore
INSERT INTO `or_statiordine` (`id`, `descrizione`, `annullato`, `icona`, `completato`) VALUES (NULL, 'Inviato', '0', 'fa fa-envelope text-primary', '0');