Compare commits

..

No commits in common. "6f8c2583822f62afac285ecb95bcc639ea3d6ade" and "76c27c9cecb8652ccf8835720e23ffbd0845da72" have entirely different histories.

2 changed files with 1 additions and 25 deletions

View File

@ -1,24 +0,0 @@
<?php
echo '
<div class="container">
<div class="row">
<div class=col-md-12">
<h5>'.tr('Legenda').':</h5>
</div>
</div>
<div class="row">
<div class="col-md-4">
<span class="pull-left icon" style="background-color:white;"></span>
<span class="text">&nbsp;'.tr('Articolo senza soglia minima').'</span>
</div>
<div class="col-md-4">
<span class="pull-left icon" style="background-color:#CCFFCC;"></span>
<span class="text">&nbsp;'.tr('Quantità superiore alla soglia minima').'</span>
</div>
<div class="col-md-4">
<span class="pull-left icon" style="background-color:#ec5353;"></span>
<span class="text">&nbsp;'.tr('Quantità inferiore alla soglia minima').'</span>
</div>
</div>
</div>';

View File

@ -270,7 +270,7 @@ $articoli = $dbo->fetchArray('SELECT
SUM(IF(`reversed`=1, -(`co_righe_documenti`.`subtotale` - `co_righe_documenti`.`sconto`), (`co_righe_documenti`.`subtotale` - `co_righe_documenti`.`sconto`))) AS totale, SUM(IF(`reversed`=1, -(`co_righe_documenti`.`subtotale` - `co_righe_documenti`.`sconto`), (`co_righe_documenti`.`subtotale` - `co_righe_documenti`.`sconto`))) AS totale,
`mg_articoli`.`id`, `mg_articoli`.`id`,
`mg_articoli`.`codice`, `mg_articoli`.`codice`,
`mg_articoli_lang`.`title` as descrizione, `mg_articoli_lang`.`title`,
`mg_articoli`.`um` `mg_articoli`.`um`
FROM FROM
`co_documenti` `co_documenti`