s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-02-11 12:10:09 +01:00
Code Issues Projects Releases Wiki Activity

briefpapier fix corrDetails

Browse Source
This commit is contained in:
OpenXE 2025-02-06 20:42:13 +01:00
parent 0dd54fe099
commit b9f9c68d15
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/lib/dokumente/class.briefpapier.php
View File

@ -1922,7 +1922,7 @@ class Briefpapier extends SuperFPDF {
{ {
if(!empty($this->corrDetails) || !empty($this->boldCorrDetails) || !empty($this->italicCorrDetails) if(!empty($this->corrDetails) || !empty($this->boldCorrDetails) || !empty($this->italicCorrDetails)
|| !empty($this->italicBoldCorrDetails)) || !empty($this->italicBoldCorrDetails))
$this->renderCorrDetails(); $corrDetailsY = $this->renderCorrDetails();
} }
$this->renderDoctype(); $this->renderDoctype();
@ -1932,6 +1932,10 @@ class Briefpapier extends SuperFPDF {
$this->textDetails['body']=$this->letterDetails['body']; $this->textDetails['body']=$this->letterDetails['body'];
} }
if ($corrDetailsY > $this->GetY()) {
$this->SetY($corrDetailsY);
}
$this->renderText(); $this->renderText();
if(!empty($this->items)) { if(!empty($this->items)) {
$this->renderItems(); $this->renderItems();
@ -2311,11 +2315,9 @@ class Briefpapier extends SuperFPDF {
$this->SetXY($startpos_links_rechts+$breite_spalte_rechts,$tempY); $this->SetXY($startpos_links_rechts+$breite_spalte_rechts,$tempY);
$this->MultiCell($this->box_breitexi21,4,$valueStr,"",$this->boxausrichtung); //BR $this->MultiCell($this->box_breitexi21,4,$valueStr,"",$this->boxausrichtung); //BR
$this->SetY(80+$this->abstand_artikeltabelleoben); //Hoehe Box return($this->GetY());
//$this->SetY(60);//+$this->abstand_artikeltabelleoben); //Hoehe Box
} }
public function renderDoctype() { public function renderDoctype() {
//$this->Ln(1); //$this->Ln(1);

2
www/lib/dokumente/class.produktion.php
View File

@ -141,7 +141,7 @@ class ProduktionPDF extends BriefpapierCustom {
produktion p produktion p
INNER JOIN produktion_position pp ON p.id = pp.produktion INNER JOIN produktion_position pp ON p.id = pp.produktion
INNER JOIN artikel a ON a.id = pp.artikel INNER JOIN artikel a ON a.id = pp.artikel
WHERE pp.stuecklistestufe = 1 WHERE p.id = ".$id." AND pp.stuecklistestufe = 1
"); ");
$bodytexte = Array(); $bodytexte = Array();