loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2024-12-27 00:06:14 +01:00
Code Issues Releases Activity

Aggiunta sede nella lista movimenti

Browse Source
This commit is contained in:
loviuz 2021-06-18 11:38:00 +02:00
parent 14f3ab3b89
commit 5814934d93
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/articoli/plugins/articoli.movimenti.php
View File

@ -62,23 +62,24 @@ echo '
// Individuazione movimenti
$movimenti = $articolo->movimentiComposti()
->orderBy('data', 'DESC')
->orderBy('id', 'DESC');
->orderBy('mg_movimenti.data', 'DESC')
->orderBy('mg_movimenti.id', 'DESC');
if (empty($_GET['movimentazione_completa'])) {
$movimenti->limit(20);
}
// Raggruppamento per documento
$movimenti = $movimenti->get();
$movimenti = $movimenti->leftJoin('an_sedi', 'mg_movimenti.idsede', 'an_sedi.id')->get();
if (!empty($movimenti)) {
echo '
<table class="table table-striped table-condensed table-bordered">
<tr>
<th class="text-center">'.tr('Q.tà').'</th>
<th class="text-center" width="120">'.tr('Q.tà').'</th>
<th class="text-center">'.tr('Q.tà progressiva').'</th>
<th>'.tr('Operazione').'</th>
<th class="text-center">'.tr('Data').'</th>
<th class="text-center" width="7%">#</th>
<th class="text-center">'.tr('Sede').'</th>
<th class="text-center" width="120">'.tr('Data').'</th>
<th class="text-center" width="80">#</th>
</tr>';
foreach ($movimenti as $i => $movimento) {
@ -109,6 +110,10 @@ if (!empty($movimenti)) {
<td>
'.$movimento->descrizione.''.($movimento->hasDocument() ? ' - '.reference($movimento->getDocument()) : '').'
</td>
<td class="text-center">
'.( $movimento->nomesede ?: tr('Sede legale') ).'
</td>';
// Data

4
modules/articoli/src/Articolo.php
View File

@ -222,8 +222,8 @@ class Articolo extends Model
public function movimentiComposti()
{
return $this->movimenti()
->selectRaw('*, sum(qta) as qta_documento, IFNULL(reference_type, id) as tipo_gruppo')
->groupBy('tipo_gruppo', 'reference_id');
->selectRaw('*, sum(mg_movimenti.qta) as qta_documento, IFNULL(mg_movimenti.reference_type, mg_movimenti.id) as tipo_gruppo')
->groupBy('tipo_gruppo', 'mg_movimenti.reference_id');
}
public function categoria()