loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix minori e migliorie

This commit is contained in:
Luca 2019-11-23 08:23:34 +01:00
parent 35b1463884
commit 5fc3347c89
7 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/articoli/actions.php
View File

@ -97,6 +97,9 @@ switch (post('op')) {
$contenuto = \Util\Ini::write(file_get_contents(DOCROOT.'/files/my_impianti/'.$componente), $post);
$dbo->query('UPDATE mg_articoli SET contenuto='.prepare($contenuto).' WHERE id='.prepare($id_record));
}else{
$dbo->query('UPDATE mg_articoli SET contenuto = \'\' WHERE id='.prepare($id_record));
}
// Upload file

2
modules/articoli/edit.php
View File

@ -221,7 +221,7 @@ $_SESSION['superselect']['id_categoria'] = $record['id_categoria'];
echo "
<select class=\"form-control superselect\" id=\"componente_filename\" name=\"componente_filename\" onchange=\"$.post('".$rootdir."/modules/my_impianti/actions.php', {op: 'load_componente', idarticolo: '".$id_record."', filename: $(this).find('option:selected').val() }, function(response){ $('#info_componente').html( response ); start_superselect(); $('.datepicker').datetimepicker({ locale: globals.locale, format: 'L' } ); } );\">\n";
echo '
<option value="0">- Collega ad un componente -</option>';
<option value="0">'.tr('Nessuno').'</option>';
$cmp = \Util\Ini::getList($docroot.'/files/my_impianti/');

8
modules/articoli/plugins/articoli.giacenze.php
View File

@ -28,7 +28,7 @@ echo '
<div class="col-md-3">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">'.tr('Impegnato').'<span class="tip" title="'.tr('Quantità impegnate in ordini cliente che non siano già completamente evasi o articoli in cesta commessa.').'">
<h3 class="panel-title">'.tr('Impegnato').'<span class="tip pull-right" title="'.tr('Quantità impegnate in ordini cliente che non siano già completamente evasi o articoli in cesta commessa.').'">
<i class="fa fa-question-circle-o"></i></span></h3>
</div>
<div class="panel-body" style="min-height:98px;">';
@ -93,7 +93,7 @@ echo '
<div class="col-md-3">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">'.tr('In ordine').'<span class="tip" title="'.tr('Quantità ordinate al fornitore in ordini che non siano già completamente evasi.').'">
<h3 class="panel-title">'.tr('In ordine').'<span class="tip pull-right" title="'.tr('Quantità ordinate al fornitore in ordini che non siano già completamente evasi.').'">
<i class="fa fa-question-circle-o"></i></span></h3>
</div>
<div class="panel-body" style="min-height:98px;">';
@ -163,7 +163,7 @@ echo '
<div class="col-md-3">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">'.tr('Da ordinare').'<span class="tip" title="'.tr('Quantità richieste dal cliente meno le quantità già ordinate.').'">
<h3 class="panel-title">'.tr('Da ordinare').'<span class="tip pull-right" title="'.tr('Quantità richieste dal cliente meno le quantità già ordinate.').'">
<i class="fa fa-question-circle-o"></i></span></h3>
</div>
<div class="panel-body">
@ -186,7 +186,7 @@ echo '
<div class="col-md-3">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">'.tr('Disponibile').'<span class="tip" title="'.tr('Quantità disponibili nel magazzino.').'">
<h3 class="panel-title">'.tr('Disponibile').'<span class="tip pull-right" title="'.tr('Quantità disponibili nel magazzino.').'">
<i class="fa fa-question-circle-o"></i></span></h3>
</div>
<div class="panel-body">

2
modules/interventi/widgets/interventi_da_pianificare.php
View File

@ -2,7 +2,7 @@
include_once __DIR__.'/../../../core.php';
$rs = $dbo->fetchArray('SELECT * FROM in_interventi WHERE in_interventi.idstatointervento = (SELECT in_statiintervento.idstatointervento FROm in_statiintervento WHERE in_statiintervento.codice=\'DAP\') ORDER BY data_richiesta ASC');
$rs = $dbo->fetchArray('SELECT * FROM in_interventi WHERE in_interventi.idstatointervento = (SELECT in_statiintervento.idstatointervento FROm in_statiintervento WHERE in_statiintervento.codice=\'TODO\') ORDER BY data_richiesta ASC');
if (!empty($rs)) {
echo '

16
modules/viste/fields.php
View File

@ -16,13 +16,19 @@ foreach ($fields as $key => $field) {
$editable = !($field['default'] && $enable_readonly);
echo '
<div class="box box-'.($field['visible'] ? 'success' : 'danger').'">
<div class="box collapsed-box box-'.($field['visible'] ? 'success' : 'danger').'">
<div class="box-header with-border">
<h3 class="box-title">
<a data-toggle="collapse" href="#field-'.$field['id'].'">'.tr('Campo in posizione _POSITION_', [
<h3 class="box-title">'.
tr('Campo in posizione _POSITION_', [
'_POSITION_' => $field['order'],
]).' ('.$field['name'].')</a>
</h3>';
]).' ('.$field['name'].')
</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fa fa-plus"></i>
</button>
</div>';
if ($editable) {
echo '

16
modules/viste/filters.php
View File

@ -15,13 +15,19 @@ if (!empty($additionals)) {
$editable = !($additional['default'] && $enable_readonly);
echo '
<div class="box box-'.($additional['enabled'] ? 'success' : 'danger').'">
<div class="box collapsed-box box-'.($additional['enabled'] ? 'success' : 'danger').'">
<div class="box-header with-border">
<h3 class="box-title">
<a data-toggle="collapse" href="#additional-'.$additional['id'].'">'.tr('Filtro: _NAME_', [
<h3 class="box-title">'.
tr('Filtro: _NAME_', [
'_NAME_' => $additional['name'],
]).'</a>
</h3>';
]).'
</h3>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse">
<i class="fa fa-plus"></i>
</button>
</div>';
if ($editable) {
echo '

2
update/2_4_11.sql
View File

@ -909,3 +909,5 @@ UPDATE `zz_widgets` SET `query` = 'SELECT CONCAT_WS(" ", REPLACE(REPLACE(REPLACE
-- Fix accesso alla stampa dell'inverntario magazzino
UPDATE `zz_prints` SET `is_record` = '0' WHERE `zz_prints`.`name` = 'Inventario magazzino';
UPDATE `in_statiintervento` SET `can_delete` = '0', `in_statiintervento`.`codice` = 'TODO' WHERE `in_statiintervento`.`codice` = 'DAP';