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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dasc3er 2020-10-06 17:58:18 +02:00
parent fc7edeacb1 e6b627e789
commit f375d29a92
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/primanota/src/Movimento.php
View File

@ -44,7 +44,7 @@ class Movimento extends Model
$model->idmastrino = $mastrino->idmastrino;
$model->data = $mastrino->data;
$model->descrizione = $mastrino->descrizione;
$model->note = $mastrino->note;
$model->note = ($mastrino->note)? :'';
$model->primanota = $mastrino->primanota;
$model->is_insoluto = $mastrino->is_insoluto;

4
templates/ddt/body.php
View File

@ -33,7 +33,7 @@ echo "
<thead>
<tr>
<th class='text-center' style='width:5%'>".tr('#', [], ['upper' => true])."</th>
<th class='text-center' style='width:7%'>".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' style='width:10%'>".tr('Q.tà', [], ['upper' => true]).'</th>';
@ -65,7 +65,7 @@ foreach ($righe as $riga) {
'.$num.'
</td>
<td class="text-center" style="vertical-align: middle">';
<td class="text-center" nowrap="nowrap" style="vertical-align: middle">';
if ($riga->isArticolo()) {
echo $riga->codice;