From 00276d40bba398bb48fe46ffb55487ac31c7ed7c Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Thu, 21 Mar 2024 12:29:08 +0000
Subject: [PATCH] versandpakete added projekt to lieferungen

---
 www/pages/versandpakete.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/www/pages/versandpakete.php b/www/pages/versandpakete.php
index 915d46b0..e4a0c268 100644
--- a/www/pages/versandpakete.php
+++ b/www/pages/versandpakete.php
@@ -283,13 +283,13 @@ class Versandpakete {
 
                 $allowed['versandpakete_lieferscheine'] = array('lieferscheine');
                 
-                $heading = array('',  '',       'Lieferschein', 'Adresse','Menge','Menge in Versandpaketen','Monitor','Pakete','Paket hinzuf&uuml;gen');
-                $width = array(  '1%','1%',     '10%',          '10%',    '10%',  '10%',                    '1%',     '1%',    '1%'); // Fill out manually later
+                $heading = array('',  '',       'Lieferschein', 'Adresse','Menge','Menge in Versandpaketen','Projekt','Monitor','Pakete','Paket hinzuf&uuml;gen');
+                $width = array(  '1%','1%',     '10%',          '10%',    '10%',  '10%',                    '5%',      '1%',     '1%',    '1%'); // Fill out manually later
 
                 // columns that are aligned right (numbers etc)
                 // $alignright = array(4,5,6,7,8); 
 
-                $findcols = array('id','id','belegnr','name','lmenge','vmenge','(alle_versendet+alle_abgeschlossen*2)','id','id');
+                $findcols = array('id','id','belegnr','name','lmenge','vmenge','projekt','(alle_versendet+alle_abgeschlossen*2)','id','id');
                 $searchsql = array('belegnr','name');
 
                 $defaultorder = 1;
@@ -1199,6 +1199,7 @@ class Versandpakete {
       $sql_lieferschein_position = "
                             SELECT
                                 l.id,
+                                p.abkuerzung AS projekt,
                                 l.belegnr,
                                 l.name,
                                 lp.menge lmenge,
@@ -1214,6 +1215,7 @@ class Versandpakete {
                             LEFT JOIN versandpaket_lieferschein_position vlp ON vlp.lieferschein_position = lp.id
                             LEFT JOIN versandpakete v ON vlp.versandpaket = v.id
                             LEFT JOIN versandpakete vop ON vop.lieferschein_ohne_pos = l.id                            
+                            LEFT JOIN projekt p ON p.id = l.projekt
                             WHERE
                                 l.versand_status <> 0 AND
                                 l.belegnr <> '' AND 
@@ -1224,6 +1226,7 @@ class Versandpakete {
                 $sql_lieferschein = "
                     SELECT 
                         id,
+                        projekt,
                         belegnr,
                         name,
                         SUM(lmenge) lmenge,
@@ -1247,6 +1250,7 @@ class Versandpakete {
                             name,
                             ".$app->erp->FormatMenge("lmenge").",
                             ".$app->erp->FormatMenge("vmenge").",
+                            projekt,
                             ".$app->YUI->IconsSQL_lieferung().",  
                             if(vmenge > 0 OR vop IS NOT NULL,CONCAT('<a href=\"index.php?module=versandpakete&action=lieferung&id=',id,'\"><img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/forward.svg\" title=\"Pakete anzeigen\" border=\"0\"></a>'),''),
                             id,