From b9f9c68d15622651087502ca0f3523ee62367eb5 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Thu, 6 Feb 2025 20:42:13 +0100 Subject: [PATCH] briefpapier fix corrDetails --- www/lib/dokumente/class.briefpapier.php | 12 +++++++----- www/lib/dokumente/class.produktion.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/www/lib/dokumente/class.briefpapier.php b/www/lib/dokumente/class.briefpapier.php index 2bb0643e..f94ee9bb 100644 --- a/www/lib/dokumente/class.briefpapier.php +++ b/www/lib/dokumente/class.briefpapier.php @@ -1922,7 +1922,7 @@ class Briefpapier extends SuperFPDF { { if(!empty($this->corrDetails) || !empty($this->boldCorrDetails) || !empty($this->italicCorrDetails) || !empty($this->italicBoldCorrDetails)) - $this->renderCorrDetails(); + $corrDetailsY = $this->renderCorrDetails(); } $this->renderDoctype(); @@ -1932,6 +1932,10 @@ class Briefpapier extends SuperFPDF { $this->textDetails['body']=$this->letterDetails['body']; } + if ($corrDetailsY > $this->GetY()) { + $this->SetY($corrDetailsY); + } + $this->renderText(); if(!empty($this->items)) { $this->renderItems(); @@ -1943,7 +1947,7 @@ class Briefpapier extends SuperFPDF { $this->renderFooter(); $this->logofile = ""; $this->briefpapier=""; - $this->briefpapier2=""; + $this->briefpapier2=""; if($this->addpdf) { foreach($this->addpdf as $addpdf) @@ -2311,11 +2315,9 @@ class Briefpapier extends SuperFPDF { $this->SetXY($startpos_links_rechts+$breite_spalte_rechts,$tempY); $this->MultiCell($this->box_breitexi21,4,$valueStr,"",$this->boxausrichtung); //BR - $this->SetY(80+$this->abstand_artikeltabelleoben); //Hoehe Box - //$this->SetY(60);//+$this->abstand_artikeltabelleoben); //Hoehe Box + return($this->GetY()); } - public function renderDoctype() { //$this->Ln(1); diff --git a/www/lib/dokumente/class.produktion.php b/www/lib/dokumente/class.produktion.php index 3108727b..308c958e 100644 --- a/www/lib/dokumente/class.produktion.php +++ b/www/lib/dokumente/class.produktion.php @@ -141,7 +141,7 @@ class ProduktionPDF extends BriefpapierCustom { produktion p INNER JOIN produktion_position pp ON p.id = pp.produktion INNER JOIN artikel a ON a.id = pp.artikel - WHERE pp.stuecklistestufe = 1 + WHERE p.id = ".$id." AND pp.stuecklistestufe = 1 "); $bodytexte = Array();