$value)
- {
- switch($key)
- {
- case "email":
- $lieferadressen_tmp[$i]['value'] .= "E-Mail: $value, ";
- break;
-
- case "telefon":
- $lieferadressen_tmp[$i]['value'] .= "Telefon: $value, ";
- break;
- case "telefax":
- $lieferadressen_tmp[$i]['value'] .= "Telefax: $value, ";
- break;
-
- default:
- if($value!="")
- $lieferadressen_tmp[$i]['value'] .= "$value, ";
- }
- }
-
- $lieferadressen_tmp[$i]['value'] = trim($lieferadressen_tmp[$i]['value'],', ');
- if($i==0) $standard = " (Standard)"; else $standard="";
-
- $lieferadressen[] = $lieferadressen_tmp[$i]['value'].$standard;
- }
-
- if(count($lieferadressen) > 0)
- {
- $this->Ln(5);
- $this->renderHeading("Lieferadressen",8);
- $this->renderInfoBoxSingle($lieferadressen);
- }
-
-
- $this->Ln(5);
-
- if($adresse['sonstiges']!="")
- {
- $this->renderHeading("Sonstiges",8);
- $this->SetFont($this->GetFont(),'',7);
- $this->MultiCell(180,4,$this->WriteHTML($adresse['sonstiges']));
- }
-
- $this->renderFooter();
- }
-
-
- function GetAdressstammblatt($id,$info="",$extrafreitext="")
- {
- $this->id = $id;
- // das muss vom reisekosten sein!!!!
- //$this->setRecipientLieferadresse($id,"reisekosten");
-
- // OfferNo, customerId, OfferDate
- /*$auftrag = $this->app->DB->Select("SELECT auftragid FROM reisekosten WHERE id='$id' LIMIT 1");
- $auftrag = $this->app->DB->Select("SELECT belegnr FROM auftrag WHERE id='$auftrag' LIMIT 1");
- $bearbeiter = $this->app->DB->Select("SELECT bearbeiter FROM reisekosten WHERE id='$id' LIMIT 1");
- $prefix = $this->app->DB->Select("SELECT prefix FROM reisekosten WHERE id='$id' LIMIT 1");
- $bestellbestaetigung = $this->app->DB->Select("SELECT bestellbestaetigung FROM reisekosten WHERE id='$id' LIMIT 1");
- $this->datum = $this->app->DB->Select("SELECT DATE_FORMAT(datum,'%d.%m.%Y') FROM reisekosten WHERE id='$id' LIMIT 1");
-
- $this->von = $this->app->DB->Select("SELECT DATE_FORMAT(von,'%d.%m.%Y') FROM reisekosten WHERE id='$id' LIMIT 1");
- $this->bis = $this->app->DB->Select("SELECT DATE_FORMAT(bis,'%d.%m.%Y') FROM reisekosten WHERE id='$id' LIMIT 1");
- $this->von_zeit = $this->app->DB->Select("SELECT von_zeit FROM reisekosten WHERE id='$id' LIMIT 1");
- $this->bis_zeit = $this->app->DB->Select("SELECT bis_zeit FROM reisekosten WHERE id='$id' LIMIT 1");
- $belegnr = $this->app->DB->Select("SELECT belegnr FROM reisekosten WHERE id='$id' LIMIT 1");
- $this->anlass = $this->app->DB->Select("SELECT anlass FROM reisekosten WHERE id='$id' LIMIT 1");
- $this->freitext = $this->app->DB->Select("SELECT freitext FROM reisekosten WHERE id='$id' LIMIT 1");
- $projekt = $this->app->DB->Select("SELECT projekt FROM reisekosten WHERE id='$id' LIMIT 1");
- $mitarbeiter = $this->app->DB->Select("SELECT mitarbeiter FROM reisekosten WHERE id='$id' LIMIT 1");*/
- $kunde= $this->app->DB->SelectArr("SELECT name,kundennummer,lieferantennummer FROM adresse WHERE id='$id' LIMIT 1");
- $kunde = reset($kunde);
-
- $kundennummer = $kunde['kundennummer'];
- $this->name = $kunde['name'];
-
- $this->projektabkuerzung = $this->app->DB->Select("SELECT abkuerzung FROM projekt WHERE id='$projekt'");
- $this->firmenname = $this->app->erp->Firmendaten('name');
- $this->doctypeOrig="Adresse: ".$kunde['name'];
- $this->barcode=$belegnr;
-
- //$ohne_briefpapier = $this->app->DB->Select("SELECT ohne_briefpapier FROM reisekosten WHERE id='$id' LIMIT 1");
-
-
-
-
- //$artikel = $this->app->DB->SelectArr("SELECT *,DATE_FORMAT(datum,'%d.%m.%Y') as datum, CONCAT(rk.nummer,'- ',rk.beschreibung) as reisekostenart FROM reisekosten_position rp LEFT JOIN reisekostenart rk ON rk.id=rp.reisekostenart WHERE rp.reisekosten='$id' ORDER By rp.sort");
-
- //$waehrung = $this->app->DB->Select("SELECT waehrung FROM reisekosten_position WHERE reisekosten='$id' LIMIT 1");
-
- /* Dateiname */
- $this->filename = date('Ymd')."_STAMMDATEN_ADRESSE_".$this->app->erp->Dateinamen($kunde['name']).".pdf";
-
- $this->setBarcode($id);
- }
-
-
-}
+app=$app;
+ //parent::Dokumentenvorlage();
+ $this->doctype="adresse";
+ $this->table="adresse";
+ $this->doctypeOrig="Adressstammblatt";
+ parent::__construct($this->app,$projekt);
+ }
+
+ public function renderDocument() {
+ // prepare page details
+ SuperFPDF::__construct('P','mm','A4');
+
+
+ $this->AddPage();
+ $this->SetDisplayMode("real","single");
+
+ $this->SetMargins(15,50);
+ $this->SetAutoPageBreak(true,40);
+ $this->AliasNbPages('{nb}');
+
+
+ // Bei Adressstammblatt immer oben beginnen
+ $this->abstand_betreffzeileoben=0;
+ $this->logofile = "";//$this->app->erp->GetTMP()."/".$this->app->Conf->WFdbname."_logo.jpg";
+ $this->briefpapier="";
+
+
+ $schrift = $this->app->erp->Firmendaten('schriftgroesse');
+
+ $this->SetFontSize($schrift);
+ $this->SetFont($this->GetFont(),'','10');
+ $this->SetX($this->GetX()+160);
+ $this->Cell(10,0,date("d.m.Y"),"","","L");
+
+ $this->renderDoctype();
+
+ $adresse = $this->app->DB->SelectArr("SELECT * FROM adresse WHERE id='".$this->id."'");
+ $adresse = reset($adresse);
+
+ if($adresse['typ']=="firma")
+ {
+ $infofields[]=array("Firma",$adresse['name']);
+ if($adresse['ansprechpartner']!="")
+ $infofields[]=array("Ansprechpartner",$adresse['ansprechpartner']);
+ } else {
+ $infofields[]=array("Name",$adresse['name']);
+ }
+
+ $infofields[]=array("Anschrift",$adresse['land']."-".$adresse['plz']." ".$adresse['ort'].", ".$adresse['strasse']);
+
+ $felder = array('telefon','telefax','mobil','email','web');
+ foreach($felder as $feldname)
+ {
+ $infofields[]=array(ucfirst($feldname),$adresse[$feldname=='web'?'internetseite':$feldname]);
+ }
+
+
+ if($this->app->erp->Firmendaten("modul_mlm")==1)
+ {
+ $mlmvertragsbeginn = $this->app->DB->Select("SELECT DATE_FORMAT(mlmvertragsbeginn,'%d.%m.%Y') FROM adresse WHERE id='".$adresse['id']."' LIMIT 1");
+ if($mlmvertragsbeginn=="00.00.0000") $mlmvertragsbeginn = "kein Vertragsbeginn eingestellt";
+ $sponsorid = $this->app->DB->Select("SELECT sponsor FROM adresse WHERE id='".$adresse['id']."' LIMIT 1");
+ if($sponsorid> 0)
+ $sponsor = $this->app->DB->Select("SELECT CONCAT(kundennummer,' ',name) FROM adresse WHERE id='$sponsorid' LIMIT 1");
+ else
+ $sponsor = "Kein Sponsor vorhanden";
+
+ $erfasstam = $this->app->DB->Select("SELECT DATE_FORMAT(zeitstempel,'%d.%m.%Y') FROM objekt_protokoll WHERE objekt='adresse' AND objektid='".$adresse['id']."' AND action_long='adresse_create' LIMIT 1");
+
+ $infofields[]=array("Sponsor",$sponsor);
+ $infofields[]=array("Erfasst am",$erfasstam);
+ $infofields[]=array("Vertragsbeginn am",$mlmvertragsbeginn);
+ }
+
+
+
+ $infofields[]=array("UST-ID",$adresse['ustid']);
+
+
+ if($adresse['kundennummer']!="")
+ $numbers[] = array("Kunden Nr.",$adresse['kundennummer']);
+
+ if($adresse['lieferantennummer']!="")
+ $numbers[] = array("Lieferanten Nr.",$adresse['lieferantennummer']);
+
+ if($adresse['mitarbeiternummer']!="")
+ $numbers[] = array("Mitarbeiter Nr.",$adresse['mitarbeiternummer']);
+
+ if($numbers?count($numbers):0>0)
+ $this->renderInfoBox($numbers);
+
+ $this->Ln(5);
+ $this->renderHeading("Adressstammblatt",8);
+ $this->renderInfoBox($infofields);
+
+
+
+ $ansprechpartner_tmp = $this->app->DB->SelectArr("SELECT CONCAT(name,', ',if(bereich='','-',bereich),
+ ', Telefon: ',telefon,
+ ', Mobil: ',mobil,
+ ', E-Mail: ',email
+ ) as 'value' FROM ansprechpartner WHERE adresse='".$adresse['id']."'");
+
+ for($i=0;$i<($ansprechpartner_tmp?count($ansprechpartner_tmp):0);$i++) $ansprechpartner[] = $ansprechpartner_tmp[$i]['value'];
+ if($ansprechpartner_tmp?count($ansprechpartner):0 > 0)
+ {
+ $this->Ln(5);
+ $this->renderHeading("Ansprechpartner",8);
+ $this->renderInfoBoxSingle($ansprechpartner);
+ }
+
+ $lieferadressen_tmp = $this->app->DB->SelectArr("SELECT name,abteilung,unterabteilung,adresszusatz,strasse,plz,ort,land,
+ telefon,email
+ FROM lieferadressen WHERE adresse='".$adresse['id']."' ORDER by standardlieferadresse DESC");
+
+ for($i=0;$i<($lieferadressen_tmp?count($lieferadressen_tmp):0);$i++) {
+ $lieferadressen_tmp[$i]['value']="";
+ foreach($lieferadressen_tmp[$i] as $key=>$value)
+ {
+ switch($key)
+ {
+ case "email":
+ $lieferadressen_tmp[$i]['value'] .= "E-Mail: $value, ";
+ break;
+
+ case "telefon":
+ $lieferadressen_tmp[$i]['value'] .= "Telefon: $value, ";
+ break;
+ case "telefax":
+ $lieferadressen_tmp[$i]['value'] .= "Telefax: $value, ";
+ break;
+
+ default:
+ if($value!="")
+ $lieferadressen_tmp[$i]['value'] .= "$value, ";
+ }
+ }
+
+ $lieferadressen_tmp[$i]['value'] = trim($lieferadressen_tmp[$i]['value'],', ');
+ if($i==0) $standard = " (Standard)"; else $standard="";
+
+ $lieferadressen[] = $lieferadressen_tmp[$i]['value'].$standard;
+ }
+
+ if($lieferadressen?count($lieferadressen):0 > 0)
+ {
+ $this->Ln(5);
+ $this->renderHeading("Lieferadressen",8);
+ $this->renderInfoBoxSingle($lieferadressen);
+ }
+
+
+ $this->Ln(5);
+
+ if($adresse['sonstiges']!="")
+ {
+ $this->renderHeading("Sonstiges",8);
+ $this->SetFont($this->GetFont(),'',7);
+ $this->MultiCell(180,4,$this->WriteHTML($adresse['sonstiges']));
+ }
+
+ $this->renderFooter();
+ }
+
+
+ function GetAdressstammblatt($id,$info="",$extrafreitext="")
+ {
+ $this->id = $id;
+ // das muss vom reisekosten sein!!!!
+ //$this->setRecipientLieferadresse($id,"reisekosten");
+
+ // OfferNo, customerId, OfferDate
+ /*$auftrag = $this->app->DB->Select("SELECT auftragid FROM reisekosten WHERE id='$id' LIMIT 1");
+ $auftrag = $this->app->DB->Select("SELECT belegnr FROM auftrag WHERE id='$auftrag' LIMIT 1");
+ $bearbeiter = $this->app->DB->Select("SELECT bearbeiter FROM reisekosten WHERE id='$id' LIMIT 1");
+ $prefix = $this->app->DB->Select("SELECT prefix FROM reisekosten WHERE id='$id' LIMIT 1");
+ $bestellbestaetigung = $this->app->DB->Select("SELECT bestellbestaetigung FROM reisekosten WHERE id='$id' LIMIT 1");
+ $this->datum = $this->app->DB->Select("SELECT DATE_FORMAT(datum,'%d.%m.%Y') FROM reisekosten WHERE id='$id' LIMIT 1");
+
+ $this->von = $this->app->DB->Select("SELECT DATE_FORMAT(von,'%d.%m.%Y') FROM reisekosten WHERE id='$id' LIMIT 1");
+ $this->bis = $this->app->DB->Select("SELECT DATE_FORMAT(bis,'%d.%m.%Y') FROM reisekosten WHERE id='$id' LIMIT 1");
+ $this->von_zeit = $this->app->DB->Select("SELECT von_zeit FROM reisekosten WHERE id='$id' LIMIT 1");
+ $this->bis_zeit = $this->app->DB->Select("SELECT bis_zeit FROM reisekosten WHERE id='$id' LIMIT 1");
+ $belegnr = $this->app->DB->Select("SELECT belegnr FROM reisekosten WHERE id='$id' LIMIT 1");
+ $this->anlass = $this->app->DB->Select("SELECT anlass FROM reisekosten WHERE id='$id' LIMIT 1");
+ $this->freitext = $this->app->DB->Select("SELECT freitext FROM reisekosten WHERE id='$id' LIMIT 1");
+ $projekt = $this->app->DB->Select("SELECT projekt FROM reisekosten WHERE id='$id' LIMIT 1");
+ $mitarbeiter = $this->app->DB->Select("SELECT mitarbeiter FROM reisekosten WHERE id='$id' LIMIT 1");*/
+ $kunde= $this->app->DB->SelectArr("SELECT name,kundennummer,lieferantennummer FROM adresse WHERE id='$id' LIMIT 1");
+ $kunde = reset($kunde);
+
+ $kundennummer = $kunde['kundennummer'];
+ $this->name = $kunde['name'];
+
+ $this->projektabkuerzung = $this->app->DB->Select("SELECT abkuerzung FROM projekt WHERE id='$projekt'");
+ $this->firmenname = $this->app->erp->Firmendaten('name');
+ $this->doctypeOrig="Adresse: ".$kunde['name'];
+ $this->barcode=$belegnr;
+
+ //$ohne_briefpapier = $this->app->DB->Select("SELECT ohne_briefpapier FROM reisekosten WHERE id='$id' LIMIT 1");
+
+
+
+
+ //$artikel = $this->app->DB->SelectArr("SELECT *,DATE_FORMAT(datum,'%d.%m.%Y') as datum, CONCAT(rk.nummer,'- ',rk.beschreibung) as reisekostenart FROM reisekosten_position rp LEFT JOIN reisekostenart rk ON rk.id=rp.reisekostenart WHERE rp.reisekosten='$id' ORDER By rp.sort");
+
+ //$waehrung = $this->app->DB->Select("SELECT waehrung FROM reisekosten_position WHERE reisekosten='$id' LIMIT 1");
+
+ /* Dateiname */
+ $this->filename = date('Ymd')."_STAMMDATEN_ADRESSE_".$this->app->erp->Dateinamen($kunde['name']).".pdf";
+
+ $this->setBarcode($id);
+ }
+
+
+}
diff --git a/www/lib/dokumente/class.dokumentenvorlage.php b/www/lib/dokumente/class.dokumentenvorlage.php
index 1c14dcd3..f2a024f9 100644
--- a/www/lib/dokumente/class.dokumentenvorlage.php
+++ b/www/lib/dokumente/class.dokumentenvorlage.php
@@ -474,9 +474,11 @@ class Dokumentenvorlage extends SuperFPDF {
$this->Output($dir."/".$this->table."/".$this->id."_".$this->filename,'F');
}
- public function displayDocument() {
+ public function displayDocument($archive = true) {
$this->renderDocument();
- $this->archiveDocument();
+ if ($archive) {
+ $this->archiveDocument();
+ }
$this->Output($this->filename,'D');
exit;
}
diff --git a/www/pages/adresse.php b/www/pages/adresse.php
index ca86ff8d..82c3a957 100644
--- a/www/pages/adresse.php
+++ b/www/pages/adresse.php
@@ -780,7 +780,7 @@ class Adresse extends GenAdresse {
}
$Brief->GetAdressstammblatt($id);
- $Brief->displayDocument();
+ $Brief->displayDocument(archive: false);
$this->app->ExitXentral();
}
From 2b43efca70d3e8f6224116b47b4f528e6b110a02 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Tue, 11 Jun 2024 20:00:16 +0200
Subject: [PATCH 06/11] Bugfix add price when address is in several groups
---
www/lib/class.erpapi.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php
index 9ec83a60..27679ee4 100644
--- a/www/lib/class.erpapi.php
+++ b/www/lib/class.erpapi.php
@@ -38222,7 +38222,7 @@ function Firmendaten($field,$projekt="")
$sql_erweiterung = '';
if(!empty($gruppenarr))
{
- $sql_erweiterung .= ' OR v.gruppe IN ('.implode(' ', $gruppenarr).') ';
+ $sql_erweiterung .= ' OR v.gruppe IN ('.implode(', ', $gruppenarr).') ';
}
if(!$guenstigste_vk) {
$vkarr = $this->app->DB->SelectArr("SELECT * FROM verkaufspreise v WHERE v.ab_menge <= '$menge' AND
From 09aacfbb7bb6bedc52eb115913d906a5547a278d Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Wed, 12 Jun 2024 11:24:10 +0200
Subject: [PATCH 07/11] Bugfix file upload dragndrop
---
phpwf/plugins/class.yui.php | 168 +++++++++++++++-----------
www/pages/content/datei_neudirekt.tpl | 6 +-
2 files changed, 103 insertions(+), 71 deletions(-)
diff --git a/phpwf/plugins/class.yui.php b/phpwf/plugins/class.yui.php
index a276877c..bfe50fbd 100644
--- a/phpwf/plugins/class.yui.php
+++ b/phpwf/plugins/class.yui.php
@@ -14135,24 +14135,18 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
$action = $this->app->Secure->GetGET("action");
$id = $this->app->Secure->GetGET("id");
if($id)$this->app->Tpl->Set('ID',$id);
- if ($speichern != "") {
- $titel = $this->app->Secure->GetPOST("titel");
- $beschreibung = $this->app->Secure->GetPOST("beschreibung");
- $stichwort = $this->app->Secure->GetPOST("stichwort");
- $this->app->Tpl->Set('TITLE', $titel);
- $this->app->Tpl->Set('BESCHREIBUNG', $beschreibung);
-
- if ($_FILES['upload']['tmp_name'] == "") {
- $this->app->Tpl->Set('ERROR', "Bitte wählen Sie eine Datei aus und laden Sie diese herauf!
");
- $this->app->erp->EnableTab("tabs-2");
- } else {
- //$fileid = $this->app->erp->CreateDatei($_FILES['upload']['name'],$titel,$beschreibung,"",$_FILES['upload']['tmp_name'],$this->app->User->GetName());
- $this->app->erp->AddDateiVersion($datei, $this->app->User->GetName(), $_FILES['upload']['name'], "Neue Version", $_FILES['upload']['tmp_name']);
- header("Location: index.php?module=$module&action=$action&id=$id");
- exit;
+ // Get files here
+ if ($speichern != "") {
+ $retval = $this->FilesFromUploadtoDMS(null, null, $datei);
+ if ($retval !== true) {
+ $this->app->Tpl->Set('ERROR', implode(', ',$retval));
+ $this->app->erp->EnableTab("tabs-2");
+ } else {
+ header("Location: index.php?module=$module&action=$action&id=$id");
}
}
+
$this->app->Tpl->Set('STARTDISABLE', "");
$this->app->Tpl->Parse($parsetarget, "datei_neudirekt.tpl");
@@ -14229,61 +14223,18 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
$id = $this->app->Secure->GetGET("id");
$sid = $this->app->Secure->GetGET("sid");
if($id)$this->app->Tpl->Set('ID', $id);
+
+ // Get files here
if ($speichern != "") {
- if($parameter == '')$parameter = $id;
- if(isset($_POST['dateiv']))
- {
- foreach($_POST['dateiv'] as $k => $v)
- {
- $name = $this->app->DB->real_escape_string($_POST['dateiname'][$k]);
- $titel = $this->app->DB->real_escape_string($_POST['dateititel'][$k]);
- $beschreibung = $this->app->DB->real_escape_string($_POST['beschreibung'][$k]);
- $stichwort = $this->app->DB->real_escape_string($_POST['dateistichwort'][$k]);
-
- //$getMime = explode('.', $name);
- //$mime = end($getMime);
-
- $data = explode(',', $v);
-
- $encodedData = str_replace(' ','+',$data[1]);
- $decodedData = base64_decode($encodedData);
-
- $this->app->Tpl->Set('TITLE', $titel);
- $this->app->Tpl->Set('BESCHREIBUNG', $beschreibung);
-
- if ($v == "" ) {
- $this->app->Tpl->Set('ERROR', "Keine Datei ausgewählt!
");
- $this->app->erp->EnableTab("tabs-2");
- } else {
- $fileid = $this->app->erp->CreateDatei($name, $titel, $beschreibung, "", $decodedData, $this->app->User->GetName());
-
- // stichwoerter hinzufuegen
- $this->app->erp->AddDateiStichwort($fileid, $stichwort, $objekt, $parameter);
- }
- }
- if($_FILES['upload']['tmp_name'] == "")
- {
- header("Location: index.php?module=$_module&action=$_action&id=$id&sid=$sid".($typ!=''?"&typ=".$typ:''));
- }
+ if($parameter == '') {
+ $parameter = $id;
}
-
-
-
- $titel = $this->app->Secure->GetPOST("titel");
- $beschreibung = $this->app->Secure->GetPOST("beschreibung");
- $stichwort = $this->app->Secure->GetPOST("stichwort");
- $this->app->Tpl->Set('TITLE', $titel);
- $this->app->Tpl->Set('BESCHREIBUNG', $beschreibung);
-
- if ($_FILES['upload']['tmp_name'] == "" && empty($_POST['dateiv'])) {
- $this->app->Tpl->Set('ERROR', "Keine Datei ausgewählt!
");
- $this->app->erp->EnableTab("tabs-2");
- } elseif($_FILES['upload']['tmp_name'] != '') {
- $fileid = $this->app->erp->CreateDatei($_FILES['upload']['name'], $titel, $beschreibung, "", $_FILES['upload']['tmp_name'], $this->app->User->GetName());
-
- // stichwoerter hinzufuegen
- $this->app->erp->AddDateiStichwort($fileid, $stichwort, $objekt, $parameter);
- header("Location: index.php?module=$_module&action=$_action&id=$id&sid=$sid".($typ!=''?"&typ=".$typ:''));
+ $retval = $this->FilesFromUploadtoDMS($objekt, $parameter);
+ if ($retval !== true) {
+ $this->app->Tpl->Set('ERROR', implode(', ',$retval));
+ $this->app->erp->EnableTab("tabs-2");
+ } else {
+ header("Location: index.php?module=$_module&action=$_action&id=$id&sid=$sid".($typ!=''?"&typ=".$typ:''));
}
}
@@ -14551,6 +14502,87 @@ source: "index.php?module=ajax&action=filter&filtername=' . $filter . $extendurl
}
}
+ /*
+ * Retrieve uploaded files and put them into DMS
+ * $datei: given file, just add a new version
+ * Return array of errors or true
+ */
+ function FilesFromUploadtoDMS($objekt, $parameter, $datei = false) {
+
+ $retval = true;
+ // Files come from drag'n'drop
+ if(isset($_POST['dateiv']))
+ {
+ foreach($_POST['dateiv'] as $k => $v)
+ {
+ $name = $this->app->DB->real_escape_string($_POST['dateiname'][$k]);
+ $titel = $this->app->DB->real_escape_string($_POST['dateititel'][$k]);
+ $beschreibung = $this->app->DB->real_escape_string($_POST['dateibeschreibung'][$k]);
+ $stichwort = $this->app->DB->real_escape_string($_POST['dateistichwort'][$k]);
+
+ $data = explode(',', $v);
+
+ $encodedData = str_replace(' ','+',$data[1]);
+ $decodedData = base64_decode($encodedData);
+
+ $this->app->Tpl->Set('TITLE', $titel);
+ $this->app->Tpl->Set('BESCHREIBUNG', $beschreibung);
+
+ if ($v == "" ) {
+ $this->app->Tpl->Set('ERROR', "Keine Datei ausgewählt!
");
+ $this->app->erp->EnableTab("tabs-2");
+ } else {
+ // Save file to disk first
+ $tempfilename = rtrim($this->app->erp->GetTMP(), '/') . "/" . $name;
+ if($handle = fopen($tempfilename, "wb")){
+ fwrite($handle, $decodedData);
+ fclose($handle);
+ // Add file to DMS
+ if ($datei) {
+ $this->app->erp->AddDateiVersion($datei, $this->app->User->GetName(), $name, "Neue Version", $tempfilename);
+ } else {
+ $fileid = $this->app->erp->CreateDatei($name, $titel, $beschreibung, "", $tempfilename, $this->app->User->GetName());
+ // stichwoerter hinzufuegen
+ $this->app->erp->AddDateiStichwort($fileid, $stichwort, $objekt, $parameter);
+ }
+ } else {
+ if ($retval === true) {
+ $retval = array();
+ }
+ $retval[] = "Datei konnte nicht gespeichert werden: ".$name."
";
+ }
+ }
+ }
+ } // drag'n'drop
+ // Single file comes from browse button
+ else {
+ $titel = $this->app->Secure->GetPOST("titel");
+ $beschreibung = $this->app->Secure->GetPOST("beschreibung");
+ $stichwort = $this->app->Secure->GetPOST("stichwort");
+ $this->app->Tpl->Set('TITLE', $titel);
+ $this->app->Tpl->Set('BESCHREIBUNG', $beschreibung);
+
+ if ($_FILES['upload']['tmp_name'] == "" && empty($_POST['dateiv'])) {
+ $this->app->erp->EnableTab("tabs-2");
+ if ($retval === true) {
+ $retval = array();
+ }
+ $retval[] = "Keine Datei ausgewählt!
";
+
+ } elseif ($_FILES['upload']['tmp_name'] != '') {
+ if ($datei) {
+ $this->app->erp->AddDateiVersion($datei, $this->app->User->GetName(), $_FILES['upload']['name'], "Neue Version", $_FILES['upload']['tmp_name']);
+ }
+ else {
+ $fileid = $this->app->erp->CreateDatei($_FILES['upload']['name'], $titel, $beschreibung, "", $_FILES['upload']['tmp_name'], $this->app->User->GetName());
+ // stichwoerter hinzufuegen
+ $this->app->erp->AddDateiStichwort($fileid, $stichwort, $objekt, $parameter);
+ }
+ }
+ }
+ return($retval);
+ }
+
function SortListAdd($parsetarget, &$ref, $menu, $sql, $sort = true) {
$module = $this->app->Secure->GetGET("module");
diff --git a/www/pages/content/datei_neudirekt.tpl b/www/pages/content/datei_neudirekt.tpl
index f7200905..3321a05d 100644
--- a/www/pages/content/datei_neudirekt.tpl
+++ b/www/pages/content/datei_neudirekt.tpl
@@ -11,7 +11,7 @@
[ERROR] |
- |
+ |
{|Dateien hier einfügen|}
@@ -333,8 +333,8 @@ $(document).ready(function() {
}
}
- $('#trdatei').before(' |
| Datei '+vorschau+' | '+filenameEncoded+' | Titel: | |
');
- };
+ $('#trdatei').before(' | Datei '+vorschau+' | '+filenameEncoded+' | Titel: | {|Beschreibung|}: | | |
');
+ };
})(files[index]);
fileReader.readAsDataURL(file);
From 7e44bbeccfc20e98642135a00f3542a6755f6cf2 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Tue, 2 Jul 2024 13:20:21 +0200
Subject: [PATCH 08/11] bugfix artikeltexte
---
www/pages/artikeltexte.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/pages/artikeltexte.php b/www/pages/artikeltexte.php
index dea987a6..ceb89e4a 100644
--- a/www/pages/artikeltexte.php
+++ b/www/pages/artikeltexte.php
@@ -81,7 +81,7 @@ class Artikeltexte {
$where = "1";
if ($artikel) {
- // $where .= " AND a.artikel = '".$artikel."'";
+ $where .= " AND a.artikel = '".$artikel."'";
}
$count = "SELECT count(DISTINCT id) FROM artikel_texte a WHERE $where";
From 71337794ce5fe02aa3181cd402b5fd2c9e919107 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Mon, 8 Jul 2024 20:01:59 +0200
Subject: [PATCH 09/11] Bugfix gruppen kennziffer
---
www/pages/content/gruppen_edit.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/pages/content/gruppen_edit.tpl b/www/pages/content/gruppen_edit.tpl
index 33b41335..f0738929 100644
--- a/www/pages/content/gruppen_edit.tpl
+++ b/www/pages/content/gruppen_edit.tpl
@@ -40,7 +40,7 @@
{|Kennziffer|}:
-
+
|
From 78dff8b5c1a6e13a90f7d8595e3e0d2d2d6c30f5 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Thu, 11 Jul 2024 17:16:22 +0200
Subject: [PATCH 10/11] Buchhaltung export UTF-8, UTF-8-BOM
---
www/pages/content/exportbuchhaltung_export.tpl | 10 ++++++++++
www/pages/exportbuchhaltung.php | 18 +++++++++++++++---
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/www/pages/content/exportbuchhaltung_export.tpl b/www/pages/content/exportbuchhaltung_export.tpl
index 9cf337f7..b73af264 100644
--- a/www/pages/content/exportbuchhaltung_export.tpl
+++ b/www/pages/content/exportbuchhaltung_export.tpl
@@ -51,6 +51,16 @@
| Konto für Differenzen: |
|
+
+ | Format: |
+
+
+ |
+
diff --git a/www/pages/exportbuchhaltung.php b/www/pages/exportbuchhaltung.php
index ec3f2912..b96476e1 100644
--- a/www/pages/exportbuchhaltung.php
+++ b/www/pages/exportbuchhaltung.php
@@ -80,6 +80,7 @@ class Exportbuchhaltung
$lgchecked = $this->app->Secure->GetPOST("lieferantengutschrift");
$diffignore = $this->app->Secure->GetPOST("diffignore");
$sachkonto = $this->app->Secure->GetPOST('sachkonto');
+ $format = $this->app->Secure->GetPOST('format');
$account_id = null;
if (!empty($sachkonto)) {
@@ -162,7 +163,7 @@ class Exportbuchhaltung
if ($dataok) {
$filename = "EXTF_".date('Ymd') . "_Buchungsstapel_DATEV_export.csv";
try {
- $csv = $this->DATEV_Buchuchungsstapel($rgchecked, $gschecked, $vbchecked, $lgchecked, $buchhaltung_berater, $buchhaltung_mandant, $buchhaltung_wj_beginn, $buchhaltung_sachkontenlaenge, $von, $bis, $projekt, $filename, $diffignore, $sachkonto_kennung);
+ $csv = $this->DATEV_Buchuchungsstapel($rgchecked, $gschecked, $vbchecked, $lgchecked, $buchhaltung_berater, $buchhaltung_mandant, $buchhaltung_wj_beginn, $buchhaltung_sachkontenlaenge, $von, $bis, $projekt, $filename, $diffignore, $sachkonto_kennung, $format);
header("Content-Disposition: attachment; filename=" . $filename);
header("Pragma: no-cache");
header("Expires: 0");
@@ -214,9 +215,10 @@ class Exportbuchhaltung
/*
* Create DATEV Buchhungsstapel
+ * format: "ISO-8859-1", "UTF-8", "UTF-8-BOM"
* @throws ConsistencyException with string (list of items) if consistency check fails and no sachkonto for differences is given
*/
- function DATEV_Buchuchungsstapel(bool $rechnung, bool $gutschrift, bool $verbindlichkeit, bool $lieferantengutschrift, string $berater, string $mandant, datetime $wj_beginn, int $sachkontenlaenge, datetime $von, datetime $bis, int $projekt = 0, string $filename = 'EXTF_Buchungsstapel_DATEV_export.csv', $diffignore = false, $sachkonto_differences) : string {
+ function DATEV_Buchuchungsstapel(bool $rechnung, bool $gutschrift, bool $verbindlichkeit, bool $lieferantengutschrift, string $berater, string $mandant, datetime $wj_beginn, int $sachkontenlaenge, datetime $von, datetime $bis, int $projekt = 0, string $filename = 'EXTF_Buchungsstapel_DATEV_export.csv', $diffignore = false, $sachkonto_differences, string $format = "ISO-8859-1") : string {
$datev_header_definition = array (
'1' => 'Kennzeichen',
@@ -671,7 +673,17 @@ class Exportbuchhaltung
$csv .= '"0";"S";"EUR";"0";"";"";"1234";"1370";"";"101";"";"";"";"Testbuchung";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"0";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";"";""'; // Testbuchung
- $csv = mb_convert_encoding($csv, "ISO-8859-1", "UTF-8");
+ switch ($format) {
+ case "UTF-8":
+ break;
+ case "UTF-8-BOM":
+ $csv = "\xef\xbb\xbf".$csv;
+ break;
+ default:
+ $csv = mb_convert_encoding($csv, "ISO-8859-1", "UTF-8");
+ break;
+ }
+
return($csv);
}
From cbd44d167a5a8dd239a9ca056e38e9822ee243be Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Sat, 13 Jul 2024 14:46:58 +0200
Subject: [PATCH 11/11] rework paketmarke contact fields
---
www/lib/class.versanddienstleister.php | 32 ++++++++++++++----
.../versandarten/content/createshipment.tpl | 33 ++++++++++---------
www/lib/versandarten/dhl.php | 28 +++++++++++++++-
www/lib/versandarten/sendcloud.php | 33 +++++++++++++++++--
4 files changed, 99 insertions(+), 27 deletions(-)
diff --git a/www/lib/class.versanddienstleister.php b/www/lib/class.versanddienstleister.php
index c0fc16a6..921eccf6 100644
--- a/www/lib/class.versanddienstleister.php
+++ b/www/lib/class.versanddienstleister.php
@@ -68,6 +68,9 @@ abstract class Versanddienstleister
$auftragId = $this->app->DB->Select("SELECT auftragid FROM rechnung WHERE id=$rechnungId LIMIT 1");
if ($sid === 'rechnung' || $sid === 'lieferschein' || $sid === 'adresse') {
+
+ $ret['addresstype'] = 0; // 0 = firma, 1 = packstation, 2 = postfiliale, 3 = privatadresse
+
$docArr = $this->app->DB->SelectRow("SELECT * FROM `$sid` WHERE id = $id LIMIT 1");
$ret['addressId'] = $docArr['adresse'];
$ret['auftragId'] = $auftragId;
@@ -79,12 +82,28 @@ abstract class Versanddienstleister
$ret['original'] = array_filter($docArr, fn($key) => in_array($key, $addressfields), ARRAY_FILTER_USE_KEY);
- $ret['name'] = empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : trim($docArr['ansprechpartner']);
- $ret['name2'] = !empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : '';
- $ret['name3'] = join(';', array_filter([
- $docArr['abteilung'],
- $docArr['unterabteilung']
- ], fn(string $item) => !empty(trim($item))));
+ if ($docArr['typ'] == "firma") {
+ $ret['company_name'] = $docArr['name'];
+ $ret['addresstype'] = 0;
+ } else {
+ $ret['addresstype'] = 3;
+ }
+
+ $ret['contact_name'] = $docArr['ansprechpartner'];
+
+ $ret['company_division'] = join(
+ ';',
+ array_filter(
+ [
+ $docArr['abteilung'],
+ $docArr['unterabteilung']
+ ],
+ fn(string $item) => !empty(trim($item))
+ )
+ );
+
+ $ret['name'] = $docArr['name'];
+
$ret['address2'] = $docArr['adresszusatz'];
$ret['city'] = $docArr['ort'];
@@ -92,7 +111,6 @@ abstract class Versanddienstleister
$ret['country'] = $docArr['land'];
$ret['phone'] = $docArr['telefon'];
$ret['email'] = $docArr['email'];
- $ret['addresstype'] = 0;
$strasse = trim($docArr['strasse']);
$ret['streetwithnumber'] = $strasse;
diff --git a/www/lib/versandarten/content/createshipment.tpl b/www/lib/versandarten/content/createshipment.tpl
index d524c75f..db8e88da 100644
--- a/www/lib/versandarten/content/createshipment.tpl
+++ b/www/lib/versandarten/content/createshipment.tpl
@@ -18,29 +18,34 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
{|Adresstyp|}: |
|
-
- | {|Name / Zeile 1|}: |
- |
+
+ | {|Firma|}: |
+ |
- | {|Firmenname / Zeile 2|}: |
- |
+ {|Abteilung|}: |
+ |
+
+
+ | {|Name|}: |
+ |
+
+
+ | {|Ansprechpartner|}: |
+ |
| {|Postnummer|}: |
|
-
- | {|Firmenname / Zeile 3|}: |
- |
-
-
+
| {|Strasse/Hausnummer|}: |
@@ -55,7 +60,7 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
| {|Postfilialnummer|}: |
|
-
+
| {|Adresszeile 2|}: |
|
@@ -77,10 +82,6 @@ SPDX-License-Identifier: LicenseRef-EGPL-3.1
-
- | {|Ansprechpartner|}: |
- |
-
| {|E-Mail|}: |
|
diff --git a/www/lib/versandarten/dhl.php b/www/lib/versandarten/dhl.php
index ad065d86..9ed5e7ee 100644
--- a/www/lib/versandarten/dhl.php
+++ b/www/lib/versandarten/dhl.php
@@ -102,7 +102,19 @@ class Versandart_dhl extends Versanddienstleister{
switch ($json->addresstype) {
case 0:
$shipment->Receiver->Address = new ReceiverNativeAddress();
- $shipment->Receiver->Address->name2 = $json->name2;
+
+ $shipment->Receiver->name1 = $json->company_name;
+ $shipment->Receiver->Address->name2 = join(
+ ';',
+ array_filter(
+ [
+ $json->contact_name,
+ $json->company_division
+ ],
+ fn(string $item) => !empty(trim($item))
+ )
+ );
+
$shipment->Receiver->Address->streetName = $json->street ?? '';
$shipment->Receiver->Address->streetNumber = $json->streetnumber;
$shipment->Receiver->Address->city = $json->city ?? '';
@@ -127,6 +139,20 @@ class Versandart_dhl extends Versanddienstleister{
$shipment->Receiver->Postfiliale->zip = $json->zip ?? '';
$shipment->Receiver->Postfiliale->Origin = Country::Create($json->country ?? 'DE', $json->state);
break;
+ case 3:
+ $shipment->Receiver->Address = new ReceiverNativeAddress();
+
+ $shipment->Receiver->name1 = $json->name;
+ $shipment->Receiver->Address->name2 = $json->contact_name;
+
+ $shipment->Receiver->Address->streetName = $json->street ?? '';
+ $shipment->Receiver->Address->streetNumber = $json->streetnumber;
+ $shipment->Receiver->Address->city = $json->city ?? '';
+ $shipment->Receiver->Address->zip = $json->zip ?? '';
+ $shipment->Receiver->Address->Origin = Country::Create($json->country ?? 'DE', $json->state);
+ if (isset($json->address2) && !empty($json->address2))
+ $shipment->Receiver->Address->addressAddition[] = $json->address2;
+ break;
}
$shipment->Receiver->Communication = new Communication();
$shipment->Receiver->Communication->email = $json->email;
diff --git a/www/lib/versandarten/sendcloud.php b/www/lib/versandarten/sendcloud.php
index cdda1cce..172a3116 100644
--- a/www/lib/versandarten/sendcloud.php
+++ b/www/lib/versandarten/sendcloud.php
@@ -82,8 +82,18 @@ class Versandart_sendcloud extends Versanddienstleister
$parcel->ShippingMethodId = $json->product;
$parcel->Name = $json->name;
switch ($json->addresstype) {
- case 0:
- $parcel->CompanyName = trim("$json->name2 $json->name3");
+ case 0:
+ $parcel->CompanyName = $json->company_name;
+ $parcel->Name = join(
+ ';',
+ array_filter(
+ [
+ $json->contact_name,
+ $json->company_division
+ ],
+ fn(string $item) => !empty(trim($item))
+ )
+ );
$parcel->Address = $json->street;
$parcel->Address2 = $json->address2;
$parcel->HouseNumber = $json->streetnumber;
@@ -98,6 +108,23 @@ class Versandart_sendcloud extends Versanddienstleister
$parcel->Address = "Postfiliale";
$parcel->HouseNumber = $json->postofficeNumber;
break;
+ case 3:
+ $parcel->Name = join(
+ ';',
+ array_filter(
+ [
+ $json->name,
+ $json->contact_name
+ ],
+ fn(string $item) => !empty(trim($item))
+ )
+ );
+
+ $parcel->Address = $json->street;
+ $parcel->Address2 = $json->address2;
+ $parcel->HouseNumber = $json->streetnumber;
+ break;
+
}
$parcel->Country = $json->country;
$parcel->PostalCode = $json->zip;
@@ -164,4 +191,4 @@ class Versandart_sendcloud extends Versanddienstleister
}
-}
\ No newline at end of file
+}
' AS `open`, CONCAT('') AS `auswahl`";
+
+// $moreinfo = true; // Allow drop down details
+// $moreinfoaction = "lieferschein"; // specify suffix for minidetail-URL to allow different minidetails
+// $mencol = 11; // Set id col for moredata/menu
+
+ $menu = "