From 290ef797664e73429e1ad049509255e62ee8425b Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Fri, 7 Feb 2025 13:06:37 +0100
Subject: [PATCH 01/10] fix sorting/search for buchungen and kontoauszuege

---
 www/pages/fibu_buchungen.php | 4 ++--
 www/pages/kontoauszuege.php  | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/pages/fibu_buchungen.php b/www/pages/fibu_buchungen.php
index ac751a99..95ce86f0 100644
--- a/www/pages/fibu_buchungen.php
+++ b/www/pages/fibu_buchungen.php
@@ -273,7 +273,7 @@ class Fibu_buchungen {
                             '' AS dummy,
                             '' AS dummy2,
                             auswahl,
-                            datum,
+                            ".$this->app->erp->FormatDate(" datum ").",
                             ".$this->app->erp->FormatUCfirst("typ").",
                             objektlink,
                             saldo,
@@ -308,7 +308,7 @@ class Fibu_buchungen {
                             FROM
                                 (
                                 SELECT
-                                    ".$this->app->erp->FormatDate(" fb.datum ")." AS datum,
+                                    fb.datum,
                                     fb.typ,
                                     fb.id,
                                     fo.info,
diff --git a/www/pages/kontoauszuege.php b/www/pages/kontoauszuege.php
index e60dd42d..3706b9e7 100644
--- a/www/pages/kontoauszuege.php
+++ b/www/pages/kontoauszuege.php
@@ -120,8 +120,8 @@ class Kontoauszuege {
 
                 $sumcol = array(10);
 
-                $findcols = array('q.id','q.id','q.kurzbezeichnung', 'q.importdatum', 'q.buchung', 'q.soll', 'q.waehrung', 'q.buchungstext','q.internebemerkung','q.saldo');
-                $searchsql = array('q.kurzbezeichnung', 'q.buchung', 'q.soll', 'q.buchungstext','q.internebemerkung');
+                $findcols = array('q.id','q.id', 'q.importdatum', 'q.kurzbezeichnung', 'q.buchungdatum', 'q.soll', 'q.waehrung', 'q.buchungstext','q.internebemerkung','q.saldo');
+                $searchsql = array('q.kurzbezeichnung', 'q.buchungdatum', 'q.soll', 'q.buchungstext','q.internebemerkung');
 
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
@@ -173,13 +173,14 @@ class Kontoauszuege {
                                     ".$app->erp->FormatMenge('(k.soll)',2).",
                                     '</del>'
                                 ),
-                                ".$app->erp->FormatMenge('(k.soll)',2)."),
+                                ".$app->erp->FormatMenge('(k.soll)',2).") AS soll,
                             k.waehrung,
                             k.buchungstext,
                             k.internebemerkung,
                             ".$app->erp->FormatMenge('SUM(fb.betrag)',2)." AS saldo,
                             k.id as menuid,
-                            SUM(fb.betrag) AS saldonum
+                            SUM(fb.betrag) AS saldonum,
+                            k.buchung AS buchungdatum
                         FROM kontoauszuege k
                         LEFT JOIN fibu_buchungen_alle fb ON
                             fb.id = k.id AND fb.typ = 'kontoauszuege'

From 744a3b056608eebd663a9f91af5374ffa3a93c0a Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Fri, 7 Feb 2025 14:56:48 +0100
Subject: [PATCH 02/10] hide created but not yet released auftraege

---
 www/pages/auftrag.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/pages/auftrag.php b/www/pages/auftrag.php
index 24758817..6eb574ef 100644
--- a/www/pages/auftrag.php
+++ b/www/pages/auftrag.php
@@ -449,6 +449,10 @@ class Auftrag extends GenAuftrag
         }
 
         if ($tmp != "" && !$ignore) $tmp.= " AND a.status='freigegeben' ";
+        
+        if ($tmp == "") {
+          $tmp = " AND a.status != 'angelegt' ";
+        }
 
         // ENDE EXTRA more
         $where = " a.id!='' $tmp " . $this->app->erp->ProjektRechte('a.projekt', true, 'a.vertriebid');

From 95f21289a1ad0b9ceb660bf5ac978a19c1f10ec1 Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Fri, 7 Feb 2025 16:29:14 +0100
Subject: [PATCH 03/10] add entwurf tab to verbindlichkeiten

---
 www/pages/content/verbindlichkeit_list.tpl |  4 ++
 www/pages/verbindlichkeit.php              | 75 +++++++++++++++++++++-
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/www/pages/content/verbindlichkeit_list.tpl b/www/pages/content/verbindlichkeit_list.tpl
index 066b0350..5cb52819 100644
--- a/www/pages/content/verbindlichkeit_list.tpl
+++ b/www/pages/content/verbindlichkeit_list.tpl
@@ -1,6 +1,7 @@
 <div id="tabs">
     <ul>
             <li><a href="#tabs-1">[TABTEXT1]</a></li>
+            <li><a href="#tabs-2">[TABTEXT2]</a></li>
     </ul>
     <div id="tabs-1">
         [MESSAGE]
@@ -83,6 +84,9 @@
         </form>
         [TAB1NEXT]
     </div>
+    <div id="tabs-2">
+      [TAB2]
+    </div>
 </div>
 
 <script>
diff --git a/www/pages/verbindlichkeit.php b/www/pages/verbindlichkeit.php
index 0ad4f3b0..442420d3 100644
--- a/www/pages/verbindlichkeit.php
+++ b/www/pages/verbindlichkeit.php
@@ -197,11 +197,79 @@ class Verbindlichkeit {
                     $filterskontobis = $this->app->String->Convert($filterskontobis,'%1.%2.%3','%3-%2-%1');
                     $where .= " AND v.skontobis <= '".$filterskontobis."'";
                 }
+                
+                $where .= " AND v.status <> 'angelegt'";
+                
                 // END Toggle filters
 
                 $moreinfo = true; // Allow drop down details
                 $menucol = 1; // For moredata
 
+                break;
+            case 'verbindlichkeit_inbearbeitung':
+                $allowed['verbindlichkeit_inbearbeitung'] = array('list');
+                $heading = array('','','Belegnr','Adresse', 'Lieferant', 'RE-Nr', 'RE-Datum', 'Betrag (brutto)', 'W&auml;hrung','Zahlstatus', 'Ziel','Skontoziel','Skonto','Status','Monitor', 'Men&uuml;');
+                $width = array('1%','1%','10%'); // Fill out manually later
+
+                // columns that are aligned right (numbers etc)
+                // $alignright = array(4,5,6,7,8);
+
+                $findcols = array(
+                    'v.id',
+                    'v.id',
+                    'v.belegnr',
+                    'a.name',
+                    'a.lieferantennummer',
+                    'v.rechnung',
+                    'v.rechnungsdatum',
+                    'v.betrag',
+                    'v.waehrung',
+                    'v.bezahlt',
+                    'v.zahlbarbis',
+                    'v.skontobis',
+                    'v.skonto',
+                    'v.status',
+                    'v.status_beleg',
+                    'v.id'
+                );
+
+                $searchsql = array(
+                    'a.name',
+                    'a.lieferantennummer',
+                    'v.rechnung',
+                    'v.internebemerkung'
+                );
+
+                $defaultorder = 1;
+                $defaultorderdesc = 0;
+                $alignright = array(8);
+                $sumcol = array(8);
+
+        		$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',v.id,'\" />') AS `auswahl`";
+
+                $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=verbindlichkeit&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=verbindlichkeit&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
+
+                $sql = "SELECT SQL_CALC_FOUND_ROWS
+                            v.id,
+                            $dropnbox,
+                            'ENTWURF' as belegnr,
+                            a.name,
+                            a.lieferantennummer,
+                            v.rechnung,
+                            ".$app->erp->FormatDate("v.rechnungsdatum").",
+                            ".$app->erp->FormatMenge('v.betrag',2).",
+                            v.waehrung,
+                            if(v.bezahlt,'bezahlt','offen'),
+                            ".$app->erp->FormatDate("v.zahlbarbis").",
+                            IF(v.skonto <> 0,".$app->erp->FormatDate("v.skontobis").",''),
+                            IF(v.skonto <> 0,CONCAT(".$app->erp->FormatMenge('v.skonto',0).",'%'),''),
+                            v.status,
+                            ".$app->YUI->IconsSQLVerbindlichkeit().",
+                            v.id FROM verbindlichkeit v
+                        LEFT JOIN adresse a ON v.adresse = a.id";
+                $where = "v.status = 'angelegt'";
+                $count = "SELECT count(DISTINCT id) FROM verbindlichkeit v WHERE $where";
+
                 break;
             case 'verbindlichkeit_paketdistribution_list':
                 $allowed['verbindlichkeit_paketdistribution_list'] = array('list');
@@ -539,9 +607,12 @@ class Verbindlichkeit {
         $this->app->erp->MenuEintrag("index.php?module=verbindlichkeit&action=create", "Neu anlegen");
 
         $this->app->erp->MenuEintrag("index.php", "Zur&uuml;ck");
-
+        
+        $this->app->Tpl->Set('TABTEXT1','Verbindlichkeiten');
+        $this->app->Tpl->Set('TABTEXT2','In Bearbeitung');
+        
         $this->app->YUI->TableSearch('TAB1', 'verbindlichkeit_list', "show", "", "", basename(__FILE__), __CLASS__);
-
+        $this->app->YUI->TableSearch('TAB2', 'verbindlichkeit_inbearbeitung', "show", "", "", basename(__FILE__), __CLASS__);
 
         if($this->app->erp->RechteVorhanden('verbindlichkeit', 'freigabeeinkauf')){
             $this->app->Tpl->Set('MANUELLFREIGABEEINKAUF', '<option value="freigabeeinkauf">{|freigeben (Einkauf)|}</option>');

From 51c47d00010953c25c7da24254d670cd6415b140 Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Mon, 10 Feb 2025 13:36:20 +0100
Subject: [PATCH 04/10] use preisgruppen discount

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

diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php
index 25968da1..67caecd8 100644
--- a/www/lib/class.erpapi.php
+++ b/www/lib/class.erpapi.php
@@ -34214,7 +34214,7 @@ function Firmendaten($field,$projekt="")
           $rabatt5 = 0;
           if($art==='angebot' || $art==='auftrag' || $art==='rechnung' || $art==='gutschrift' || $art==='proformarechnung')
           {
-            $rabattarr = $this->app->DB->SelectRow("SELECT * FROM $art WHERE id='$id' LIMIT 1");
+            $rabattarr = $this->app->DB->SelectRow("SELECT rabatt, rabatt1, rabatt2, rabatt3, rabatt4, rabatt5, realrabatt FROM $art WHERE id='$id' LIMIT 1");
             if(!empty($rabattarr)){
               $grundrabatt = $rabattarr['rabatt'];
               $rabatt1 = $rabattarr['rabatt1'];
@@ -34224,6 +34224,17 @@ function Firmendaten($field,$projekt="")
               $rabatt5 = $rabattarr['rabatt5'];
             }
 
+            $gruppe = $belegarr['gruppe'];
+            $preisgruppen = $this->app->DB->SelectRow("SELECT * FROM gruppen WHERE id = '$gruppe' AND art = 'preisgruppe' LIMIT 1");
+            if(!empty($preisgruppen)){
+              $grundrabatt = $preisgruppen['grundrabatt'];
+              $rabatt1 = $preisgruppen['rabatt1'];
+              $rabatt2 = $preisgruppen['rabatt2'];
+              $rabatt3 = $preisgruppen['rabatt3'];
+              $rabatt4 = $preisgruppen['rabatt4'];
+              $rabatt5 = $preisgruppen['rabatt5'];
+            }
+
             if($grundrabatt>0) $rabattarr[] =  ((100-$grundrabatt)/100.0);
             if($rabatt1>0) $rabattarr[] = ((100-$rabatt1)/100.0);
             if($rabatt2>0) $rabattarr[] = ((100-$rabatt2)/100.0);

From 811bab4386d1cb5d33a1c36f59341f2b5c3b4f2e Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Wed, 12 Feb 2025 15:52:36 +0100
Subject: [PATCH 05/10] adds a second tab to seriennummern with all
 lieferschein position

This allows for assigning per position either an existing serial number or adhoc creation of a new one if it isn't existing. This was also the old Xentral behaviour.
---
 www/pages/content/seriennummern_enter.tpl |  14 ++-
 www/pages/seriennummern.php               | 127 ++++++++++++++++++++++
 2 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/www/pages/content/seriennummern_enter.tpl b/www/pages/content/seriennummern_enter.tpl
index a5ab8ceb..16500164 100644
--- a/www/pages/content/seriennummern_enter.tpl
+++ b/www/pages/content/seriennummern_enter.tpl
@@ -1,6 +1,7 @@
 <div id="tabs">
     <ul>
-        <li><a href="#tabs-1"></a></li>
+        <li><a href="#tabs-1">Beleg</a></li>
+        <li [LIEFERSCHEIN_HIDDEN] ><a href="#tabs-2">Seriennummern</a></li>
     </ul>
     <!-- Example for multiple tabs
     <ul hidden">
@@ -212,5 +213,16 @@
             </div>
         </form>
     </div>
+    <div [LIEFERSCHEIN_HIDDEN] id="tabs-2">
+        <legend >{|[LEGEND]|}</legend>
+        <form action="" method="post">
+            <fieldset>
+                [SERIENNUMMERNLISTE]
+                <div style="text-align: center;">
+                    <button name="submit" value="lieferscheinzuordnen_seriennummernliste" class="ui-button-icon" style="padding-left: 30px; padding-right: 30px;">Speichern</button>
+                </div>
+            </fieldset>
+        </form>
+    </div>
 </div>
 
diff --git a/www/pages/seriennummern.php b/www/pages/seriennummern.php
index 5d065933..49c02f35 100644
--- a/www/pages/seriennummern.php
+++ b/www/pages/seriennummern.php
@@ -24,6 +24,7 @@ class Seriennummern {
         $this->app->ActionHandler("wareneingaenge_list", "seriennummern_wareneingaenge_list");                                                                
         $this->app->ActionHandler("enter", "seriennummern_enter"); 
         $this->app->ActionHandler("delete", "seriennummern_delete");
+        $this->app->ActionHandler("remove_serial", "seriennummern_remove_serial");
         $this->app->ActionHandler("remove", "seriennummern_remove");
         $this->app->ActionHandler("minidetail_lieferscheinposition", "seriennummern_lieferscheinpos_minidetail");
         $this->app->ActionHandler("minidetail_wareneingangposition", "seriennummern_wareneingang_minidetail");        
@@ -738,6 +739,26 @@ class Seriennummern {
         
     } 
 
+    public function seriennummern_remove_serial() {
+        $id = $this->app->Secure->GetGET('serial');
+        $beleg_pos = (int) $this->app->Secure->GetGET('beleg_pos');
+        
+        $from = $this->app->Secure->GetGET('from');
+        $beleg = $this->app->Secure->GetGET('beleg');
+
+        if ($id) {
+            $serial = $this->app->DB->SelectRow("SELECT slp.id as slp_id, s.id as s_id FROM seriennummern_beleg_position slp
+                                                INNER JOIN seriennummern s on s.id = slp.seriennummer
+                                                WHERE s.seriennummer = '{$id}' AND slp.beleg_position = {$beleg_pos} AND slp.beleg_typ = {$from}
+                                                LIMIT 1");
+            if (!empty($serial)) {
+                $this->app->DB->Delete("DELETE FROM seriennummern_beleg_position WHERE id = {$serial['slp_id']}");
+                $this->app->DB->Update("UPDATE seriennummern SET eingelagert = 1 WHERE id = {$serial['s_id']}");
+            }
+            $this->app->Location->execute("index.php?module=seriennummern&action=enter&{$from}={$beleg}&from={$from}");
+        }
+    }
+    
     public function seriennummern_remove() {
         $id = (int) $this->app->Secure->GetGET('id');
         $from = $this->app->Secure->GetGET('from');
@@ -902,6 +923,37 @@ class Seriennummern {
                 }
                 $seriennummern = array_merge($seriennummern_not_written, $seriennummern_already_exist, $seriennummern_old_not_allowed);
             break;
+            case 'lieferscheinzuordnen_seriennummernliste':
+                $artikel_lieferschein = $this->app->DB->SelectArr("
+                    SELECT lp.id, lp.artikel
+                    FROM lieferschein_position lp
+                    WHERE lp.lieferschein = '".$lieferschein_id."'
+                    ORDER BY lp.id");
+            
+                foreach($artikel_lieferschein as $k => $v) {
+                    $lieferschein_pos_serial = $this->app->Secure->GetPOST('lieferschein_pos_'.$v['id']);
+                    if (empty($lieferschein_pos_serial)) {
+                        continue;
+                    }
+                    foreach($lieferschein_pos_serial as $serial) {
+                        if (empty($serial)) {
+                            continue;
+                        }
+                        $serial_id = $this->app->DB->Select("SELECT id FROM seriennummern WHERE seriennummer = '".$serial."' and artikel = ".$v['artikel']." LIMIT 1");
+                        if (empty($serial_id)) {
+                            $this->app->DB->Insert("INSERT INTO seriennummern (seriennummer, artikel, eingelagert) VALUES ('".$serial."',".$v['artikel'].", 1)");
+                            $serial_id = $this->app->DB->GetInsertID();
+                        }
+                        $sql = "INSERT INTO seriennummern_beleg_position (beleg_typ, beleg_position, seriennummer) VALUES ('lieferschein','".$v['id']."','".$serial_id."') ";
+                        $this->app->DB->Insert($sql);
+                        
+                        $sql = "UPDATE seriennummern SET eingelagert = 0, logdatei = CURRENT_TIMESTAMP WHERE id = '".$serial_id."'";
+                        $this->app->DB->Update($sql);
+                    }
+                }
+                
+                $this->app->Location->execute("index.php?module=seriennummern&action=enter&lieferschein=".$lieferschein_id."&from=".$from."#tabs-2");
+            break;
             case 'lieferscheinzuordnen':
                 if (empty($lieferschein_id)) {
                     break;
@@ -1151,6 +1203,81 @@ class Seriennummern {
 
                 $this->app->Tpl->Set('SERIENNUMMERN', implode("\n",$seriennummern));                              
 
+                //quick serial list on tab 2
+                $tmp = new EasyTable($this->app);
+                $tmp->headings = array('Nummer', 'Bezeichnung', 'Seriennummer', 'Aktion');
+                
+                $artikel_lieferschein = $this->app->DB->SelectArr("
+                    SELECT lp.id, lp.artikel, lp.menge, lp.bezeichnung, lp.nummer, s.seriennummer, slp.id as slp_id
+                    FROM lieferschein_position lp
+                    INNER JOIN artikel a ON a.id = lp.artikel AND a.seriennummern != 'keine'
+                    LEFT JOIN seriennummern_beleg_position slp ON slp.beleg_position = lp.id AND slp.beleg_typ = 'lieferschein'
+                    LEFT JOIN seriennummern s ON slp.seriennummer = s.id
+                    WHERE lp.lieferschein = {$lieferschein_id}
+                    ORDER BY lp.id, slp.id");
+                
+                $tmp->datasets = [];
+                $i = 0;
+                $last = null;
+                $sn_count = 0;
+                $sn_max_count = 0;
+                
+                foreach($artikel_lieferschein as $k => $v) {
+
+                    $input_field = "<input type='text' id='sn_input_field_{$v['artikel']}' name='lieferschein_pos_{$v['id']}[]' value=''>";
+                    $auto_complete = "sn_input_field_{$v['artikel']}";
+                    
+                    if ($last == null || $last['id'] != $v['id']) {
+                        //new position, generate empty lines of last position with input field for remaining lp.menge
+                        //todo: would be nicer if the sql query could also contain the no s/n rows for each position with up to lp.menge count
+                        while ($last != null && $i < $last['menge']) {
+                            $pos['nummer'] = $last['nummer'];
+                            $pos['bezeichnung'] = $last['bezeichnung'];
+                            $pos['seriennummer'] = $last['input_field'];
+                            $this->app->YUI->AutoComplete($last['auto_complete'], "seriennummerverfuegbar",0,"&lieferschein=$lieferschein_id&artikel={$last['artikel']}");
+                            $pos['aktion'] = '';
+                            $tmp->datasets[] = $pos;
+                            $i++;
+                            $sn_count++;
+                        }
+                        $i = 0;
+                        $last = $v;
+                        $last['input_field'] = $input_field;
+                        $last['auto_complete'] = $auto_complete;
+                        $sn_max_count += $v['menge'];
+                    }
+
+                    $this->app->YUI->AutoComplete($auto_complete, "seriennummerverfuegbar",0,"&lieferschein=$lieferschein_id&artikel={$v['artikel']}");
+                    
+                    //new or existing serial, one line per position
+                    $pos['nummer'] = $v['nummer'];
+                    $pos['bezeichnung'] = $v['bezeichnung'];
+                    if (!empty($v['seriennummer'])) {
+                        $pos['seriennummer'] = $v['seriennummer'];
+                        $pos['aktion'] = 
+                        "<a href=\"index.php?module=seriennummern&action=remove_serial&beleg={$lieferschein_id}&serial={$v['seriennummer']}&beleg_pos={$v['id']}&from=lieferschein#tabs-2\">" . "<img src=\"themes/new/images/delete.svg\" border=\"0\"></a>";
+                    } else {
+                        $pos['seriennummer'] = $input_field;
+                        $pos['aktion'] = '';
+                    }
+                    $tmp->datasets[] = $pos;
+                    $i++;
+                    $sn_count++;
+                }
+                
+                //perhaps some unassigned positions left, generate empty lines of last position with input field
+                while ($sn_count < $sn_max_count) {
+                    $pos['nummer'] = $v['nummer'];
+                    $pos['bezeichnung'] = $v['bezeichnung'];
+                    $pos['seriennummer'] = $input_field;
+                    $pos['aktion'] = '';
+                    $tmp->datasets[] = $pos;
+                    $i++;
+                    $sn_count++;
+                }
+    
+                $tmp->DisplayNew('SERIENNUMMERNLISTE',"","noAction",true);
+                
             break;
             case 'wareneingang':
 

From d381049a522a526f1fcd82a4c36ae8b73354c1e9 Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Thu, 13 Feb 2025 12:04:26 +0100
Subject: [PATCH 06/10] display direct links on seriennummern mini detail drop
 down instead of just caption

---
 www/pages/seriennummern.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/pages/seriennummern.php b/www/pages/seriennummern.php
index 5d065933..88a3bfab 100644
--- a/www/pages/seriennummern.php
+++ b/www/pages/seriennummern.php
@@ -1572,7 +1572,9 @@ class Seriennummern {
                         UCASE(LEFT(sbp.beleg_typ, 1)), 
                         SUBSTRING(sbp.beleg_typ, 2)
                     ) AS Belegtyp,
-                    COALESCE(l.belegnr,w.id) AS Beleg,
+                    COALESCE(IF(w.id IS NOT NULL, CONCAT('<a href=\"index.php?module=wareneingang&action=distriinhalt&id=', w.id, '\">', w.id, '</a>'), NULL),
+                             IF(l.id IS NOT NULL, CONCAT('<a href=\"index.php?module=lieferschein&action=edit&id=', l.id, '\">', l.belegnr, '</a>'), NULL),
+                             '') AS Beleg,
                     ".$this->app->erp->FormatDate('COALESCE(l.datum,w.datum)')." AS Datum,
                     COALESCE(al.name,aw.name) AS Adresse                     
                 FROM seriennummern_beleg_position sbp

From d56adb64d26e8797614ec62cf89b4a373b8ca227 Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Fri, 28 Feb 2025 11:50:53 +0100
Subject: [PATCH 07/10] always use currency from auftrag for auftrag_positionen

---
 www/pages/ajax.php    | 6 ------
 www/pages/artikel.php | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/www/pages/ajax.php b/www/pages/ajax.php
index 7dc3993d..eef23e93 100644
--- a/www/pages/ajax.php
+++ b/www/pages/ajax.php
@@ -3069,12 +3069,6 @@ select a.kundennummer, (SELECT name FROM adresse a2 WHERE a2.kundennummer = a.ku
 
         $adresse = $document['adresse'];// $this->app->DB->Select("SELECT adresse FROM $smodule WHERE id='$sid' LIMIT 1");
         $waehrung = $document['waehrung'];//$this->app->DB->Select("SELECT waehrung FROM $smodule WHERE id='$sid' LIMIT 1");
-        $posanz = (int)$this->app->DB->Select("SELECT count(id) FROM $smodule"."_position WHERE $smodule = '$sid'");
-        
-        if($posanz == 0)
-        {
-          $waehrung = '';
-        }
         
         $anzeigebrutto = false;
         if($smodule == 'auftrag' || $smodule == 'rechnung' || $smodule == 'gutschrift' || $smodule == 'angebot' || $smodule == 'proformarechnung')
diff --git a/www/pages/artikel.php b/www/pages/artikel.php
index 42253b8a..f479295c 100644
--- a/www/pages/artikel.php
+++ b/www/pages/artikel.php
@@ -3699,8 +3699,8 @@ class Artikel extends GenArtikel {
 	      $adresse = $this->app->DB->Select("SELECT adresse FROM $smodule WHERE id='$sid' LIMIT 1");
 	}
 
-	if (!is_null($module)) {
-		if ($this->app->DB->Select("SHOW COLUMNS FROM `$module` LIKE 'waehrung'")) {
+	if (!is_null($smodule)) {
+		if ($this->app->DB->Select("SHOW COLUMNS FROM `$smodule` LIKE 'waehrung'")) {
 		      $waehrung = $this->app->DB->Select("SELECT waehrung FROM $smodule WHERE id='$sid' LIMIT 1");
 		}
 	}

From b7caf63c82b913a2958bcabda90ac700d38e518a Mon Sep 17 00:00:00 2001
From: faser2k <faser@gmx.net>
Date: Fri, 28 Feb 2025 14:37:03 +0100
Subject: [PATCH 08/10] fill exchange rate on auftrag creation for foreign
 currency

Not sure why Bruno commented this out. Who is Bruno?
---
 www/lib/class.erpapi.php         | 4 ++--
 www/pages/waehrungumrechnung.php | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/www/lib/class.erpapi.php b/www/lib/class.erpapi.php
index 25968da1..696237e9 100644
--- a/www/lib/class.erpapi.php
+++ b/www/lib/class.erpapi.php
@@ -33269,7 +33269,7 @@ function Firmendaten($field,$projekt="")
         } 
         if($kurs<>0)
         {
-          $this->app->DB->Update("UPDATE $typ SET kurs='$kurs' WHERE id='$id' LIMIT 1");
+          $this->app->DB->Update("UPDATE $typ SET kurs='$kurs' WHERE id='$id' AND kurs = 0 LIMIT 1");
         }
       }
 
@@ -34128,7 +34128,7 @@ function Firmendaten($field,$projekt="")
         }
 
         //$this->LoadSteuersaetze($id,$art); //03.01.2019 Bruno entfernt, da Shopaufträge umsgestellt werden
-        //$this->LoadKurs($id,$art); //03.01.2019 Bruno entfernt
+        $this->LoadKurs($id,$art); //03.01.2019 Bruno entfernt
         $belegarr = $this->app->DB->SelectRow("SELECT * FROM $art WHERE id='$id' LIMIT 1");
         if(empty($belegarr))
         {
diff --git a/www/pages/waehrungumrechnung.php b/www/pages/waehrungumrechnung.php
index 9b623e55..f172cc2e 100644
--- a/www/pages/waehrungumrechnung.php
+++ b/www/pages/waehrungumrechnung.php
@@ -220,4 +220,11 @@ class Waehrungumrechnung {
 	
     }
 
+    public function GetWaehrungUmrechnungskurs($von, $nach, $onlytable) {
+        $result = $this->app->DB->Select("SELECT kurs FROM waehrung_umrechnung WHERE waehrung_von = '$von' AND waehrung_nach = '$nach' AND gueltig_bis is NULL");
+        if (!is_null($result)) {
+            return $result;
+        }
+        return 0;
+    }
 }

From cc3d98222d43191e62496ea46781d3a2138759a5 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Sun, 2 Mar 2025 11:24:57 +0100
Subject: [PATCH 09/10] bugfix verbindlichkeit entwuerfe

---
 www/pages/verbindlichkeit.php | 227 +++++++++++++---------------------
 1 file changed, 85 insertions(+), 142 deletions(-)

diff --git a/www/pages/verbindlichkeit.php b/www/pages/verbindlichkeit.php
index 442420d3..3cf77c0c 100644
--- a/www/pages/verbindlichkeit.php
+++ b/www/pages/verbindlichkeit.php
@@ -44,7 +44,10 @@ class Verbindlichkeit {
 
     function TableSearch(&$app, $name, $erlaubtevars) {
         switch ($name) {
-            case "verbindlichkeit_list":
+            case 'verbindlichkeit_inbearbeitung':
+                $entwuerfe = true;
+                // break ommitted
+            case "verbindlichkeit_list":            
                 $allowed['verbindlichkeit_list'] = array('list');
                 $heading = array('','','Belegnr','Adresse', 'Lieferant', 'RE-Nr', 'RE-Datum', 'Betrag (brutto)', 'W&auml;hrung','Zahlstatus', 'Ziel','Skontoziel','Skonto','Status','Monitor', 'Men&uuml;');
                 $width = array('1%','1%','10%'); // Fill out manually later
@@ -114,162 +117,102 @@ class Verbindlichkeit {
                         ) d ON d.parameter = v.id
                         ";
                 $where = "1";
-                $count = "SELECT count(DISTINCT id) FROM verbindlichkeit WHERE $where";
-//                $groupby = "";
 
-                // Toggle filters
-                $this->app->Tpl->Add('JQUERYREADY', "$('#anhang').click( function() { fnFilterColumn1( 0 ); } );");
-                $this->app->Tpl->Add('JQUERYREADY', "$('#wareneingang').click( function() { fnFilterColumn2( 0 ); } );");
-                $this->app->Tpl->Add('JQUERYREADY', "$('#rechnungsfreigabe').click( function() { fnFilterColumn3( 0 ); } );");
-                $this->app->Tpl->Add('JQUERYREADY', "$('#nichtbezahlt').click( function() { fnFilterColumn4( 0 ); } );");
-                $this->app->Tpl->Add('JQUERYREADY', "$('#stornierte').click( function() { fnFilterColumn5( 0 ); } );");
-                $this->app->Tpl->Add('JQUERYREADY', "$('#abgeschlossen').click( function() { fnFilterColumn6( 0 ); } );");
+                if ($entwuerfe) {
+                    $where .= " AND v.belegnr = '' OR v.belegnr IS NULL";
+                    $count = "SELECT count(DISTINCT id) FROM verbindlichkeit v WHERE $where";              
+                }
+                else {                
+                    $where .= " AND v.belegnr <> ''";
+                    $count = "SELECT count(DISTINCT id) FROM verbindlichkeit v WHERE $where";                
+                    // Toggle filters
+                    $this->app->Tpl->Add('JQUERYREADY', "$('#anhang').click( function() { fnFilterColumn1( 0 ); } );");
+                    $this->app->Tpl->Add('JQUERYREADY', "$('#wareneingang').click( function() { fnFilterColumn2( 0 ); } );");
+                    $this->app->Tpl->Add('JQUERYREADY', "$('#rechnungsfreigabe').click( function() { fnFilterColumn3( 0 ); } );");
+                    $this->app->Tpl->Add('JQUERYREADY', "$('#nichtbezahlt').click( function() { fnFilterColumn4( 0 ); } );");
+                    $this->app->Tpl->Add('JQUERYREADY', "$('#stornierte').click( function() { fnFilterColumn5( 0 ); } );");
+                    $this->app->Tpl->Add('JQUERYREADY', "$('#abgeschlossen').click( function() { fnFilterColumn6( 0 ); } );");
 
-                for ($r = 1;$r <= 8;$r++) {
-                  $this->app->Tpl->Add('JAVASCRIPT', '
-                                         function fnFilterColumn' . $r . ' ( i )
-                                         {
-                                         if(oMoreData' . $r . $name . '==1)
-                                         oMoreData' . $r . $name . ' = 0;
-                                         else
-                                         oMoreData' . $r . $name . ' = 1;
+                    for ($r = 1;$r <= 8;$r++) {
+                      $this->app->Tpl->Add('JAVASCRIPT', '
+                                             function fnFilterColumn' . $r . ' ( i )
+                                             {
+                                             if(oMoreData' . $r . $name . '==1)
+                                             oMoreData' . $r . $name . ' = 0;
+                                             else
+                                             oMoreData' . $r . $name . ' = 1;
 
-                                         $(\'#' . $name . '\').dataTable().fnFilter(
-                                           \'\',
-                                           i,
-                                           0,0
-                                           );
-                                         }
-                                         ');
-                }
+                                             $(\'#' . $name . '\').dataTable().fnFilter(
+                                               \'\',
+                                               i,
+                                               0,0
+                                               );
+                                             }
+                                             ');
+                    }            
 
-                $more_data1 = $this->app->Secure->GetGET("more_data1");
-                if ($more_data1 == 1) {
-                   $where .= " AND datei_anzahl IS NULL";
-                } else {
-                }
+                    $more_data1 = $this->app->Secure->GetGET("more_data1");
+                    if ($more_data1 == 1) {
+                       $where .= " AND datei_anzahl IS NULL";
+                    } else {
+                    }
 
-                $more_data2 = $this->app->Secure->GetGET("more_data2");
-                if ($more_data2 == 1) {
-                   $where .= " AND v.freigabe <> '1'";
-                }
-                else {
-                }
+                    $more_data2 = $this->app->Secure->GetGET("more_data2");
+                    if ($more_data2 == 1) {
+                       $where .= " AND v.freigabe <> '1'";
+                    }
+                    else {
+                    }
 
-                $more_data3 = $this->app->Secure->GetGET("more_data3");
-                if ($more_data3 == 1) {
-                   $where .= " AND v.rechnungsfreigabe <> '1'";
-                }
-                else {
-                }
+                    $more_data3 = $this->app->Secure->GetGET("more_data3");
+                    if ($more_data3 == 1) {
+                       $where .= " AND v.rechnungsfreigabe <> '1'";
+                    }
+                    else {
+                    }
 
-                $more_data4 = $this->app->Secure->GetGET("more_data4");
-                if ($more_data4 == 1) {
-                   $where .= " AND v.bezahlt <> 1";
-                }
-                else {
-                }
+                    $more_data4 = $this->app->Secure->GetGET("more_data4");
+                    if ($more_data4 == 1) {
+                       $where .= " AND v.bezahlt <> 1";
+                    }
+                    else {
+                    }
 
-                $more_data5 = $this->app->Secure->GetGET("more_data5");
-                if ($more_data5 == 1) {
-                }
-                else {
-                   $where .= " AND v.status <> 'storniert'";
-                }
+                    $more_data5 = $this->app->Secure->GetGET("more_data5");
+                    if ($more_data5 == 1) {
+                    }
+                    else {
+                       $where .= " AND v.status <> 'storniert'";
+                    }
 
-                $more_data6 = $this->app->Secure->GetGET("more_data6");
-                if ($more_data6 == 1) {
-                }
-                else {
-                    $where .= " AND v.status <> 'abgeschlossen'";
-                }
+                    $more_data6 = $this->app->Secure->GetGET("more_data6");
+                    if ($more_data6 == 1) {
+                    }
+                    else {
+                        $where .= " AND v.status <> 'abgeschlossen'";
+                    }
 
-                $this->app->YUI->DatePicker('zahlbarbis');
-                $filterzahlbarbis = $this->app->YUI->TableSearchFilter($name, 7,'zahlbarbis');
-                if (!empty($filterzahlbarbis)) {
-                    $filterzahlbarbis = $this->app->String->Convert($filterzahlbarbis,'%1.%2.%3','%3-%2-%1');
-                    $where .= " AND v.zahlbarbis <= '".$filterzahlbarbis."'";
-                }
+                    $this->app->YUI->DatePicker('zahlbarbis');
+                    $filterzahlbarbis = $this->app->YUI->TableSearchFilter($name, 7,'zahlbarbis');
+                    if (!empty($filterzahlbarbis)) {
+                        $filterzahlbarbis = $this->app->String->Convert($filterzahlbarbis,'%1.%2.%3','%3-%2-%1');
+                        $where .= " AND v.zahlbarbis <= '".$filterzahlbarbis."'";
+                    }
 
-                $this->app->YUI->DatePicker('skontobis');
-                $filterskontobis = $this->app->YUI->TableSearchFilter($name, 8,'skontobis');
-                if (!empty($filterskontobis)) {
-                    $filterskontobis = $this->app->String->Convert($filterskontobis,'%1.%2.%3','%3-%2-%1');
-                    $where .= " AND v.skontobis <= '".$filterskontobis."'";
-                }
-                
-                $where .= " AND v.status <> 'angelegt'";
-                
-                // END Toggle filters
+                    $this->app->YUI->DatePicker('skontobis');
+                    $filterskontobis = $this->app->YUI->TableSearchFilter($name, 8,'skontobis');
+                    if (!empty($filterskontobis)) {
+                        $filterskontobis = $this->app->String->Convert($filterskontobis,'%1.%2.%3','%3-%2-%1');
+                        $where .= " AND v.skontobis <= '".$filterskontobis."'";
+                    }
+                    
+                    $where .= " AND v.status <> 'angelegt'";
+                    // END Toggle filters
+                }                    
 
                 $moreinfo = true; // Allow drop down details
                 $menucol = 1; // For moredata
 
-                break;
-            case 'verbindlichkeit_inbearbeitung':
-                $allowed['verbindlichkeit_inbearbeitung'] = array('list');
-                $heading = array('','','Belegnr','Adresse', 'Lieferant', 'RE-Nr', 'RE-Datum', 'Betrag (brutto)', 'W&auml;hrung','Zahlstatus', 'Ziel','Skontoziel','Skonto','Status','Monitor', 'Men&uuml;');
-                $width = array('1%','1%','10%'); // Fill out manually later
-
-                // columns that are aligned right (numbers etc)
-                // $alignright = array(4,5,6,7,8);
-
-                $findcols = array(
-                    'v.id',
-                    'v.id',
-                    'v.belegnr',
-                    'a.name',
-                    'a.lieferantennummer',
-                    'v.rechnung',
-                    'v.rechnungsdatum',
-                    'v.betrag',
-                    'v.waehrung',
-                    'v.bezahlt',
-                    'v.zahlbarbis',
-                    'v.skontobis',
-                    'v.skonto',
-                    'v.status',
-                    'v.status_beleg',
-                    'v.id'
-                );
-
-                $searchsql = array(
-                    'a.name',
-                    'a.lieferantennummer',
-                    'v.rechnung',
-                    'v.internebemerkung'
-                );
-
-                $defaultorder = 1;
-                $defaultorderdesc = 0;
-                $alignright = array(8);
-                $sumcol = array(8);
-
-        		$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',v.id,'\" />') AS `auswahl`";
-
-                $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=verbindlichkeit&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>&nbsp;<a href=\"#\" onclick=DeleteDialog(\"index.php?module=verbindlichkeit&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
-
-                $sql = "SELECT SQL_CALC_FOUND_ROWS
-                            v.id,
-                            $dropnbox,
-                            'ENTWURF' as belegnr,
-                            a.name,
-                            a.lieferantennummer,
-                            v.rechnung,
-                            ".$app->erp->FormatDate("v.rechnungsdatum").",
-                            ".$app->erp->FormatMenge('v.betrag',2).",
-                            v.waehrung,
-                            if(v.bezahlt,'bezahlt','offen'),
-                            ".$app->erp->FormatDate("v.zahlbarbis").",
-                            IF(v.skonto <> 0,".$app->erp->FormatDate("v.skontobis").",''),
-                            IF(v.skonto <> 0,CONCAT(".$app->erp->FormatMenge('v.skonto',0).",'%'),''),
-                            v.status,
-                            ".$app->YUI->IconsSQLVerbindlichkeit().",
-                            v.id FROM verbindlichkeit v
-                        LEFT JOIN adresse a ON v.adresse = a.id";
-                $where = "v.status = 'angelegt'";
-                $count = "SELECT count(DISTINCT id) FROM verbindlichkeit v WHERE $where";
-
                 break;
             case 'verbindlichkeit_paketdistribution_list':
                 $allowed['verbindlichkeit_paketdistribution_list'] = array('list');

From 37dd09c681598eddcc291822dc0ff31d74e450bb Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Thu, 6 Mar 2025 12:26:52 +0100
Subject: [PATCH 10/10] Revert "adds a second tab to seriennummern with all
 lieferschein position"

This reverts commit 811bab4386d1cb5d33a1c36f59341f2b5c3b4f2e.
---
 www/pages/content/seriennummern_enter.tpl |  14 +--
 www/pages/seriennummern.php               | 127 ----------------------
 2 files changed, 1 insertion(+), 140 deletions(-)

diff --git a/www/pages/content/seriennummern_enter.tpl b/www/pages/content/seriennummern_enter.tpl
index 16500164..a5ab8ceb 100644
--- a/www/pages/content/seriennummern_enter.tpl
+++ b/www/pages/content/seriennummern_enter.tpl
@@ -1,7 +1,6 @@
 <div id="tabs">
     <ul>
-        <li><a href="#tabs-1">Beleg</a></li>
-        <li [LIEFERSCHEIN_HIDDEN] ><a href="#tabs-2">Seriennummern</a></li>
+        <li><a href="#tabs-1"></a></li>
     </ul>
     <!-- Example for multiple tabs
     <ul hidden">
@@ -213,16 +212,5 @@
             </div>
         </form>
     </div>
-    <div [LIEFERSCHEIN_HIDDEN] id="tabs-2">
-        <legend >{|[LEGEND]|}</legend>
-        <form action="" method="post">
-            <fieldset>
-                [SERIENNUMMERNLISTE]
-                <div style="text-align: center;">
-                    <button name="submit" value="lieferscheinzuordnen_seriennummernliste" class="ui-button-icon" style="padding-left: 30px; padding-right: 30px;">Speichern</button>
-                </div>
-            </fieldset>
-        </form>
-    </div>
 </div>
 
diff --git a/www/pages/seriennummern.php b/www/pages/seriennummern.php
index df29ec9a..88a3bfab 100644
--- a/www/pages/seriennummern.php
+++ b/www/pages/seriennummern.php
@@ -24,7 +24,6 @@ class Seriennummern {
         $this->app->ActionHandler("wareneingaenge_list", "seriennummern_wareneingaenge_list");                                                                
         $this->app->ActionHandler("enter", "seriennummern_enter"); 
         $this->app->ActionHandler("delete", "seriennummern_delete");
-        $this->app->ActionHandler("remove_serial", "seriennummern_remove_serial");
         $this->app->ActionHandler("remove", "seriennummern_remove");
         $this->app->ActionHandler("minidetail_lieferscheinposition", "seriennummern_lieferscheinpos_minidetail");
         $this->app->ActionHandler("minidetail_wareneingangposition", "seriennummern_wareneingang_minidetail");        
@@ -739,26 +738,6 @@ class Seriennummern {
         
     } 
 
-    public function seriennummern_remove_serial() {
-        $id = $this->app->Secure->GetGET('serial');
-        $beleg_pos = (int) $this->app->Secure->GetGET('beleg_pos');
-        
-        $from = $this->app->Secure->GetGET('from');
-        $beleg = $this->app->Secure->GetGET('beleg');
-
-        if ($id) {
-            $serial = $this->app->DB->SelectRow("SELECT slp.id as slp_id, s.id as s_id FROM seriennummern_beleg_position slp
-                                                INNER JOIN seriennummern s on s.id = slp.seriennummer
-                                                WHERE s.seriennummer = '{$id}' AND slp.beleg_position = {$beleg_pos} AND slp.beleg_typ = {$from}
-                                                LIMIT 1");
-            if (!empty($serial)) {
-                $this->app->DB->Delete("DELETE FROM seriennummern_beleg_position WHERE id = {$serial['slp_id']}");
-                $this->app->DB->Update("UPDATE seriennummern SET eingelagert = 1 WHERE id = {$serial['s_id']}");
-            }
-            $this->app->Location->execute("index.php?module=seriennummern&action=enter&{$from}={$beleg}&from={$from}");
-        }
-    }
-    
     public function seriennummern_remove() {
         $id = (int) $this->app->Secure->GetGET('id');
         $from = $this->app->Secure->GetGET('from');
@@ -923,37 +902,6 @@ class Seriennummern {
                 }
                 $seriennummern = array_merge($seriennummern_not_written, $seriennummern_already_exist, $seriennummern_old_not_allowed);
             break;
-            case 'lieferscheinzuordnen_seriennummernliste':
-                $artikel_lieferschein = $this->app->DB->SelectArr("
-                    SELECT lp.id, lp.artikel
-                    FROM lieferschein_position lp
-                    WHERE lp.lieferschein = '".$lieferschein_id."'
-                    ORDER BY lp.id");
-            
-                foreach($artikel_lieferschein as $k => $v) {
-                    $lieferschein_pos_serial = $this->app->Secure->GetPOST('lieferschein_pos_'.$v['id']);
-                    if (empty($lieferschein_pos_serial)) {
-                        continue;
-                    }
-                    foreach($lieferschein_pos_serial as $serial) {
-                        if (empty($serial)) {
-                            continue;
-                        }
-                        $serial_id = $this->app->DB->Select("SELECT id FROM seriennummern WHERE seriennummer = '".$serial."' and artikel = ".$v['artikel']." LIMIT 1");
-                        if (empty($serial_id)) {
-                            $this->app->DB->Insert("INSERT INTO seriennummern (seriennummer, artikel, eingelagert) VALUES ('".$serial."',".$v['artikel'].", 1)");
-                            $serial_id = $this->app->DB->GetInsertID();
-                        }
-                        $sql = "INSERT INTO seriennummern_beleg_position (beleg_typ, beleg_position, seriennummer) VALUES ('lieferschein','".$v['id']."','".$serial_id."') ";
-                        $this->app->DB->Insert($sql);
-                        
-                        $sql = "UPDATE seriennummern SET eingelagert = 0, logdatei = CURRENT_TIMESTAMP WHERE id = '".$serial_id."'";
-                        $this->app->DB->Update($sql);
-                    }
-                }
-                
-                $this->app->Location->execute("index.php?module=seriennummern&action=enter&lieferschein=".$lieferschein_id."&from=".$from."#tabs-2");
-            break;
             case 'lieferscheinzuordnen':
                 if (empty($lieferschein_id)) {
                     break;
@@ -1203,81 +1151,6 @@ class Seriennummern {
 
                 $this->app->Tpl->Set('SERIENNUMMERN', implode("\n",$seriennummern));                              
 
-                //quick serial list on tab 2
-                $tmp = new EasyTable($this->app);
-                $tmp->headings = array('Nummer', 'Bezeichnung', 'Seriennummer', 'Aktion');
-                
-                $artikel_lieferschein = $this->app->DB->SelectArr("
-                    SELECT lp.id, lp.artikel, lp.menge, lp.bezeichnung, lp.nummer, s.seriennummer, slp.id as slp_id
-                    FROM lieferschein_position lp
-                    INNER JOIN artikel a ON a.id = lp.artikel AND a.seriennummern != 'keine'
-                    LEFT JOIN seriennummern_beleg_position slp ON slp.beleg_position = lp.id AND slp.beleg_typ = 'lieferschein'
-                    LEFT JOIN seriennummern s ON slp.seriennummer = s.id
-                    WHERE lp.lieferschein = {$lieferschein_id}
-                    ORDER BY lp.id, slp.id");
-                
-                $tmp->datasets = [];
-                $i = 0;
-                $last = null;
-                $sn_count = 0;
-                $sn_max_count = 0;
-                
-                foreach($artikel_lieferschein as $k => $v) {
-
-                    $input_field = "<input type='text' id='sn_input_field_{$v['artikel']}' name='lieferschein_pos_{$v['id']}[]' value=''>";
-                    $auto_complete = "sn_input_field_{$v['artikel']}";
-                    
-                    if ($last == null || $last['id'] != $v['id']) {
-                        //new position, generate empty lines of last position with input field for remaining lp.menge
-                        //todo: would be nicer if the sql query could also contain the no s/n rows for each position with up to lp.menge count
-                        while ($last != null && $i < $last['menge']) {
-                            $pos['nummer'] = $last['nummer'];
-                            $pos['bezeichnung'] = $last['bezeichnung'];
-                            $pos['seriennummer'] = $last['input_field'];
-                            $this->app->YUI->AutoComplete($last['auto_complete'], "seriennummerverfuegbar",0,"&lieferschein=$lieferschein_id&artikel={$last['artikel']}");
-                            $pos['aktion'] = '';
-                            $tmp->datasets[] = $pos;
-                            $i++;
-                            $sn_count++;
-                        }
-                        $i = 0;
-                        $last = $v;
-                        $last['input_field'] = $input_field;
-                        $last['auto_complete'] = $auto_complete;
-                        $sn_max_count += $v['menge'];
-                    }
-
-                    $this->app->YUI->AutoComplete($auto_complete, "seriennummerverfuegbar",0,"&lieferschein=$lieferschein_id&artikel={$v['artikel']}");
-                    
-                    //new or existing serial, one line per position
-                    $pos['nummer'] = $v['nummer'];
-                    $pos['bezeichnung'] = $v['bezeichnung'];
-                    if (!empty($v['seriennummer'])) {
-                        $pos['seriennummer'] = $v['seriennummer'];
-                        $pos['aktion'] = 
-                        "<a href=\"index.php?module=seriennummern&action=remove_serial&beleg={$lieferschein_id}&serial={$v['seriennummer']}&beleg_pos={$v['id']}&from=lieferschein#tabs-2\">" . "<img src=\"themes/new/images/delete.svg\" border=\"0\"></a>";
-                    } else {
-                        $pos['seriennummer'] = $input_field;
-                        $pos['aktion'] = '';
-                    }
-                    $tmp->datasets[] = $pos;
-                    $i++;
-                    $sn_count++;
-                }
-                
-                //perhaps some unassigned positions left, generate empty lines of last position with input field
-                while ($sn_count < $sn_max_count) {
-                    $pos['nummer'] = $v['nummer'];
-                    $pos['bezeichnung'] = $v['bezeichnung'];
-                    $pos['seriennummer'] = $input_field;
-                    $pos['aktion'] = '';
-                    $tmp->datasets[] = $pos;
-                    $i++;
-                    $sn_count++;
-                }
-    
-                $tmp->DisplayNew('SERIENNUMMERNLISTE',"","noAction",true);
-                
             break;
             case 'wareneingang':