Compattazione grafica righe documenti

This commit is contained in:
Fabio Lovato 2020-07-05 00:22:22 +02:00
parent 8a2ca72516
commit 8731a43e18
6 changed files with 34 additions and 38 deletions

View File

@ -12,7 +12,7 @@ echo '
<th class="text-center" width="150">'.tr('Prezzo unitario').'</th>
<th class="text-center" width="150">'.tr('Iva unitaria').'</th>
<th class="text-center" width="150">'.tr('Importo').'</th>
<th width="60"></th>
<th width="100"></th>
</tr>
</thead>
<tbody class="sortable">';
@ -59,7 +59,7 @@ foreach ($righe as $riga) {
if ($dir == 'entrata' && $riga->costo_unitario != 0) {
echo '
<br><small>
<br><small class="text-muted">
'.tr('Acquisto').': '.moneyFormat($riga->costo_unitario).'
</small>';
}
@ -78,7 +78,7 @@ foreach ($righe as $riga) {
echo '
<td class="text-right">
'.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>
<br><small class="'.(($riga->aliquota->deleted_at) ? 'text-red' : '').' text-muted">'.$riga->aliquota->descrizione.(($riga->aliquota->esente) ? ' ('.$riga->aliquota->codice_natura_fe.')' : null).'</small>
</td>';
// Importo
@ -102,14 +102,13 @@ foreach ($righe as $riga) {
<a class="btn btn-xs btn-danger" onclick="deleteRow(\''.addslashes(get_class($riga)).'\', '.$riga->id.')">
<i class="fa fa-trash"></i>
</a>
<a class="btn btn-xs btn-default handle" title="Modifica ordine...">
<i class="fa fa-sort"></i>
</a>
</div>';
}
echo '
<div class="handle clickable" style="padding:10px">
<i class="fa fa-sort"></i>
</div>';
echo '
</td>
</tr>';

View File

@ -95,7 +95,7 @@ foreach ($righe as $riga) {
if ($dir == 'entrata' && $riga->costo_unitario != 0) {
echo '
<br><small>
<br><small class="text-muted">
'.tr('Acquisto').': '.moneyFormat($riga->costo_unitario).'
</small>';
}
@ -114,7 +114,7 @@ foreach ($righe as $riga) {
echo '
<td class="text-right">
'.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>
<br><small class="'.(($riga->aliquota->deleted_at) ? 'text-red' : '').' text-muted">'.$riga->aliquota->descrizione.(($riga->aliquota->esente) ? ' ('.$riga->aliquota->codice_natura_fe.')' : null).'</small>
</td>';
// Importo
@ -152,15 +152,14 @@ foreach ($righe as $riga) {
<a class='btn btn-xs btn-danger' title='Rimuovi questa riga...' onclick=\"if( confirm('Rimuovere questa riga dal ddt?') ){ $('#delete-form-".$riga->id."').submit(); }\">
<i class='fa fa-trash'></i>
</a>
<a class='btn btn-xs btn-default handle' title='Modifica ordine...'>
<i class='fa fa-sort'></i>
</a>
</div>
</form>";
}
echo '
<div class="handle clickable" style="padding:10px">
<i class="fa fa-sort"></i>
</div>';
echo '
</td>
</tr>';

View File

@ -13,7 +13,7 @@ echo '
<th class="text-center" width="150">'.tr('Prezzo unitario').'</th>
<th class="text-center" width="150">'.tr('Iva unitaria').'</th>
<th class="text-center" width="150">'.tr('Importo').'</th>
<th width="60"></th>
<th width="120"></th>
</tr>
</thead>
<tbody class="sortable">';
@ -132,7 +132,7 @@ foreach ($righe as $riga) {
if ($dir == 'entrata' && $riga->costo_unitario != 0) {
echo '
<br><small>
<br><small class="text-muted">
'.tr('Acquisto').': '.moneyFormat($riga->costo_unitario).'
</small>';
}
@ -151,7 +151,7 @@ foreach ($righe as $riga) {
echo '
<td class="text-right">
'.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>
<br><small class="'.(($riga->aliquota->deleted_at) ? 'text-red' : '').' text-muted">'.$riga->aliquota->descrizione.(($riga->aliquota->esente) ? ' ('.$riga->aliquota->codice_natura_fe.')' : null).'</small>
</td>';
// Importo
@ -198,15 +198,14 @@ foreach ($righe as $riga) {
<a class='btn btn-xs btn-danger' title='".tr('Rimuovi questa riga...')."' onclick=\"if( confirm('".tr('Rimuovere questa riga dalla fattura?')."') ){ $('#delete-form-".$riga->id."').submit(); }\">
<i class='fa fa-trash'></i>
</a>
<a class='btn btn-xs btn-default handle' title='Modifica ordine...'>
<i class='fa fa-sort'></i>
</a>
</div>
</form>";
}
echo '
<div class="handle clickable" style="padding:10px">
<i class="fa fa-sort"></i>
</div>';
echo '
</td>

View File

@ -99,7 +99,7 @@ if (!$righe->isEmpty()) {
echo '
<td class="text-right">
'.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>
<br><small class="'.(($riga->aliquota->deleted_at) ? 'text-red' : '').' text-muted">'.$riga->aliquota->descrizione.(($riga->aliquota->esente) ? ' ('.$riga->aliquota->codice_natura_fe.')' : null).'</small>
</td>';
// Prezzo di vendita

View File

@ -168,7 +168,7 @@ foreach ($righe as $riga) {
<a class='btn btn-xs btn-danger' title='Rimuovi questa riga...' onclick=\"if( confirm('Rimuovere questa riga dall\\'ordine?') ){ $('#delete-form-".$riga->id."').submit(); }\"><i class='fa fa-trash'></i></a>
<a class='btn btn-xs btn-inverse handle' title='Modifica ordine...'><i class='fa fa-sort'></i></a>
<a class='btn btn-xs btn-default handle' title='Modifica ordine...'><i class='fa fa-sort'></i></a>
</div>
</form>";
@ -194,7 +194,7 @@ $totale = abs($ordine->totale);
// IMPONIBILE
echo '
<tr>
<td colspan="5" class="text-right">
<td colspan="6" class="text-right">
<b>'.tr('Imponibile', [], ['upper' => true]).':</b>
</td>
<td align="right">
@ -207,7 +207,7 @@ echo '
if (!empty($sconto)) {
echo '
<tr>
<td colspan="5" class="text-right">
<td colspan="6" class="text-right">
<b><span class="tip" title="'.tr('Un importo positivo indica uno sconto, mentre uno negativo indica una maggiorazione').'"> <i class="fa fa-question-circle-o"></i> '.tr('Sconto/maggiorazione', [], ['upper' => true]).':</span></b>
</td>
<td align="right">
@ -219,7 +219,7 @@ if (!empty($sconto)) {
// TOTALE IMPONIBILE
echo '
<tr>
<td colspan="5" class="text-right">
<td colspan="6" class="text-right">
<b>'.tr('Totale imponibile', [], ['upper' => true]).':</b>
</td>
<td align="right">
@ -232,7 +232,7 @@ if (!empty($sconto)) {
// IVA
echo '
<tr>
<td colspan="5" class="text-right">
<td colspan="6" class="text-right">
<b>'.tr('Iva', [], ['upper' => true]).':</b>
</td>
<td align="right">
@ -244,7 +244,7 @@ echo '
// TOTALE
echo '
<tr>
<td colspan="5" class="text-right">
<td colspan="6" class="text-right">
<b>'.tr('Totale', [], ['upper' => true]).':</b>
</td>
<td align="right">

View File

@ -12,7 +12,7 @@ echo '
<th class="text-center" width="150">'.tr('Prezzo unitario').'</th>
<th class="text-center" width="150">'.tr('Iva unitaria').'</th>
<th class="text-center" width="150">'.tr('Importo').'</th>
<th width="60"></th>
<th width="100"></th>
</tr>
</thead>
<tbody class="sortable">';
@ -58,7 +58,7 @@ foreach ($righe as $riga) {
if ($dir == 'entrata' && $riga->costo_unitario != 0) {
echo '
<br><small>
<br><small class="text-muted">
'.tr('Acquisto').': '.moneyFormat($riga->costo_unitario).'
</small>';
}
@ -77,7 +77,7 @@ foreach ($righe as $riga) {
echo '
<td class="text-right">
'.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>
<br><small class="'.(($riga->aliquota->deleted_at) ? 'text-red' : '').' text-muted">'.$riga->aliquota->descrizione.(($riga->aliquota->esente) ? ' ('.$riga->aliquota->codice_natura_fe.')' : null).'</small>
</td>';
// Importo
@ -101,14 +101,13 @@ foreach ($righe as $riga) {
<a class="btn btn-xs btn-danger" onclick="deleteRow(\''.addslashes(get_class($riga)).'\', '.$riga->id.')">
<i class="fa fa-trash"></i>
</a>
<a class="btn btn-xs btn-default handle" title="Modifica ordine...">
<i class="fa fa-sort"></i>
</a>
</div>';
}
echo '
<div class="handle clickable" style="padding:10px">
<i class="fa fa-sort"></i>
</div>';
echo '
</td>
</tr>';