mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-12-25 14:10:28 +01:00
rechnung hide PDF when xml
This commit is contained in:
parent
d4c5c67b05
commit
5c6e41c9b2
@ -6758,11 +6758,11 @@ r.land as land, p.abkuerzung as projekt, r.zahlungsweise as zahlungsweise,
|
||||
$menu .= "<img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/copy.svg\" border=\"0\">";
|
||||
$menu .= "</a>";
|
||||
$menu .= "</td>";
|
||||
$menu .= "<td>";
|
||||
/* $menu .= "<td>";
|
||||
$menu .= "<a href=\"index.php?module=rechnung&action=pdf&id=%value%\">";
|
||||
$menu .= "<img src=\"themes/{$this->app->Conf->WFconf['defaulttheme']}/images/pdf.svg\" border=\"0\">";
|
||||
$menu .= "</a>";
|
||||
$menu .= "</td>";
|
||||
$menu .= "</td>";*/
|
||||
$menu .= "<td>";
|
||||
$menu .= '<a href="#" class="label-manager" data-label-column-number="6" data-label-reference-id="%value%" data-label-reference-table="rechnung">';
|
||||
$menu .= '<span class="label-manager-icon"></span>';
|
||||
@ -6809,6 +6809,10 @@ r.land as land, p.abkuerzung as projekt, r.zahlungsweise as zahlungsweise,
|
||||
}
|
||||
}
|
||||
|
||||
$width[] = '1%';
|
||||
$findcols[] = 'r.id';
|
||||
$heading[] = '';
|
||||
|
||||
$width[] = '1%';
|
||||
$findcols[] = 'r.id';
|
||||
$heading[] = 'Menü';
|
||||
@ -6838,8 +6842,12 @@ r.land as land, p.abkuerzung as projekt, r.zahlungsweise as zahlungsweise,
|
||||
if(r.soll-r.ist!=0 AND r.ist > 0,FORMAT(r.ist-r.soll,2{$extended_mysql55}),FORMAT((r.soll-r.ist)*-1,2{$extended_mysql55})),
|
||||
'')
|
||||
as fehlt,
|
||||
if(r.status = 'storniert' AND r.teilstorno = 1,'TEILSTORNO',UPPER(r.status)) as status,
|
||||
".(!empty($zusatzcols)?implode(', ',$zusatzcols).',':'')."
|
||||
if(r.status = 'storniert' AND r.teilstorno = 1,'TEILSTORNO',UPPER(r.status)) as status
|
||||
".(!empty($zusatzcols)?','.implode(', ',$zusatzcols):'').",
|
||||
IF(r.erechnung,
|
||||
CONCAT('<a href=\"index.php?module=rechnung&action=xml&id=',r.id,'\"><img src=\"themes/".$this->app->Conf->WFconf['defaulttheme']."/images/xml.svg\" border=\"0\">'),
|
||||
CONCAT('<a href=\"index.php?module=rechnung&action=pdf&id=',r.id,'\"><img src=\"themes/".$this->app->Conf->WFconf['defaulttheme']."/images/pdf.svg\" border=\"0\">')
|
||||
),
|
||||
r.id
|
||||
FROM rechnung r LEFT JOIN projekt p ON p.id=r.projekt LEFT JOIN adresse adr ON r.adresse=adr.id LEFT JOIN auftrag au ON au.id = r.auftragid ";
|
||||
if(isset($parameter['artikel']) && !empty($parameter['artikel'])) {
|
||||
|
@ -78,9 +78,15 @@ class RechnungPDF extends BriefpapierCustom {
|
||||
DATE_FORMAT(DATE_ADD(r.datum, INTERVAL r.zahlungszieltageskonto DAY),'%d.%m.%Y') AS zahlungszielskontodatum,
|
||||
r.abweichendebezeichnung AS rechnungersatz,
|
||||
r.kundennummer, r.sprache, r.schreibschutz, r.soll AS gesamtsumme,
|
||||
DATE_FORMAT(r.datum,'%Y%m%d') as datum2, r.telefon, r.email
|
||||
DATE_FORMAT(r.datum,'%Y%m%d') as datum2, r.telefon, r.email, r.erechnung
|
||||
FROM rechnung r LEFT JOIN auftrag a ON a.id=r.auftragid WHERE r.id='$id' LIMIT 1"
|
||||
);
|
||||
|
||||
|
||||
if ($data['erechnung']) {
|
||||
exit();
|
||||
}
|
||||
|
||||
extract($data,EXTR_OVERWRITE);
|
||||
$adresse = $data['adresse'];
|
||||
$auftrag = $data['auftrag'];
|
||||
|
@ -1784,6 +1784,8 @@ class Rechnung extends GenRechnung
|
||||
$projekt = $rechnungarr['projekt'];
|
||||
|
||||
$skontosoll = $this->app->DB->Select("SELECT TRUNCATE(soll*(1-(zahlungszielskonto/100)),2) as skontosoll FROM rechnung where id = '".$id."' LIMIT 1");
|
||||
|
||||
$erechnung = $rechnungarr['erechnung'];
|
||||
}
|
||||
|
||||
$this->app->Tpl->Set('PUNKTE',"<input type=\"text\" name=\"punkte\" value=\"$punkte\" size=\"10\" readonly>");
|
||||
@ -1815,6 +1817,11 @@ class Rechnung extends GenRechnung
|
||||
$this->app->Tpl->Set('KUNDE', " Kd-Nr. " . $kundennummer);
|
||||
}
|
||||
}
|
||||
|
||||
if ($erechnung) {
|
||||
$this->app->Tpl->Set('PDFVORSCHAUHIDDEN', "hidden");
|
||||
}
|
||||
|
||||
$lieferdatum = '';
|
||||
$rechnungsdatum = '';
|
||||
$lieferscheinid = 0;
|
||||
|
@ -4,7 +4,7 @@
|
||||
<ul>
|
||||
<li><a href="#tabs-1">Rechnung</a></li>
|
||||
<li><a href="#tabs-2" onclick="callCursor();">Positionen</a></li>
|
||||
<li><a href="index.php?module=rechnung&action=inlinepdf&id=[ID]&frame=true#tabs-3">Vorschau</a></li>
|
||||
<li [PDFVORSCHAUHIDDEN]><a href="index.php?module=rechnung&action=inlinepdf&id=[ID]&frame=true#tabs-3">Vorschau</a></li>
|
||||
[FURTHERTABS]
|
||||
</ul>
|
||||
<div id="tabs-1">
|
||||
|
Loading…
Reference in New Issue
Block a user