From b7ade7b4b27d07cd95ef6d153cb2745f2955c122 Mon Sep 17 00:00:00 2001
From: Andreas Palm <ap@ewsp.de>
Date: Mon, 26 Aug 2024 21:58:28 +0200
Subject: [PATCH 1/3] FIX Article: Filter deleted files from thumbnail
 selection

---
 www/pages/artikel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pages/artikel.php b/www/pages/artikel.php
index 62986378..3a6f9689 100644
--- a/www/pages/artikel.php
+++ b/www/pages/artikel.php
@@ -8432,7 +8432,7 @@ padding: 10px;\">
         FROM `datei_stichwoerter` AS `ds`
         INNER JOIN `datei_version` AS `dv` ON dv.datei = ds.datei
         INNER JOIN `datei` AS `d` ON dv.datei = d.id AND IFNULL(d.geloescht, 0) = 0
-        WHERE ds.objekt LIKE 'artikel' AND ds.parameter = '%d'
+        WHERE ds.objekt LIKE 'artikel' AND ds.parameter = '%d' AND d.geloescht = 0
               AND
               (
                   ds.subjekt like 'Shopbild' 

From 1775d0b47f95f92c093d9b80bdd1a9934de80624 Mon Sep 17 00:00:00 2001
From: Andreas Palm <ap@ewsp.de>
Date: Mon, 26 Aug 2024 22:10:47 +0200
Subject: [PATCH 2/3] FIX Article: Filter deleted files from default picture
 selection

---
 www/lib/class.erpapi.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php
index 381e6114..24486c09 100644
--- a/www/lib/class.erpapi.php
+++ b/www/lib/class.erpapi.php
@@ -37436,7 +37436,8 @@ function Firmendaten($field,$projekt="")
            SELECT dv.datei AS datei 
            FROM datei_stichwoerter AS ds 
            JOIN (SELECT datei, MAX(id) AS id FROM datei_version GROUP BY datei) AS dv ON dv.datei = ds.datei
-           WHERE ds.objekt LIKE 'Artikel' AND 
+           JOIN datei AS d on ds.datei = d.id
+           WHERE ds.objekt LIKE 'Artikel' AND d.geloescht = 0
             ds.parameter = '%d' AND 
              (ds.subjekt LIKE 'Shopbild' OR ds.subjekt LIKE 'Druckbild' OR ds.subjekt LIKE 'Bild') 
            ORDER BY ds.subjekt LIKE 'Shopbild' DESC, ds.subjekt LIKE 'Druckbild' DESC, ds.sort

From 543c52f2f1765b2d1ad11c1d0eccf51fa00e3bc3 Mon Sep 17 00:00:00 2001
From: Andreas Palm <ap@ewsp.de>
Date: Tue, 27 Aug 2024 14:04:07 +0200
Subject: [PATCH 3/3] FIX Article: Use default picture selection in briefpapier

---
 www/lib/dokumente/class.briefpapier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/lib/dokumente/class.briefpapier.php b/www/lib/dokumente/class.briefpapier.php
index 46d1811d..f8a42cde 100644
--- a/www/lib/dokumente/class.briefpapier.php
+++ b/www/lib/dokumente/class.briefpapier.php
@@ -3525,7 +3525,7 @@ class Briefpapier extends SuperFPDF {
         ($this->doctype == "gutschrift" && $this->getStyleElement("gutschrift_artikelbild")) ||
         ($this->doctype == "angebot" && $this->getStyleElement("angebot_artikelbild"))
       ){
-        $datei = $this->app->DB->Select("SELECT datei FROM `datei_stichwoerter` WHERE subjekt='Shopbild' AND objekt='Artikel' AND parameter='" . $item['artikel'] . "' ORDER by sort ASC LIMIT 1");
+        $datei = $this->app->erp->GetArtikelStandardbild($item['artikel'],true);
         if(!empty($datei)){
           $datei = $this->app->DB->Select("SELECT id FROM datei_version WHERE datei = '$datei' ORDER BY id DESC LIMIT 1");
         }