s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-11-14 20:17:14 +01:00
Code Issues Projects Releases Wiki Activity

Bugfixes CRM

Browse Source
This commit is contained in:
Xenomporio 2022-05-30 21:39:00 +02:00
parent 72b76be062
commit 526506575a
3 changed files with 1013 additions and 996 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1182,9 +1182,12 @@ class Briefpapier extends SuperFPDF {
public function ArchiviereDocument($schreibschutz = false, $force = false, $parameter = ''): void public function ArchiviereDocument($schreibschutz = false, $force = false, $parameter = ''): void
{ {
if(!$schreibschutz){ if(!$schreibschutz){
$schreibschutz = (bool)$this->app->DB->Select(
"SELECT `schreibschutz` FROM `{$this->table}` WHERE `id` = '{$this->id}' LIMIT 1" if (!is_null($this->table)) {
); $schreibschutz = (bool)$this->app->DB->Select(
"SELECT `schreibschutz` FROM `{$this->table}` WHERE `id` = '{$this->id}' LIMIT 1"
);
}
} }
if($parameter == ''){ if($parameter == ''){
@ -1195,9 +1198,11 @@ class Briefpapier extends SuperFPDF {
return; return;
} }
$isDraft = $this->app->DB->Select( if (!is_null($this->table)) {
"SELECT `id` FROM `{$this->table}` WHERE `id` = '{$this->id}' AND `belegnr` <> '' AND `belegnr` <> '0' LIMIT 1" $isDraft = $this->app->DB->Select(
) === null; "SELECT `id` FROM `{$this->table}` WHERE `id` = '{$this->id}' AND `belegnr` <> '' AND `belegnr` <> '0' LIMIT 1"
) === null;
}
if($isDraft){ if($isDraft){
return; return;

1979
www/lib/dokumente/class.dokumentenvorlage.php
View File

File diff suppressed because it is too large Load Diff

13
www/pages/adresse.php
View File

@ -3819,15 +3819,26 @@ function AdresseBriefCreatePDF($dokumentId, $display=true) {
LIMIT 1 LIMIT 1
'); ');
$data['firma'] = $this->app->DB->Select(' /* $data['firma'] = $this->app->DB->Select('
SELECT SELECT
absender absender
FROM FROM
firmendaten firmendaten
WHERE WHERE
id = ' . $data['firma'] . ' id = ' . $data['firma'] . '
');*/
$data['firma'] = $this->app->DB->Select('
SELECT
wert
FROM
firmendaten_werte
WHERE
name = \'absender\'
'); ');
$korrespondenz = new KorrespondenzPDF($this->app,$data['projekt']); $korrespondenz = new KorrespondenzPDF($this->app,$data['projekt']);
$korrespondenz->SetBetreff($this->app->erp->ReadyForPDF($data['betreff'])); $korrespondenz->SetBetreff($this->app->erp->ReadyForPDF($data['betreff']));