From 78182ab5046a5f03ebb0203441f323ed42986a67 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 14 Oct 2016 17:47:05 +0200
Subject: [PATCH] Fix sepa mandate translation

---
 .../bank/doc/pdf_sepamandate.modules.php      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 1074e83489d..396e89afb56 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -54,7 +54,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		$this->db = $db;
 		$this->name = "sepamandate";
-		$this->description = $langs->trans("DocumentModelSepaMandate");
+		$this->description = $langs->transnoentitiesnoconv("DocumentModelSepaMandate");
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
@@ -128,7 +128,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
 		        else $dir = $conf->bank->dir_output . "/" . $objectref;
-		        $file = $dir . "/" . $langs->trans("SepaMandateShort").' '.$objectref . "-".dol_sanitizeFileName($object->rum).".pdf";
+		        $file = $dir . "/" . $langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref . "-".dol_sanitizeFileName($object->rum).".pdf";
 		    }
 		    
 			if (! file_exists($dir))
@@ -225,14 +225,14 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY+=2;
 				
 				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->trans("RUM").')'.' : '.$object->rum, 0, 'L');
+				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").')'.' : '.$object->rum, 0, 'L');
 				
 				$posY=$pdf->GetY();
 				$posY+=2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics='';
 				if (! empty($conf->global->PRELEVEMENT_ICS)) $ics=$conf->global->PRELEVEMENT_ICS;
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->trans("ICS").')'.' : '.$ics, 0, 'L');
+				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").')'.' : '.$ics, 0, 'L');
 				
 				$posY=$pdf->GetY();
 				$posY+=1;
@@ -254,7 +254,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				
 				$posY+=8;
 				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 8, $outputlangs->trans("SEPALegalText", $mysoc->name, $mysoc->name), 0, 'L');
+				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 8, $outputlangs->transnoentitiesnoconv("SEPALegalText", $mysoc->name, $mysoc->name), 0, 'L');
 				
 				// Your data form
 				$posY=$pdf->GetY();
@@ -328,20 +328,20 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->SetXY(80, $posY);
 				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
 				$pdf->SetXY(86, $posY);
-				$txt = $langs->trans("ModeRECUR").'  '.$langs->trans("or");
+				$txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$posY+=6;
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
 				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
 				$pdf->SetXY(86, $posY);
-				$txt = $langs->trans("ModeFRST");
+				$txt = $langs->transnoentitiesnoconv("ModeFRST");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				if (empty($object->frstrecur))
 				{
     				$posY+=6;
     				$pdf->SetXY(80, $posY);
-				    $txt = '('.$langs->trans("PleaseCheckOne").')';
+				    $txt = '('.$langs->transnoentitiesnoconv("PleaseCheckOne").')';
     				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				}
 				
@@ -452,7 +452,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
    
 	    $pdf->SetXY($this->marge_gauche, $posy);
 	    $pdf->SetFont('','', $default_font_size);
-	    $pdf->MultiCell(100, 3, $outputlangs->trans("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
+	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
 	    $posy=$pdf->GetY()+2;
 	     
 	    $pdf->SetXY($this->marge_gauche, $posy);
@@ -486,7 +486,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	    
 	    $pdf->SetFont('','', $default_font_size - 2);
 	    
-	    $pdf->MultiCell(100, 3, $outputlangs->trans("DateOfSignature"), 0, 'L', 0);
+	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateOfSignature"), 0, 'L', 0);
 	    $pdf->MultiCell(100, 3, ' ');
 	    $pdf->MultiCell(100, 3, '______________________', 0, 'L', 0);
 	    
@@ -497,7 +497,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	    // Total HT
 	    $pdf->SetFillColor(255,255,255);
 	    $pdf->SetXY($posx, $tab_top + 0);
-	    $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentities("Signature"), 0, 'L', 1);
+	    $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
 	
 	    $pdf->SetXY($posx, $tab_top + $tab_hl);
 	    $pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');