lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix expense report

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-07 17:01:14 +01:00
parent 8dd7d69294
commit 510fc22172
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -108,8 +108,8 @@ class pdf_standard extends ModeleExpenseReport
$this->posxdate=88;
$this->posxtype=107;
$this->posxprojet=120;
$this->posxtva=136;
$this->posxup=152;
$this->posxtva=138;
$this->posxup=154;
$this->posxqty=168;
$this->postotalttc=178;
if (empty($conf->projet->enabled)) {
@ -328,7 +328,7 @@ class pdf_standard extends ModeleExpenseReport
$nextColumnPosX = $this->posxprojet;
}
$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 12), 0, 'C');
$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 10), 0, 'C');
// Project
if (! empty($conf->projet->enabled))

7
htdocs/expensereport/card.php
View File

@ -1970,7 +1970,7 @@ else
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<input type="hidden" name="fk_expensereport" value="'.$object->id.'" />';
print '<div class="div-table-responsive">';
print '<div class="div-table-responsive-no-min">';
print '<table id="tablelines" class="noborder" width="100%">';
if (!empty($object->lines))
@ -2029,7 +2029,10 @@ else
print '</td>';
}
// print '<td style="text-align:center;">'.$langs->trans("TF_".strtoupper(empty($objp->type_fees_libelle)?'OTHER':$objp->type_fees_libelle)).'</td>';
print '<td style="text-align:center;">'.($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans(($line->type_fees_code))).'</td>';
print '<td style="text-align:center;">';
$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
print $labeltype;
print '</td>';
print '<td style="text-align:left;">'.$line->comments.'</td>';
print '<td style="text-align:right;">'.vatrate($line->vatrate,true).'</td>';
print '<td style="text-align:right;">'.price($line->value_unit).'</td>';