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

fix travis recommendations

Browse Source
This commit is contained in:
John Botella 2019-06-26 09:36:53 +02:00
parent 6b165d4a15
commit 4c4444a53f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1359,7 +1359,7 @@ class pdf_crabe extends ModelePDFFactures
$displayWarranty = false;
break;
}
}
}
}
if($displayWarranty){
@ -1389,7 +1389,6 @@ class pdf_crabe extends ModelePDFFactures
$pdf->MultiCell($largcol2, $tab2_hl, price($retainedWarranty), $useborder, 'R', 1);
}
}
}
}

16
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -1330,14 +1330,14 @@ class pdf_sponge extends ModelePDFFactures
$posy += $tab2_hl;
// Display all total
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetFont('', '', $default_font_size - 1);
$pdf->SetFillColor(255, 255, 255);
$pdf->SetXY($col1x, $posy);
$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("SituationTotalProgress", $avancementGlobal), 0, 'L', 1);
$pdf->SetXY($col2x,$posy);
$pdf->SetXY($col2x, $posy);
$pdf->MultiCell($largcol2, $tab2_hl, price($total_a_payer*$avancementGlobal/100, 0, $outputlangs), 0, 'R', 1);
$pdf->SetFont('','', $default_font_size - 2);
$pdf->SetFont('', '', $default_font_size - 2);
$posy += $tab2_hl;
@ -1349,7 +1349,6 @@ class pdf_sponge extends ModelePDFFactures
$tab2_top = $posy;
$index=0;
}
$tab2_top += 3;
@ -1360,7 +1359,7 @@ class pdf_sponge extends ModelePDFFactures
// Total remise
$total_line_remise=0;
foreach($object->lines as $i => $line) {
$total_line_remise+= pdfGetLineTotalDiscountAmount($object,$i,$outputlangs,2); // TODO: add this methode to core/lib/pdf.lib
$total_line_remise+= pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, 2); // TODO: add this methode to core/lib/pdf.lib
// Gestion remise sous forme de ligne négative
if($line->total_ht < 0) $total_line_remise += -$line->total_ht;
}
@ -1648,7 +1647,7 @@ class pdf_sponge extends ModelePDFFactures
if($line->product_type < 2 && $line->situation_percent < 100){
$displayWarranty = false;
break;
}
}
}
}
@ -1739,6 +1738,11 @@ class pdf_sponge extends ModelePDFFactures
return ($tab2_top + ($tab2_hl * $index));
}
public static function liste_modeles($db, $maxfilenamelength = 0)
{
return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
}
/**
* Show table for lines
*