mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2025-02-11 12:10:09 +01:00
briefpapier fix corrDetails
This commit is contained in:
parent
0dd54fe099
commit
b9f9c68d15
@ -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();
|
||||
@ -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);
|
||||
|
||||
|
@ -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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user