- Übernahme neuer Funktionen aus dem alten Zweig / Pfad / Einstellungen / Hilfe Icons / Berechnung

- Neuer Modulfilter im neuen Backend

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5382 0d5edaf7-2b12-4e95-93f4-047927463d4b

1 files changed, 7 insertions, 7 deletions

diff --git a/views/mods/mod_deliverynote/deliverynote_pdf.phtml b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
index 17a613f..4bcf5c2 100644
--- a/views/mods/mod_deliverynote/deliverynote_pdf.phtml
+++ b/views/mods/mod_deliverynote/deliverynote_pdf.phtml
@@ -99,9 +99,9 @@
 				{

 						

 					$pdf->SetFont('Arial', 'B', ((intval($text['fontsize']) > 0)?intval($text['fontsize']):10));

-					$pdf->SetTextColor($text['color']);

-					$pdf->MultiCell($text['x'], $text['y'], 5, utf8_encode($text['text']));

-					$pdf->SetTextColor("#000000");

+					$pdf->wpsg_SetTextColor($text['color']);

+					$pdf->wpsg_MultiCell($text['x'], $text['y'], 5, $text['text']);

+					$pdf->wpsg_SetTextColor("#000000");

 						

 				}

 			

@@ -249,7 +249,7 @@
 		$height += 5 * ceil($produkt_text_width / $produkt_text_cell_width) + 3;

 		

 		$height_y = $pdf->getY();

-		$height = 2 + $pdf->MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, utf8_encode($produkt_text), 0, 'L', 0, $produkt_text_cell_width);

+		$height = 2 + $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $offset + 1.5, 5, $produkt_text, 0, 'L', 0, $produkt_text_cell_width);

 		

 		$pdf->setXY($prod_left + 147, $prod_top + $offset);

 		$pdf->Cell(15, 8, $p['menge'], 0, 0, 'C');

@@ -271,7 +271,7 @@
 			$pdf->SetFont('Arial', 'I', 9);

 				

 			$cellY = $pdf->getY();

-			$pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, utf8_encode($produktBeschreibung), 0, 'L', 0, $produkt_text_cell_width);

+			$pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1, 5, $produktBeschreibung, 0, 'L', 0, $produkt_text_cell_width);

 			$pBeschreibungHeight = $pdf->getY() - $cellY - $height + 1;

 			$pdf->SetFont('Arial', '', 9);

 				

@@ -287,7 +287,7 @@
 				

 			$variInfo = $this->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($p['productkey']));

 		

-			$height += $pdf->MultiCell($prod_left + 10, $prod_top + $height + $offset - 1.5, 5, utf8_encode(wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key'])), 0, 'L', 0, $produkt_text_cell_width);

+			$height += $pdf->wpsg_MultiCell($prod_left + 10, $prod_top + $height + $offset - 1.5, 5, wpsg_translate(__('Variante: #1#', 'wpsg'), $variInfo['key']), 0, 'L', 0, $produkt_text_cell_width);

 				 

 		}

 		

@@ -318,7 +318,7 @@
 	if ($this->view['fussText'] != "")

 	{

 	

-		$pdf->MultiCell($prod_left - 1, $prod_top + $offset, 5, utf8_encode($this->view['fussText']));

+		$pdf->wpsg_MultiCell($prod_left - 1, $prod_top + $offset, 5, $this->view['fussText']);

 		$pdf->SetFont('Arial', 'B', 9);

 		$offset += 10;