mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-12-25 14:10:28 +01:00
Bugfixes adressstammdatenblatt
This commit is contained in:
parent
3c170318df
commit
0b5b7cbed1
@ -21,6 +21,7 @@ class AdressstammblattPDF extends Dokumentenvorlage {
|
|||||||
$this->app=$app;
|
$this->app=$app;
|
||||||
//parent::Dokumentenvorlage();
|
//parent::Dokumentenvorlage();
|
||||||
$this->doctype="adresse";
|
$this->doctype="adresse";
|
||||||
|
$this->table="adresse";
|
||||||
$this->doctypeOrig="Adressstammblatt";
|
$this->doctypeOrig="Adressstammblatt";
|
||||||
parent::__construct($this->app,$projekt);
|
parent::__construct($this->app,$projekt);
|
||||||
}
|
}
|
||||||
@ -105,7 +106,7 @@ class AdressstammblattPDF extends Dokumentenvorlage {
|
|||||||
if($adresse['mitarbeiternummer']!="")
|
if($adresse['mitarbeiternummer']!="")
|
||||||
$numbers[] = array("Mitarbeiter Nr.",$adresse['mitarbeiternummer']);
|
$numbers[] = array("Mitarbeiter Nr.",$adresse['mitarbeiternummer']);
|
||||||
|
|
||||||
if(count($numbers)>0)
|
if($numbers?count($numbers):0>0)
|
||||||
$this->renderInfoBox($numbers);
|
$this->renderInfoBox($numbers);
|
||||||
|
|
||||||
$this->Ln(5);
|
$this->Ln(5);
|
||||||
@ -120,8 +121,8 @@ class AdressstammblattPDF extends Dokumentenvorlage {
|
|||||||
', E-Mail: ',email
|
', E-Mail: ',email
|
||||||
) as 'value' FROM ansprechpartner WHERE adresse='".$adresse['id']."'");
|
) as 'value' FROM ansprechpartner WHERE adresse='".$adresse['id']."'");
|
||||||
|
|
||||||
for($i=0;$i<count($ansprechpartner_tmp);$i++) $ansprechpartner[] = $ansprechpartner_tmp[$i]['value'];
|
for($i=0;$i<($ansprechpartner_tmp?count($ansprechpartner_tmp):0);$i++) $ansprechpartner[] = $ansprechpartner_tmp[$i]['value'];
|
||||||
if(count($ansprechpartner) > 0)
|
if($ansprechpartner_tmp?count($ansprechpartner):0 > 0)
|
||||||
{
|
{
|
||||||
$this->Ln(5);
|
$this->Ln(5);
|
||||||
$this->renderHeading("Ansprechpartner",8);
|
$this->renderHeading("Ansprechpartner",8);
|
||||||
@ -132,7 +133,7 @@ class AdressstammblattPDF extends Dokumentenvorlage {
|
|||||||
telefon,email
|
telefon,email
|
||||||
FROM lieferadressen WHERE adresse='".$adresse['id']."' ORDER by standardlieferadresse DESC");
|
FROM lieferadressen WHERE adresse='".$adresse['id']."' ORDER by standardlieferadresse DESC");
|
||||||
|
|
||||||
for($i=0;$i<count($lieferadressen_tmp);$i++) {
|
for($i=0;$i<($lieferadressen_tmp?count($lieferadressen_tmp):0);$i++) {
|
||||||
$lieferadressen_tmp[$i]['value']="";
|
$lieferadressen_tmp[$i]['value']="";
|
||||||
foreach($lieferadressen_tmp[$i] as $key=>$value)
|
foreach($lieferadressen_tmp[$i] as $key=>$value)
|
||||||
{
|
{
|
||||||
@ -161,7 +162,7 @@ class AdressstammblattPDF extends Dokumentenvorlage {
|
|||||||
$lieferadressen[] = $lieferadressen_tmp[$i]['value'].$standard;
|
$lieferadressen[] = $lieferadressen_tmp[$i]['value'].$standard;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(count($lieferadressen) > 0)
|
if($lieferadressen?count($lieferadressen):0 > 0)
|
||||||
{
|
{
|
||||||
$this->Ln(5);
|
$this->Ln(5);
|
||||||
$this->renderHeading("Lieferadressen",8);
|
$this->renderHeading("Lieferadressen",8);
|
||||||
|
@ -474,9 +474,11 @@ class Dokumentenvorlage extends SuperFPDF {
|
|||||||
$this->Output($dir."/".$this->table."/".$this->id."_".$this->filename,'F');
|
$this->Output($dir."/".$this->table."/".$this->id."_".$this->filename,'F');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function displayDocument() {
|
public function displayDocument($archive = true) {
|
||||||
$this->renderDocument();
|
$this->renderDocument();
|
||||||
$this->archiveDocument();
|
if ($archive) {
|
||||||
|
$this->archiveDocument();
|
||||||
|
}
|
||||||
$this->Output($this->filename,'D');
|
$this->Output($this->filename,'D');
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
@ -780,7 +780,7 @@ class Adresse extends GenAdresse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$Brief->GetAdressstammblatt($id);
|
$Brief->GetAdressstammblatt($id);
|
||||||
$Brief->displayDocument();
|
$Brief->displayDocument(archive: false);
|
||||||
$this->app->ExitXentral();
|
$this->app->ExitXentral();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user