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

Correzioni minori sulla data evasione

This commit is contained in:
Thomas Zilio 2020-08-06 11:44:41 +02:00
parent c923196524
commit da07c0c9ba
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/common/riga.php
View File

@ -91,11 +91,22 @@ echo '
// Data prevista evasione (per ordini)
if ( in_array($module['name'], ['Ordini cliente', 'Ordini fornitore'])) {
if (in_array($module['name'], ['Ordini cliente', 'Ordini fornitore'])) {
echo '
<div class="row">
<div class="col-md-'.$width.'">
{[ "type": "date", "label": "'.tr('Data prevista evasione').'", "name": "data_evasione", "value": "'.$result['data_evasione'].'" ]}
<div class="box box-warning collapsable collapsed-box">
<div class="box-header with-border">
<h3 class="box-title">'.tr('Informazioni aggiuntive').'</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>
</div>';
</div>
<div class="box-body">
<div class="row">
<div class="col-md-12">
{[ "type": "date", "label": "'.tr('Data prevista evasione').'", "name": "data_evasione", "value": "'.$result['data_evasione'].'" ]}
</div>
</div>
</div>
</div>';
}

16
modules/ordini/actions.php
View File

@ -157,7 +157,7 @@ switch (post('op')) {
$articolo->um = post('um') ?: null;
$articolo->costo_unitario = post('costo_unitario') ?: 0;
$articolo->data_evasione = post('data_evasione');
$articolo->data_evasione = post('data_evasione') ?: null;
$articolo->setPrezzoUnitario(post('prezzo_unitario'), post('idiva'));
$articolo->setSconto(post('sconto'), post('tipo_sconto'));
@ -217,7 +217,7 @@ switch (post('op')) {
$riga->um = post('um') ?: null;
$riga->costo_unitario = post('costo_unitario') ?: 0;
$riga->data_evasione = post('data_evasione');
$riga->data_evasione = post('data_evasione') ?: null;
$riga->setPrezzoUnitario(post('prezzo_unitario'), post('idiva'));
$riga->setSconto(post('sconto'), post('tipo_sconto'));
@ -302,14 +302,14 @@ switch (post('op')) {
break;
case 'update_position':
$order = explode(',', post('order', true));
case 'update_position':
$order = explode(',', post('order', true));
foreach ($order as $i => $id_riga) {
$dbo->query('UPDATE `or_righe_ordini` SET `order` = '.prepare($i).' WHERE id='.prepare($id_riga));
}
foreach ($order as $i => $id_riga) {
$dbo->query('UPDATE `or_righe_ordini` SET `order` = '.prepare($i).' WHERE id='.prepare($id_riga));
}
break;
break;
// Aggiunta di un documento in ordine
case 'add_preventivo':