From 5638f18770d863076f186ac2c024f62387df06da Mon Sep 17 00:00:00 2001 From: OpenXE-ERP <83282423+OpenXE-ERP@users.noreply.github.com> Date: Mon, 13 Mar 2023 13:00:35 +0100 Subject: [PATCH 1/8] Merge pull request #67 from exciler/bugfix_gutschrift_php8 fix index accessor for new PHP Versions (implicit const string) --- www/pages/gutschrift.php | 2 +- www/pages/rechnung.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/pages/gutschrift.php b/www/pages/gutschrift.php index 0fc85785..3182cac8 100644 --- a/www/pages/gutschrift.php +++ b/www/pages/gutschrift.php @@ -1260,7 +1260,7 @@ class Gutschrift extends GenGutschrift if((!empty($alle_gutschriften)?count($alle_gutschriften):0) > 1) { for($agi=0;$agi<(!empty($alle_gutschriften)?count($alle_gutschriften):0);$agi++) - $gutschriften .= "".$alle_gutschriften[$agi][belegnr]." "; + $gutschriften .= "".$alle_gutschriften[$agi]['belegnr']." "; $this->app->Tpl->Add('MESSAGE',"
Für die angebene Rechnung gibt es schon folgende Gutschriften: $gutschriften
"); } } diff --git a/www/pages/rechnung.php b/www/pages/rechnung.php index 56a59deb..202b9a81 100644 --- a/www/pages/rechnung.php +++ b/www/pages/rechnung.php @@ -1804,7 +1804,7 @@ class Rechnung extends GenRechnung { $gutschriften = ''; for($agi=0;$agi<$cgutschriften;$agi++) - $gutschriften .= "".$alle_gutschriften[$agi][belegnr]." "; + $gutschriften .= "".$alle_gutschriften[$agi]['belegnr']." "; $this->app->Tpl->Add('MESSAGE',"
Für die angebene Rechnung gibt es schon folgende Gutschriften: $gutschriften
"); } From ecd86d120ad2ecf8587afb0fa3e2f40b6e7db117 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Tue, 14 Mar 2023 12:10:54 +0100 Subject: [PATCH 2/8] Bugfix lager wert calculation of prices added geloescht != 1 and date range --- www/pages/lager.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/www/pages/lager.php b/www/pages/lager.php index d6c1635d..9a2273f8 100644 --- a/www/pages/lager.php +++ b/www/pages/lager.php @@ -451,7 +451,7 @@ class Lager extends GenLager { FROM einkaufspreise minek WHERE - einkaufspreise.artikel = minek.artikel AND DATE( + einkaufspreise.geloescht != 1 AND einkaufspreise.artikel = minek.artikel AND DATE( REPLACE ( COALESCE(gueltig_bis, '9999-12-31'), @@ -482,7 +482,17 @@ class Lager extends GenLager { ) ) >= DATE('".$datum."') ) - ) + ) AND DATE( + REPLACE + ( + COALESCE( + einkaufspreise.gueltig_bis, + '9999-12-31' + ), + '0000-00-00', + '9999-12-31' + ) + ) >= DATE('".$datum."') GROUP BY artikel, waehrung From 34def013f70d016288c656c3a6063f9006c1a4b8 Mon Sep 17 00:00:00 2001 From: Andreas Palm Date: Thu, 23 Mar 2023 22:28:48 +0100 Subject: [PATCH 3/8] change default handler to "list", fix TableSearch findcols --- www/pages/rechnungslauf.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/pages/rechnungslauf.php b/www/pages/rechnungslauf.php index fa050d00..dcb0313a 100644 --- a/www/pages/rechnungslauf.php +++ b/www/pages/rechnungslauf.php @@ -35,8 +35,8 @@ class Rechnungslauf { $width = ['1%', '1%', '10%', '20%', '10%', '10%', '10%', '10%', '10%', '10%', '1%']; $findcols = [ - '', - '', + 'adr.kundennummer', + 'adr.kundennummer', 'adr.kundennummer', 'adr.name', 'adr.anschreiben', @@ -209,7 +209,7 @@ class Rechnungslauf { $this->app->ActionHandlerInit($this); // ab hier alle Action Handler definieren die das Modul hat - $this->app->ActionHandler('rechnungslauf', 'ActionList'); + $this->app->ActionHandler('list', 'ActionList'); $this->app->ActionHandler('abos', 'ActionAbos'); $this->app->ActionHandler('minidetail', 'ActionMinidetail'); @@ -218,7 +218,7 @@ class Rechnungslauf { public function MenuList() { $this->app->erp->Headlines("Abolauf"); - $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=rechnungslauf", "Übersicht"); + $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=list", "Übersicht"); $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=abos", "gebuchte Abos"); $this->app->erp->MenuEintrag("index.php?module=rechnungslauf&action=einstellungen", "Einstellungen"); } From 98bbdec8d355d375e1869926138237fc1a34f030 Mon Sep 17 00:00:00 2001 From: Andreas Palm Date: Fri, 24 Mar 2023 00:28:39 +0100 Subject: [PATCH 4/8] fix link in menu --- 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 c5280d4f..d508258c 100644 --- a/www/lib/class.erpapi.php +++ b/www/lib/class.erpapi.php @@ -7095,7 +7095,7 @@ title: 'Abschicken', $navarray['menu']['admin'][$menu]['sec'][] = array('Arbeitsnachweis','arbeitsnachweis','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Gutschrift / '.$this->Firmendaten("bezeichnungstornorechnung"),'gutschrift','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Proformarechnung','proformarechnung','list'); - $navarray['menu']['admin'][$menu]['sec'][] = array('Abolauf','rechnungslauf','rechnungslauf'); + $navarray['menu']['admin'][$menu]['sec'][] = array('Abolauf','rechnungslauf','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Mahnwesen','mahnwesen','list'); $navarray['menu']['admin'][$menu]['sec'][] = array('Dokumenten Scanner','docscan','list'); From 18f2785abd4f82b1db34cd4012cda24786a60388 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Sat, 25 Mar 2023 20:47:08 +0100 Subject: [PATCH 5/8] Bugfix typ db_schema --- upgrade/data/db_schema.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/upgrade/data/db_schema.json b/upgrade/data/db_schema.json index f241296a..7ab66584 100644 --- a/upgrade/data/db_schema.json +++ b/upgrade/data/db_schema.json @@ -98705,7 +98705,7 @@ "Default": "", "Extra": "auto_increment", "Privileges": "select,insert,update,references", - "Commant": "" + "Comment": "" }, { "Field": "address_id", @@ -98716,7 +98716,7 @@ "Default": "", "Extra": "", "Privileges": "select,insert,update,references", - "Commant": "" + "Comment": "" }, { "Field": "document_type", @@ -98727,7 +98727,7 @@ "Default": "", "Extra": "", "Privileges": "select,insert,update,references", - "Commant": "" + "Comment": "" }, { "Field": "job_type", @@ -98738,7 +98738,7 @@ "Default": "", "Extra": "", "Privileges": "select,insert,update,references", - "Commant": "" + "Comment": "" }, { "Field": "printer_id", @@ -98749,7 +98749,7 @@ "Default": "", "Extra": "", "Privileges": "select,insert,update,references", - "Commant": "" + "Comment": "" }, { "Field": "created_at", @@ -98760,7 +98760,7 @@ "Default": "current_timestamp()", "Extra": "", "Privileges": "select,insert,update,references", - "Commant": "" + "Comment": "" } ], "keys": [ From 23dc74cd0898940d20af3b7595ea3ef751249e55 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Sat, 25 Mar 2023 20:51:16 +0100 Subject: [PATCH 6/8] Bugfix versandart no module (dummy) --- www/pages/versandarten.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/www/pages/versandarten.php b/www/pages/versandarten.php index 6ab5cad0..227e0c5e 100644 --- a/www/pages/versandarten.php +++ b/www/pages/versandarten.php @@ -241,13 +241,14 @@ class Versandarten { $form['paketmarke_drucker'] = $daten['paketmarke_drucker']; } - $obj->RenderAdditionalSettings('MODULESETTINGS', $form); + if (!empty($obj)) { + $obj->RenderAdditionalSettings('MODULESETTINGS', $form); + $this->app->Tpl->addSelect('EXPORT_DRUCKER', 'export_drucker', 'export_drucker', + $this->getPrinterByModule($obj, false), $form['export_drucker']); - $this->app->Tpl->addSelect('EXPORT_DRUCKER', 'export_drucker', 'export_drucker', - $this->getPrinterByModule($obj, false), $form['export_drucker']); - - $this->app->Tpl->addSelect('PAKETMARKE_DRUCKER', 'paketmarke_drucker', 'paketmarke_drucker', - $this->getPrinterByModule($obj), $form['paketmarke_drucker']); + $this->app->Tpl->addSelect('PAKETMARKE_DRUCKER', 'paketmarke_drucker', 'paketmarke_drucker', + $this->getPrinterByModule($obj), $form['paketmarke_drucker']); + } $this->app->YUI->HideFormular('versandmail', array('0'=>'versandbetreff','1'=>'dummy')); $this->app->Tpl->addSelect('SELVERSANDMAIL', 'versandmail', 'versandmail', [ @@ -827,4 +828,4 @@ class Versandarten { return $result; } -} \ No newline at end of file +} From 09039f9d2abd7ca97bcd96dd990d7f615b3e68a2 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Sun, 26 Mar 2023 13:23:15 +0200 Subject: [PATCH 7/8] Bugfix user avatar --- www/lib/class.image.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/lib/class.image.php b/www/lib/class.image.php index 71598c45..7d72e7ba 100644 --- a/www/lib/class.image.php +++ b/www/lib/class.image.php @@ -49,6 +49,7 @@ class image { $manipulator = new ImageManipulator($str); $type = mime_content_type($path); + $manipulator->resample($newwidth, $newheight, true, $upscale); /* @@ -200,7 +201,7 @@ class ImageManipulator public function resample($width, $height, $constrainProportions = true, $upscale = false, $keepformat = false) { if (!is_resource($this->image)) { - throw new RuntimeException('No image set'); +// throw new RuntimeException('No image set'); } if($keepformat) { @@ -340,9 +341,9 @@ class ImageManipulator */ protected function _replace($res) { - if (!is_resource($res)) { + /* if (!is_resource($res)) { throw new UnexpectedValueException('Invalid resource'); - } + }*/ if (is_resource($this->image)) { imagedestroy($this->image); } From 7a83c9fd29e1b65f01e3843845049c40db9b25d8 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Sun, 26 Mar 2023 13:26:49 +0200 Subject: [PATCH 8/8] Bugfix briefpapier freitexte width --- www/lib/dokumente/class.briefpapier.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/www/lib/dokumente/class.briefpapier.php b/www/lib/dokumente/class.briefpapier.php index 464fe186..3b10cc26 100644 --- a/www/lib/dokumente/class.briefpapier.php +++ b/www/lib/dokumente/class.briefpapier.php @@ -1797,12 +1797,19 @@ class Briefpapier extends SuperFPDF { public function setStyleData($styleData){ $this->styleData = $styleData; - } + } private function getStyleElement($key){ - if(isset($this->styleData[$key]) && !empty($this->styleData[$key])) return $this->styleData[$key]; - - return $this->app->erp->Firmendaten($key); + $result = null; + if(isset($this->styleData[$key]) && !empty($this->styleData[$key])) { + $result = $this->styleData[$key]; + } else { + $result = $this->app->erp->Firmendaten($key); + } + if (empty($result)) { + $result = 0; + } + return($result); } public function renderDocument() {