Merge branch 'features/feature-facture-recap' into staging

This commit is contained in:
Tiavina 2025-01-02 12:09:57 +03:00
commit b3a53985ae

View File

@ -815,7 +815,7 @@ class PageController extends Controller {
$pdf->SetXY( $_x, $_y ); $pdf->MultiCell( 80, 4, utf8_decode(html_entity_decode($adresse)), 0, 0, ''); $pdf->SetXY( $_x, $_y ); $pdf->MultiCell( 80, 4, utf8_decode(html_entity_decode($adresse)), 0, 0, '');
// date facture // date facture
$pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 60 ); $pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 60 );
$pdf->Cell( 60, 8, $current_config[0]->adresse . " le, ".utf8_decode($date_formated), 0, 0, ''); $pdf->MultiCell( 60, 8, $current_config[0]->adresse . " le, ".utf8_decode($date_formated), 0, 0, '');
// observations // observations
$pdf->SetFont( "Arial", "BU", 10 ); $pdf->SetXY( 10, 85 ) ; $pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L"); $pdf->SetFont( "Arial", "BU", 10 ); $pdf->SetXY( 10, 85 ) ; $pdf->Cell($pdf->GetStringWidth("Objet:"), 0, "Objet:", 0, "L");
@ -840,7 +840,7 @@ class PageController extends Controller {
$pdf->Image($this->currentUserImagePath."sign.png", 122, 150, 55, 30); $pdf->Image($this->currentUserImagePath."sign.png", 122, 150, 55, 30);
} }
$y0 = 265; $y0 = 260;
$pageWidth = $pdf->GetPageWidth(); $pageWidth = $pdf->GetPageWidth();
//Positionnement en bas et tout centrer //Positionnement en bas et tout centrer
$pdf->SetFont('Arial','',6); $pdf->SetFont('Arial','',6);
@ -876,8 +876,8 @@ class PageController extends Controller {
} }
// date facture // date facture
$pdf->SetFont('Arial','',11); $pdf->SetXY( 122, 15 ); $pdf->SetFont('Arial','',11); $pdf->SetXY( 122, y: 10 );
$pdf->Cell( 60, 8, $current_config[0]->adresse . " le, ".utf8_decode($date_formated), 0, 0, ''); $pdf->MultiCell( 60, 8, $current_config[0]->adresse . " le, ".utf8_decode($date_formated), 0, 0, '');
// n° facture, date echeance et reglement et obs // n° facture, date echeance et reglement et obs
$pdf->SetLineWidth(0.1); $pdf->SetFillColor(255); $pdf->Rect(100, 30, 85, 8, "DF"); $pdf->SetLineWidth(0.1); $pdf->SetFillColor(255); $pdf->Rect(100, 30, 85, 8, "DF");