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

Fix #841

This commit is contained in:
Thomas Zilio 2020-06-30 17:28:59 +02:00
parent 2106d4d571
commit af60bd092b
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/interventi/row-list.php
View File

@ -21,8 +21,8 @@ if (!$righe->isEmpty()) {
echo ' echo '
<th class="text-center" width="15%">'.tr('Prezzo di acquisto').'</th> <th class="text-center" width="15%">'.tr('Prezzo di acquisto').'</th>
<th class="text-center" width="15%">'.tr('Prezzo di vendita').'</th> <th class="text-center" width="15%">'.tr('Prezzo di vendita').'</th>
<th class="text-center" width="10%">'.tr('Iva').'</th> <th class="text-center" width="10%">'.tr('Iva unitaria').'</th>
<th class="text-center" width="15%">'.tr('Imponibile').'</th>'; <th class="text-center" width="15%">'.tr('Importo').'</th>';
} }
if (!$record['flag_completato']) { if (!$record['flag_completato']) {
@ -71,7 +71,7 @@ if (!$righe->isEmpty()) {
// Quantità // Quantità
echo ' echo '
<td class="text-right"> <td class="text-right">
'.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].' '.Translator::numberToLocale($riga->qta, 'qta').' '.$riga->um.'
</td>'; </td>';
if ($show_prezzi) { if ($show_prezzi) {
@ -86,14 +86,11 @@ if (!$righe->isEmpty()) {
<td class="text-right"> <td class="text-right">
'.moneyFormat($riga->prezzo_unitario); '.moneyFormat($riga->prezzo_unitario);
if (abs($r['sconto_unitario']) > 0) { if (abs($riga->sconto_unitario) > 0) {
$text = $r['sconto_unitario'] > 0 ? tr('sconto _TOT_ _TYPE_') : tr('maggiorazione _TOT_ _TYPE_'); $text = discountInfo($riga);
echo ' echo '
<br><small class="label label-danger">'.replace($text, [ <br><small class="label label-danger">'.$text.'</small>';
'_TOT_' => Translator::numberToLocale(abs($r['sconto_unitario'])),
'_TYPE_' => ($r['tipo_sconto'] == 'PRC' ? '%' : currency()),
]).'</small>';
} }
echo ' echo '
@ -101,13 +98,14 @@ if (!$righe->isEmpty()) {
echo ' echo '
<td class="text-right"> <td class="text-right">
'.moneyFormat($r['iva']).' '.moneyFormat($riga->iva_unitaria).'
<br><small class="'.(($riga->aliquota->deleted_at) ? 'text-red' : '').' help-block">'.$riga->aliquota->descrizione.(($riga->aliquota->esente) ? ' ('.$riga->aliquota->codice_natura_fe.')' : null).'</small>
</td>'; </td>';
// Prezzo di vendita // Prezzo di vendita
echo ' echo '
<td class="text-right"> <td class="text-right">
'.moneyFormat($riga->imponibile).' '.moneyFormat($riga->importo).'
</td>'; </td>';
} }

17
templates/interventi/body.php
View File

@ -153,13 +153,11 @@ if (!$righe->isEmpty()) {
<tbody>'; <tbody>';
foreach ($righe as $riga) { foreach ($righe as $riga) {
$r = $riga->toArray();
// Articolo // Articolo
echo ' echo '
<tr> <tr>
<td> <td>
'.nl2br($r['descrizione']); '.nl2br($riga->descrizione);
if ($riga->isArticolo()) { if ($riga->isArticolo()) {
// Codice articolo // Codice articolo
@ -184,7 +182,7 @@ if (!$righe->isEmpty()) {
// Quantità // Quantità
echo ' echo '
<td class="text-center"> <td class="text-center">
'.Translator::numberToLocale($r['qta'], 'qta').' '.$r['um'].' '.Translator::numberToLocale($riga->qta, 'qta').' '.$riga->um.'
</td>'; </td>';
// Prezzo unitario // Prezzo unitario
@ -192,12 +190,11 @@ if (!$righe->isEmpty()) {
<td class="text-center"> <td class="text-center">
'.($options['pricing'] ? moneyFormat($riga->prezzo_unitario) : '-'); '.($options['pricing'] ? moneyFormat($riga->prezzo_unitario) : '-');
if ($options['pricing'] && $r['sconto'] > 0) { if ($options['pricing'] && $riga->sconto > 0) {
echo " $text = discountInfo($riga, false);
<br><small class='text-muted'>".tr('sconto _TOT_ _TYPE_', [
'_TOT_' => Translator::numberToLocale($r['sconto_unitario']), echo '
'_TYPE_' => ($r['tipo_sconto'] == 'PRC' ? '%' : currency()), <br><small class="text-muted">'.$text.'</small>';
]).'</small>';
} }
echo ' echo '