Browse Source

#3 remove Francs informations on invoices

SiM 3 years ago
parent
commit
81defc5862
1 changed files with 5 additions and 16 deletions
  1. 5 16
      lib/fpdf/invoice.php

+ 5 - 16
lib/fpdf/invoice.php

@@ -507,20 +507,16 @@ function addCadreTVAs()
 // trace le cadre des totaux
 function addCadreEurosFrancs()
 {
-	$r1  = $this->w - 70;
-	$r2  = $r1 + 60;
+	$r1  = $this->w - 50;
+	$r2  = $r1 + 40;
 	$y1  = $this->h - 40;
 	$y2  = $y1+20;
 	$this->RoundedRect($r1, $y1, ($r2 - $r1), ($y2-$y1), 2.5, 'D');
 	$this->Line( $r1+20,  $y1, $r1+20, $y2); // avant EUROS
-	$this->Line( $r1+20, $y1+4, $r2, $y1+4); // Sous Euros & Francs
-	$this->Line( $r1+38,  $y1, $r1+38, $y2); // Entre Euros & Francs
+	$this->Line( $r1+20, $y1+4, $r2, $y1+4); // Sous Euros
 	$this->SetFont( "Arial", "B", 8);
 	$this->SetXY( $r1+22, $y1 );
-	$this->Cell(15,4, "EUROS", 0, 0, "C");
-	$this->SetFont( "Arial", "", 8);
-	$this->SetXY( $r1+42, $y1 );
-	$this->Cell(15,4, "FRANCS", 0, 0, "C");
+	$this->Cell(15,4, "EUROS", 0, 0, "R");
 	$this->SetFont( "Arial", "B", 6);
 	$this->SetXY( $r1, $y1+5 );
 	$this->Cell(20,4, "TOTAL TTC", 0, 0, "C");
@@ -731,8 +727,7 @@ function addTVAs( $params, $tab_tva, $invoice, $katao_supplier_invoice = null )
 	$accompteTTC = round($accompteTTC, 2);
 	/* Custom - End */
 
-	$re  = $this->w - 50;
-	$rf  = $this->w - 29;
+	$re  = $this->w - 29;
 	$y1  = $this->h - 40;
 	$this->SetFont( "Arial", "", 8);
 	$this->SetXY( $re, $y1+5 );
@@ -741,12 +736,6 @@ function addTVAs( $params, $tab_tva, $invoice, $katao_supplier_invoice = null )
 	$this->Cell( 17,4, Utils::formatCurrency($accompteTTC), '', '', 'R');
 	$this->SetXY( $re, $y1+14.8 );
 	$this->Cell( 17,4, Utils::formatCurrency($totalTTC - $accompteTTC), '', '', 'R');
-	$this->SetXY( $rf, $y1+5 );
-	$this->Cell( 17,4, Utils::formatCurrency($totalTTC * EURO_VAL), '', '', 'R');
-	$this->SetXY( $rf, $y1+10 );
-	$this->Cell( 17,4, Utils::formatCurrency($accompteTTC * EURO_VAL), '', '', 'R');
-	$this->SetXY( $rf, $y1+14.8 );
-	$this->Cell( 17,4, Utils::formatCurrency(($totalTTC - $accompteTTC) * EURO_VAL), '', '', 'R');
 }
 
 // Permet de rajouter un commentaire (Devis temporaire, REGLE, DUPLICATA, ...)