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

Aggiunta visualizzazione riferimenti righe anche in stamp ddt

This commit is contained in:
Luca 2020-10-15 18:33:06 +02:00
parent a45ba4dd53
commit d2daff4b90
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/articolo.php
View File

@ -232,7 +232,7 @@ function verificaPrezzoArticolo() {
} }
div.css("padding-top", "5px"); div.css("padding-top", "5px");
div.html(`<small>'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo()"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`); div.html(`<small class="label label-warning" >'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo()"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`);
} }
/** /**

2
include/common/barcode.php
View File

@ -251,7 +251,7 @@ function verificaPrezzoArticolo(tr) {
} }
div.css("padding-top", "5px"); div.css("padding-top", "5px");
div.html(`<small>'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo(this)"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`); div.html(`<small class="label label-warning" >'.tr('Prezzo registrato').': ` + prezzo_previsto.toLocale() + globals.currency + `<button type="button" class="btn btn-xs btn-info pull-right" onclick="aggiornaPrezzoArticolo(this)"><i class="fa fa-refresh"></i> '.tr('Aggiorna').'</button></small>`);
} }
/** /**

6
include/common/riga.php
View File

@ -74,13 +74,13 @@ if ($options['dir'] == 'entrata') {
margine = isNaN(margine) || !isFinite(margine) ? 0: margine; // Fix per magine NaN margine = isNaN(margine) || !isFinite(margine) ? 0: margine; // Fix per magine NaN
div.html("<small>'.tr('Guadagno').': " + guadagno.toLocale() + " " + globals.currency + " &nbsp; '.tr('Margine').': " + margine.toLocale() + " %</small>"); div.html("<small>&nbsp;'.tr('Guadagno').': " + guadagno.toLocale() + " " + globals.currency + " &nbsp; '.tr('Margine').': " + margine.toLocale() + " %</small>");
if (guadagno < 0) { if (guadagno < 0) {
parent.addClass("has-error"); parent.addClass("has-error");
div.addClass("text-danger").removeClass("text-success"); div.addClass("label-danger").removeClass("label-success");
} else { } else {
parent.removeClass("has-error"); parent.removeClass("has-error");
div.removeClass("text-danger").addClass("text-success"); div.removeClass("label-danger").addClass("label-success");
} }
} }

31
templates/ddt/body.php
View File

@ -35,13 +35,13 @@ echo "
<th class='text-center' style='width:5%'>".tr('#', [], ['upper' => true])."</th> <th class='text-center' style='width:5%'>".tr('#', [], ['upper' => true])."</th>
<th class='text-center'>".tr('Cod.', [], ['upper' => true])."</th> <th class='text-center'>".tr('Cod.', [], ['upper' => true])."</th>
<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'>".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'>".tr('Prezzo unitario', [], ['upper' => true])."</th>
<th class='text-center' style='width:15%'>".tr('Importo', [], ['upper' => true])."</th> <th class='text-center'>".tr('Importo', [], ['upper' => true])."</th>
<th class='text-center' style='width:10%'>".tr('IVA', [], ['upper' => true]).' (%)</th>'; <th class='text-center'>".tr('IVA', [], ['upper' => true]).' (%)</th>';
} }
echo ' echo '
@ -69,8 +69,10 @@ foreach ($righe as $riga) {
if ($riga->isArticolo()) { if ($riga->isArticolo()) {
echo $riga->codice; echo $riga->codice;
$source_type = 'Modules\DDT\Components\Articolo';
}else{ }else{
echo '-'; echo '-';
$source_type = 'Modules\DDT\Components\Riga';
} }
echo' echo'
@ -79,6 +81,19 @@ foreach ($righe as $riga) {
<td> <td>
'.nl2br($r['descrizione']); '.nl2br($r['descrizione']);
//Riferimenti odrini/ddt righe
if ( $riga->referenceTargets()->count() ){
$source = $source_type::find($riga->id);
$riferimenti = $source->referenceTargets;
foreach ($riferimenti as $riferimento) {
echo '
<br><small>'.$riferimento->target->descrizione.'<br>'.reference($riferimento->target->getDocument()).'</small>';
}
}
if ($riga->isArticolo()) { if ($riga->isArticolo()) {
// Codice articolo // Codice articolo
$text = tr('COD. _COD_', [ $text = tr('COD. _COD_', [
@ -119,14 +134,14 @@ foreach ($righe as $riga) {
if (!$riga->isDescrizione()) { if (!$riga->isDescrizione()) {
echo ' echo '
<td class="text-center"> <td class="text-center" nowrap="nowrap">
'.Translator::numberToLocale(abs($riga->qta), 'qta').' '.$r['um'].' '.Translator::numberToLocale(abs($riga->qta), 'qta').' '.$r['um'].'
</td>'; </td>';
if ($options['pricing']) { if ($options['pricing']) {
// Prezzo unitario // Prezzo unitario
echo ' echo '
<td class="text-right"> <td class="text-right" nowrap="nowrap">
'.moneyFormat($riga->prezzo_unitario); '.moneyFormat($riga->prezzo_unitario);
if ($riga->sconto > 0) { if ($riga->sconto > 0) {
@ -143,13 +158,13 @@ foreach ($righe as $riga) {
// Imponibile // Imponibile
echo ' echo '
<td class="text-right"> <td class="text-right" nowrap="nowrap">
'.moneyFormat($riga->totale_imponibile).' '.moneyFormat($riga->totale_imponibile).'
</td>'; </td>';
// Iva // Iva
echo ' echo '
<td class="text-center"> <td class="text-center" nowrap="nowrap">
'.Translator::numberToLocale($riga->aliquota->percentuale, 0).' '.Translator::numberToLocale($riga->aliquota->percentuale, 0).'
</td>'; </td>';
} }