1
0
mirror of https://github.com/devcode-it/openstamanager.git synced 2024-12-24 14:31:42 +01:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Thomas Zilio 2020-08-06 11:44:58 +02:00
commit 934b477909

View File

@ -9,7 +9,7 @@ echo '
<tr> <tr>
<th width="35" class="text-center" >'.tr('#').'</th> <th width="35" class="text-center" >'.tr('#').'</th>
<th>'.tr('Descrizione').'</th> <th>'.tr('Descrizione').'</th>
<th width="150">'.tr('Data prev. evasione').'</th> <th width="120">'.tr('Prev. evasione').'</th>
<th class="text-center tip" width="150" title="'.tr('da evadere').' / '.tr('totale').'">'.tr('Q.').' <i class="fa fa-question-circle-o"></i></th> <th class="text-center tip" width="150" title="'.tr('da evadere').' / '.tr('totale').'">'.tr('Q.').' <i class="fa fa-question-circle-o"></i></th>
<th class="text-center" width="150">'.tr('Prezzo unitario').'</th> <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('Iva unitaria').'</th>
@ -205,7 +205,7 @@ $totale = abs($ordine->totale);
// IMPONIBILE // IMPONIBILE
echo ' echo '
<tr> <tr>
<td colspan="5" class="text-right"> <td colspan="6" class="text-right">
<b>'.tr('Imponibile', [], ['upper' => true]).':</b> <b>'.tr('Imponibile', [], ['upper' => true]).':</b>
</td> </td>
<td class="text-right"> <td class="text-right">
@ -218,7 +218,7 @@ echo '
if (!empty($sconto)) { if (!empty($sconto)) {
echo ' echo '
<tr> <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> <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>
<td class="text-right"> <td class="text-right">
@ -230,7 +230,7 @@ if (!empty($sconto)) {
// TOTALE IMPONIBILE // TOTALE IMPONIBILE
echo ' echo '
<tr> <tr>
<td colspan="5" class="text-right"> <td colspan="6" class="text-right">
<b>'.tr('Totale imponibile', [], ['upper' => true]).':</b> <b>'.tr('Totale imponibile', [], ['upper' => true]).':</b>
</td> </td>
<td class="text-right"> <td class="text-right">
@ -243,7 +243,7 @@ if (!empty($sconto)) {
// IVA // IVA
echo ' echo '
<tr> <tr>
<td colspan="5" class="text-right"> <td colspan="6" class="text-right">
<b>'.tr('Iva', [], ['upper' => true]).':</b> <b>'.tr('Iva', [], ['upper' => true]).':</b>
</td> </td>
<td class="text-right"> <td class="text-right">
@ -255,7 +255,7 @@ echo '
// TOTALE // TOTALE
echo ' echo '
<tr> <tr>
<td colspan="5" class="text-right"> <td colspan="6" class="text-right">
<b>'.tr('Totale', [], ['upper' => true]).':</b> <b>'.tr('Totale', [], ['upper' => true]).':</b>
</td> </td>
<td class="text-right"> <td class="text-right">