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

Aggiunto codice fornitore nella stampa ordine fornitore

This commit is contained in:
MatteoPistorello 2021-07-07 15:01:51 +02:00
parent 292a52d76f
commit 4ba48bbf82
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
templates/ordini/body.php
View File

@ -37,7 +37,7 @@ if ($documento->direzione == 'entrata') {
} }
if ($documento->direzione == 'uscita') { if ($documento->direzione == 'uscita') {
++$columns; $columns += 2;
$char_number = $options['pricing'] ? 26 : 63; $char_number = $options['pricing'] ? 26 : 63;
} else { } else {
$char_number = $options['pricing'] ? 45 : 82; $char_number = $options['pricing'] ? 45 : 82;
@ -53,11 +53,12 @@ echo "
<table class='table table-striped table-bordered' id='contents'> <table class='table table-striped table-bordered' id='contents'>
<thead> <thead>
<tr> <tr>
<th class='text-center' style='width:5%'>".tr('#', [], ['upper' => true]).'</th>'; <th class='text-center' style='width:4%'>".tr('#', [], ['upper' => true]).'</th>';
if ($documento->direzione == 'uscita') { if ($documento->direzione == 'uscita') {
echo " echo "
<th class='text-center' style='width:10%'>".tr('Codice', [], ['upper' => true]).'</th>'; <th class='text-center' style='width:11%'>".tr('Codice', [], ['upper' => true])."</th>
<th class='text-center' style='width:11%'>".tr('Codice fornitore', [], ['upper' => true])."</th>";
} }
if ($has_image) { if ($has_image) {
@ -67,13 +68,13 @@ echo "
echo " echo "
<th class='text-center'>".tr('Descrizione', [], ['upper' => true])."</th> <th class='text-center'>".tr('Descrizione', [], ['upper' => true])."</th>
<th class='text-center' style='width:10%'>".tr('Q.tà', [], ['upper' => true]).'</th>'; <th class='text-center' style='width:9%'>".tr('Q.tà', [], ['upper' => true]).'</th>';
if ($options['pricing']) { if ($options['pricing']) {
echo " echo "
<th class='text-center' style='width:15%'>".tr('Prezzo unitario', [], ['upper' => true])."</th> <th class='text-center' style='width:11%'>".tr('Prezzo unitario', [], ['upper' => true])."</th>
<th class='text-center' style='width:15%'>".tr('Imponibile', [], ['upper' => true])."</th> <th class='text-center' style='width:11%'>".tr('Imponibile', [], ['upper' => true])."</th>
<th class='text-center' style='width:10%'>".tr('IVA', [], ['upper' => true]).' (%)</th>'; <th class='text-center' style='width:5%'>".tr('IVA', [], ['upper' => true]).' (%)</th>';
} }
echo " echo "
@ -96,13 +97,6 @@ foreach ($righe as $riga) {
'.$num.' '.$num.'
</td>'; </td>';
if ($documento->direzione == 'uscita') {
echo '
<td class="text-center" style="vertical-align: middle">
'.$riga->articolo->codice.'
</td>';
}
if ($has_image) { if ($has_image) {
if ($riga->isArticolo() && !empty($riga->articolo->image)) { if ($riga->isArticolo() && !empty($riga->articolo->image)) {
echo ' echo '
@ -117,6 +111,16 @@ foreach ($righe as $riga) {
} }
} }
if ($documento->direzione == 'uscita') {
echo '
<td class="text-center" style="vertical-align: middle">
'.$riga->articolo->codice.'
</td>
<td class="text-center" style="vertical-align: middle">
'.($riga->articolo ? $riga->articolo->dettaglioFornitore($documento->idanagrafica)->codice_fornitore : '').'
</td>';
}
echo ' echo '
<td> <td>
'.nl2br($r['descrizione']); '.nl2br($r['descrizione']);
@ -165,7 +169,7 @@ foreach ($righe as $riga) {
// Prezzo unitario // Prezzo unitario
echo ' echo '
<td class="text-right"> <td class="text-right">
'.moneyFormat($riga->prezzo_unitario); '.moneyFormat($riga->prezzo_unitario);
if ($riga->sconto > 0) { if ($riga->sconto > 0) {
$text = discountInfo($riga, false); $text = discountInfo($riga, false);
@ -194,7 +198,7 @@ foreach ($righe as $riga) {
echo ' echo '
<td class="text-center"> <td class="text-center">
<small>'.Translator::dateToLocale($riga->data_evasione).($riga->ora_evasione ? '<br>'.Translator::timeToLocale($riga->ora_evasione).'' : '').'</small> '.Translator::dateToLocale($riga->data_evasione).($riga->ora_evasione ? '<br>'.Translator::timeToLocale($riga->ora_evasione).'' : '').'
</td>'; </td>';
} else { } else {
echo ' echo '
@ -230,7 +234,7 @@ $netto_a_pagare = $documento->netto;
$show_sconto = $sconto > 0; $show_sconto = $sconto > 0;
$colspan = 5; $colspan = 5;
($documento->direzione == 'uscita' ? $colspan++ : $colspan); ($documento->direzione == 'uscita' ? $colspan+=2 : $colspan);
($has_image ? $colspan++ : $colspan); ($has_image ? $colspan++ : $colspan);
// TOTALE COSTI FINALI // TOTALE COSTI FINALI

2
templates/ordini/settings.php
View File

@ -18,7 +18,7 @@
*/ */
$settings = [ $settings = [
'font-size' => 9, 'font-size' => 8,
]; ];
return $settings; return $settings;