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

Fix encoding on expense report PDF

Browse Source
This commit is contained in:
Laurent Destailleur 2019-04-24 20:58:27 +02:00
parent b90613c6c4
commit ab1f371ea5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ class pdf_standard extends ModeleExpenseReport
/** /**
* Issuer * Issuer
* @var Company object that emits * @var Societe
*/ */
public $emetteur; public $emetteur;
@ -1053,18 +1053,18 @@ class pdf_standard extends ModeleExpenseReport
$pdf->SetXY($tab3_posx+17, $tab3_top+$y); $pdf->SetXY($tab3_posx+17, $tab3_top+$y);
$pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0); $pdf->MultiCell(15, 3, price($totalpaid), 0, 'R', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+$y); $pdf->SetXY($tab3_posx+35, $tab3_top+$y);
$pdf->MultiCell(30, 4, $outputlangs->trans("AlreadyPaid"), 0, 'L', 0); $pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("AlreadyPaid"), 0, 'L', 0);
$y+=$tab3_height-2; $y+=$tab3_height-2;
$pdf->SetXY($tab3_posx+17, $tab3_top+$y); $pdf->SetXY($tab3_posx+17, $tab3_top+$y);
$pdf->MultiCell(15, 3, price($object->total_ttc), 0, 'R', 0); $pdf->MultiCell(15, 3, price($object->total_ttc), 0, 'R', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+$y); $pdf->SetXY($tab3_posx+35, $tab3_top+$y);
$pdf->MultiCell(30, 4, $outputlangs->trans("AmountExpected"), 0, 'L', 0); $pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("AmountExpected"), 0, 'L', 0);
$y+=$tab3_height-2; $y+=$tab3_height-2;
$remaintopay = $object->total_ttc - $totalpaid; $remaintopay = $object->total_ttc - $totalpaid;
$pdf->SetXY($tab3_posx+17, $tab3_top+$y); $pdf->SetXY($tab3_posx+17, $tab3_top+$y);
$pdf->MultiCell(15, 3, price($remaintopay), 0, 'R', 0); $pdf->MultiCell(15, 3, price($remaintopay), 0, 'R', 0);
$pdf->SetXY($tab3_posx+35, $tab3_top+$y); $pdf->SetXY($tab3_posx+35, $tab3_top+$y);
$pdf->MultiCell(30, 4, $outputlangs->trans("RemainderToPay"), 0, 'L', 0); $pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("RemainderToPay"), 0, 'L', 0);
} }
} }
else else

2
htdocs/theme/eldy/global.inc.php
View File

@ -2234,7 +2234,7 @@ div.tabBar table.tableforservicepart2:last-child {
padding-top: 0 !important; padding-top: 0 !important;
} }
/* Payment Screen : Pointer cursor in the autofill image */ /* Payment Screen : Pointer cursor in the autofill image */
table.noborder .AutoFillAmout { .AutoFillAmount {
cursor:pointer; cursor:pointer;
} }

4
htdocs/theme/md/style.css.php
View File

@ -1542,6 +1542,10 @@ img.photorefnoborder {
margin: 0; margin: 0;
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
/* Payment Screen : Pointer cursor in the autofill image */
.AutoFillAmount {
cursor:pointer;
}
/* ============================================================================== */ /* ============================================================================== */