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

Fix travis

Browse Source
This commit is contained in:
fappels 2018-12-05 11:10:42 +01:00
parent d1d41f4dd4
commit 6d27a6458e
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -970,8 +970,8 @@ class pdf_standard extends ModeleExpenseReport
$pdf->SetXY($tab3_posx+35, $tab3_top+1); $pdf->SetXY($tab3_posx+35, $tab3_top+1);
$pdf->MultiCell(30, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0); $pdf->MultiCell(30, 3, $outputlangs->transnoentities("Type"), 0, 'L', 0);
if (! empty($conf->banque->enabled)) { if (! empty($conf->banque->enabled)) {
$pdf->SetXY($tab3_posx+65, $tab3_top+1); $pdf->SetXY($tab3_posx+65, $tab3_top+1);
$pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0); $pdf->MultiCell(25, 3, $outputlangs->transnoentities("BankAccount"), 0, 'L', 0);
} }
$pdf->line($tab3_posx, $tab3_top+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$tab3_height); // Bottom border line of table title $pdf->line($tab3_posx, $tab3_top+$tab3_height, $tab3_posx+$tab3_width+2, $tab3_top+$tab3_height); // Bottom border line of table title

3
htdocs/expensereport/class/expensereport.class.php
View File

@ -2405,12 +2405,11 @@ class ExpenseReport extends CommonObject
/** /**
* Return amount of payments already done * Return amount of payments already done
* *
* @return int Amount of payment already done, <0 if KO * @return int Amount of payment already done, <0 if KO
*/ */
public function getSumPayments() public function getSumPayments()
{ {
//TODO move to expensereport class
$table='payment_expensereport'; $table='payment_expensereport';
$field='fk_expensereport'; $field='fk_expensereport';