From b9bec98855da257f60a634385b0b9c6d732f45d1 Mon Sep 17 00:00:00 2001
From: OpenXE <>
Date: Mon, 15 Jan 2024 14:23:07 +0100
Subject: [PATCH] wareneingang add manuelle list, wareneingang filter
 abgeschlossene

---
 www/pages/content/wareneingang_list.tpl       |  13 +
 .../content/wareneingang_paketinhalt.tpl      | 225 +++++++++--------
 www/pages/wareneingang.php                    | 236 +++++++++++++++---
 www/themes/new/images/lagerplatz_grau.png     | Bin 0 -> 8907 bytes
 4 files changed, 326 insertions(+), 148 deletions(-)
 create mode 100644 www/themes/new/images/lagerplatz_grau.png

diff --git a/www/pages/content/wareneingang_list.tpl b/www/pages/content/wareneingang_list.tpl
index dafbf3b4..d315a340 100644
--- a/www/pages/content/wareneingang_list.tpl
+++ b/www/pages/content/wareneingang_list.tpl
@@ -3,6 +3,19 @@
             <li><a href="#tabs-1">[TABTEXT1]</a></li>           
     </ul>
     <div id="tabs-1">
+        <div class="filter-box filter-usersave">
+            <div class="filter-block filter-inline">
+              <div class="filter-title">{|Filter|}</div>
+              <ul class="filter-list">
+                <li class="filter-item">
+                  <label for="abgeschlossen" class="switch">
+                    <input type="checkbox" id="abgeschlossen">
+                    <span class="slider round"></span>
+                  </label>
+                  <label for="abgeschlossen">{|Inkl. abgeschlossene|}</label>
+              </ul>                        
+            </div>    
+          </div>
         [MESSAGE]
         [TAB1]
         [TAB1NEXT]
diff --git a/www/pages/content/wareneingang_paketinhalt.tpl b/www/pages/content/wareneingang_paketinhalt.tpl
index 4aa8038c..ae03b568 100644
--- a/www/pages/content/wareneingang_paketinhalt.tpl
+++ b/www/pages/content/wareneingang_paketinhalt.tpl
@@ -7,75 +7,58 @@
 	<!-- ende gehort zu tabview -->
 	<!-- erstes tab -->
 	<input type="hidden" id="paketannahme_id" value="[ID]" /> [BEFORETAB1]
-	<div id="tabs-1"> [TAB1START] [MESSAGE1] [MESSAGE]
-		<form action="" method="post">			
-			<div class="row">
-				<div class="row-height">
-					<div class="col-xs-12 col-md-10 col-md-height">
-						<div class="inside-white inside-full-height">
-                            <div class="row">
-				                <div class="row-height">
-					                <div class="col-xs-12 col-md-2 col-md-height">
-						                <div class="inside inside-full-height">
-							                <fieldset>
-								                <legend>{|[LEGENDE]|}</legend>
-								                <table>
-									                <tr>
-										                <td>{|Status|}:</td>
-										                <td>
-											                <input type=text size="40" value="[STATUS]" disabled>
-										                </td>
-									                </tr>
-									                <tr [ABGESCHLOSSENHIDDEN]>
-										                <td></td>
-										                <td><i>Abgeschlossen am [DATUM_ABGESCHLOSSEN] durch [BEARBEITER_ABGESCHLOSSEN]</i></td>
-									                </tr>
-									                <tr>
-										                <td>{|Lieferschein-Nr.|}:</td>
-										                <td>
-											                <input type=text size="40" name="lsnr" value=[LSNR]>
-										                </td>
-									                </tr>
-									                <tr>
-										                <td>{|Rechnung-Nr.|}:</td>
-										                <td>
-											                <input type=text size="40" name="renr" value=[RENR]>
-										                </td>
-									                </tr>
-                                                </table>
-							                </fieldset>
-						                </div>
-					                </div>
-                                    <div class="col-xs-12 col-md-2 col-md-height">
-						                <div class="inside inside-full-height">
-							                <fieldset>
-								                <table>
-									                <tr>
-										                <td>{|Bemerkung|}:</td>
-										                <td>
-											                <textarea rows="5" cols="40" name="bemerkung">[BEMERKUNG]</textarea>
-										                </td>
-									                </tr> 
-									                [ISLIEFERANTSTART]
-									                [ISLIEFERANTENDE] 
-                                                </table>
-							                </fieldset>
-						                </div>
-					                </div>
-				                </div>
-			                </div>
-                            <div class="row" [HINZUFUEGENHIDDEN]>
-	                            <div class="row-height">
-		                            <div class="col-xs-12 col-md-10 col-md-height">
-			                            <div class="inside-white inside-full-height">
-                                            [TAB1]
-                                        </div>
-		                            </div>
-	                            </div>
-                            </div>
-                        </div>
-					</div>
-					<div class="col-xs-12 col-md-2 col-md-height">
+	<form action="" method="post">			
+    	<div id="tabs-1"> [TAB1START] [MESSAGE1] [MESSAGE]
+            <div class="row">
+                <div class="row-height">
+                    <div class="col-xs-12 col-md-5 col-md-height">
+	                    <div class="inside inside-full-height">
+		                    <fieldset>
+			                    <legend>{|[LEGENDE]|}</legend>
+			                    <table>
+				                    <tr>
+					                    <td>{|Status|}:</td>
+					                    <td>
+						                    <input type=text size="40" value="[STATUS]" disabled>
+					                    </td>
+				                    </tr>
+				                    <tr [ABGESCHLOSSENHIDDEN]>
+					                    <td></td>
+					                    <td><i>Abgeschlossen am [DATUM_ABGESCHLOSSEN] durch [BEARBEITER_ABGESCHLOSSEN]</i></td>
+				                    </tr>
+				                    <tr>
+					                    <td>{|Lieferschein-Nr.|}:</td>
+					                    <td>
+						                    <input type=text size="40" name="lsnr" value=[LSNR]>
+					                    </td>
+				                    </tr>
+				                    <tr>
+					                    <td>{|Rechnung-Nr.|}:</td>
+					                    <td>
+						                    <input type=text size="40" name="renr" value=[RENR]>
+					                    </td>
+				                    </tr>
+                                </table>
+		                    </fieldset>
+	                    </div>
+                    </div>
+                    <div class="col-xs-12 col-md-5 col-md-height">
+	                    <div class="inside inside-full-height">
+		                    <fieldset>
+			                    <table>
+				                    <tr>
+					                    <td>{|Bemerkung|}:</td>
+					                    <td>
+						                    <textarea rows="5" cols="40" name="bemerkung">[BEMERKUNG]</textarea>
+					                    </td>
+				                    </tr> 
+				                    [ISLIEFERANTSTART]
+				                    [ISLIEFERANTENDE] 
+                                </table>
+		                    </fieldset>
+	                    </div>
+                    </div>
+                    <div class="col-xs-12 col-md-2 col-md-height">
 						<div class="inside inside-full-height">
 							<fieldset> [BUTTONS] [BEFOREFRM] [AFTERFRM] [DISTRIINHALTBUTTONS] [BEFOREFRM] [AFTERFRM]
 								<button name="submit" class="ui-button-icon" style="width:100%;" value="speichern" hidden="true"></button>
@@ -86,6 +69,25 @@
 											<button name="submit" class="ui-button-icon" style="width:100%;" value="speichern">{|Speichern|}</button>
 										</td>
 									</tr>									
+								</table>
+							</fieldset>
+						</div>
+					</div>
+                </div>
+            </div>
+            <div class="row" [HINZUFUEGENHIDDEN]>
+                <div class="row-height">
+                    <div class="col-xs-12 col-md-10 col-md-height">
+                        <div class="inside-white inside-full-height">
+                            [TAB1]
+                        </div>
+                    </div>
+                    <div class="col-xs-12 col-md-2 col-md-height">
+						<div class="inside inside-full-height">
+							<fieldset> [BUTTONS] [BEFOREFRM] [AFTERFRM] [DISTRIINHALTBUTTONS] [BEFOREFRM] [AFTERFRM]
+								<button name="submit" class="ui-button-icon" style="width:100%;" value="speichern" hidden="true"></button>
+								<table width="100%" border="0" class="mkTableFormular">
+									<legend>{|Aktionen|}</legend>
 									[ISLIEFERANTSTART]
 									<tr [HINZUFUEGENHIDDEN]>
 										<td>
@@ -93,10 +95,26 @@
 										</td>
 									</tr>
 									[ISLIEFERANTENDE]
+									[ISNOTLIEFERANTSTART]
+                                    <tr [HINZUFUEGENHIDDEN]>
+										<td>
+											<button name="submit" class="ui-button-icon" style="width:100%;" value="manuell_hinzufuegen">{|Hinzuf&uuml;gen|}</button>
+										</td>
+									</tr>   
+									[ISNOTLIEFERANTENDE]
 								</table>
 							</fieldset>
 						</div>
 					</div>
+                </div>
+            </div>
+			<div class="row">
+				<div class="row-height">
+					<div class="col-xs-12 col-md-10 col-md-height">
+						<div class="inside-white inside-full-height">
+                            
+                        </div>
+					</div>
 				</div>
 			</div>
 			<div class="row">
@@ -110,13 +128,6 @@
 								<button name="submit" class="ui-button-icon" style="width:100%;" value="speichern" hidden="true"></button>
 								<table width="100%" border="0" class="mkTableFormular">
 									<legend>{|Aktionen|}</legend>
-									[BEFOREMANUELLERFASSEN]
-									<tr [HINZUFUEGENHIDDEN]>
-										<td>
-											<button name="submit" class="ui-button-icon" style="width:100%;" value="manuellerfassen">{|Artikel manuell buchen|}</button>
-										</td>
-									</tr> 
-									[AFTERMANUELLERFASSEN]
 									<tr [BUCHENHIDDEN]>
 										<td>
 											<button name="submit" class="ui-button-icon" style="width:100%;" value="vorlaeufige_buchen">{|Buchen|}</button>
@@ -143,38 +154,36 @@
 					</div>
 				</div>
 			</div>
-		</form> [TAB1ENDE] 
-    </div> [AFTERTAB1] [BEFORETAB2]
-	<div id="tabs-2"> [TAB2START] [MESSAGE2]
-		<div class="row">
-			<div class="row-height">
-				<div class="col-xs-12 col-md-10 col-md-height">
-					<div class="inside-white inside-full-height"> [TAB2]
-						<div class="center">[BUTTONS2]</div>
-					</div>
-				</div>
-				<div class="col-xs-12 col-md-2 col-md-height">
-					<div class="inside inside-full-height">
-						<fieldset>
-							<legend>{|Aktionen|}</legend> [BUTTONS] </fieldset>
-					</div>
-				</div>
-			</div>
-		</div> [TAB2ENDE] </div> [AFTERTAB2] [BEFORETAB3]
-	<div id="tabs-3"> [TAB3START] [MESSAGE3]
-		<div class="row">
-			<div class="row-height">
-				<div class="col-xs-12 col-md-10 col-md-height">
-					<div class="inside-white inside-full-height"> [TAB3] </div>
-				</div>
-				<div class="col-xs-12 col-md-2 col-md-height">
-					<div class="inside inside-full-height">
-						<fieldset>
-							<legend>{|Aktionen|}</legend> [BUTTONS] </fieldset>
-					</div>
-				</div>
-			</div>
-		</div> [TAB3ENDE] </div> [AFTERTAB3] </div>
+	        [TAB1ENDE] 
+        </div> [AFTERTAB1] [BEFORETAB2]
+	    <div id="tabs-2"> [TAB2START] [MESSAGE2]
+		    <div class="row">
+			    <div class="row-height">
+				    <div class="col-xs-12 col-md-10 col-md-height">
+					    <div class="inside-white inside-full-height"> [TAB2]
+						    <div class="center">[BUTTONS2]</div>
+					    </div>
+				    </div>
+                    <div class="col-xs-12 col-md-2 col-md-height">
+					    <div class="inside inside-full-height">
+						    <fieldset>
+							    <button name="submit" class="ui-button-icon" style="width:100%;" value="speichern" hidden="true"></button>
+							    <table width="100%" border="0" class="mkTableFormular">
+								    <legend>{|Aktionen|}</legend>
+								    <tr [HINZUFUEGENHIDDEN]>
+									    <td>
+										    <button name="submit" class="ui-button-icon" style="width:100%;" value="manuell_hinzufuegen">{|Hinzuf&uuml;gen|}</button>
+									    </td>
+								    </tr>                                 
+							    </table>
+						    </fieldset>
+					    </div>
+        			</div>
+			    </div>
+		    </div> [TAB2ENDE] 
+        </div> [AFTERTAB2]
+	</form> 
+</div>
 <script type="text/javascript">
 $(document).ready(function() {
 	$("#tabs").tabs("option", "active", [TABINDEX]);
diff --git a/www/pages/wareneingang.php b/www/pages/wareneingang.php
index 418a60d7..8a6af126 100644
--- a/www/pages/wareneingang.php
+++ b/www/pages/wareneingang.php
@@ -124,8 +124,7 @@ class Wareneingang {
                         bp.menge-bp.geliefert-COALESCE((SELECT TRIM(SUM(menge))+0 FROM paketdistribution WHERE vorlaeufig = 1 AND bestellung_position = bp.id),0),
                         0
                     )
-                ";
-                
+                ";               
 
                 $input_for_menge = "CONCAT(
                         '<input type = \"number\" min=\"0\"',
@@ -166,7 +165,7 @@ class Wareneingang {
                                    IF(b.bestellungbestaetigtabnummer != '' AND b.bestellungbestaetigtabnummer IS NOT NULL, CONCAT('<br>AB Nummer Lieferant: ',b.bestellungbestaetigtabnummer), ''),
                                    IF(b.bestaetigteslieferdatum != '' AND b.bestaetigteslieferdatum IS NOT NULL AND b.bestaetigteslieferdatum != '0000-00-00', CONCAT('<br>Best. Lieferdatum: ',DATE_FORMAT(b.bestaetigteslieferdatum, '%d.%m.%Y')),'')
                                    )",
-                        "if(bp.lieferdatum,bp.lieferdatum,'sofort')", 'p.abkuerzung', 'bp.menge', 'bp.geliefert', $this->app->erp->FormatMenge("bp.menge -  bp.geliefert"), 'bp.id');
+                        "if(bp.lieferdatum,bp.lieferdatum,'sofort')", 'p.abkuerzung', 'bp.menge', 'bp.geliefert', $this->app->erp->FormatMenge("bp.menge -  bp.geliefert"), 'bp.id','bp.id');
                     $searchsql = array('bp.bestellnummer', 'art.nummer', 'b.belegnr', "CONCAT(art.name_de,'<br>Bei Lieferant: ',bp.bezeichnunglieferant, '<i style=color:#999>',
                                    IF(b.internebemerkung != '' AND b.internebemerkung IS NOT NULL, CONCAT('<br>Interne Bemerkung: ',b.internebemerkung),''),
                                    IF(b.internebezeichnung != '' AND b.internebezeichnung IS NOT NULL, CONCAT('<br>Interne Bezeichnung: ',b.internebezeichnung), ''),
@@ -257,6 +256,60 @@ class Wareneingang {
                 $moreinfo = false;
                 $this->app->erp->RunHook('warneingang_tablesearch_wareneingang_lieferant', 4, $id, $sql, $where, $count);
                 break;
+            
+            case 'wareneingang_manuell':
+                $allowed['paketdistribution_list'] = array('list');
+         
+                $heading = array('Art.-Nummer', 'Beschreibung', 'Menge', 'Bemerkung','');
+                $width = array(  '5%',          '30%',          '5%',    '15%',      '1%');
+
+                $findcols = array('nummer','name_de','id','id');
+                $searchsql = array('');
+
+                $alignright = array('5');
+                $defaultorder = 1;
+                $defaultorderdesc = 0;
+                
+                $auswahl = array (
+                    '<input type=\"text\" name=\"manuell_artikel_ids[]\" value=\"',                   
+                    ['sql' => 'a.id'],
+                    '" hidden/>',
+                    ['sql' => 'a.nummer']
+                );              
+                
+                $input_for_menge = array(
+                    '<input type = \"number\" min=\"0\"',
+                    ' value=\"',                    
+                    '\"',
+                    ' name=\"manuell_mengen[]\"',
+                    ' style=\"text-align:right; width:100%\">',
+                    '</input>'
+                );      
+
+                $input_for_bemerkung = array(
+                    '<input type = \"text\"',                    
+                    ' name=\"manuell_bemerkungen[]\"',
+                    ' style=\"text-align:right; width:100%\">',
+                    '</input>'
+                );      
+
+                $sql = "
+                    SELECT SQL_CALC_FOUND_ROWS                       
+                        id,
+                        ".$this->app->erp->ConcatSQL($auswahl).",
+                        name_de,
+                        ".$this->app->erp->ConcatSQL($input_for_menge).",
+                        ".$this->app->erp->ConcatSQL($input_for_bemerkung)."
+                        ''
+                    FROM
+                        artikel a
+                ";
+                              
+                $where = "geloescht <> 1";
+                $count = "";
+         
+            break;
+
             case 'paketannahme_retoure':
                 $allowed['wareneingang'] = array('distriinhalt');
                 $adresse = $this->app->DB->Select("SELECT adresse FROM paketannahme WHERE id='$id' LIMIT 1");
@@ -977,17 +1030,19 @@ class Wareneingang {
                 $heading = array('Lieferant-Art.-Nr.', 'Art.-Nummer', 'Bestellung', 'Beschreibung', 'Menge', 'Bemerkung','Bearbeiter', '','','');
                 $width = array(  '5%',                 '5%',          '5%',         '30%',          '5%',    '15%',       '5%',       '1%','1%','1%');
 
-                $findcols = array('p.nummer', 'p.bestellbezug', 'p.name', 'p.menge', 'p.bemerkung','p.bearbeiter');
+                $findcols = array('p.lieferantnummer','p.nummer', 'p.bestellbezug', 'p.name', 'p.menge', 'p.bemerkung','p.bearbeiter','p.nummer','p.nummer','p.nummer');
                 $searchsql = array('p.nummer', 'p.name', 'p.bemerkung');
 
                 $alignright = array('5');
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
 
-                $icon_nicht_eingelagert = "<img src=\"./themes/new/images/nicht_eingelagert.png\" title=\"nicht eingebucht\" style=\"margin-right:1px\" border=\"0\">";
-                $icon_eingelagert = "<img src=\"./themes/new/images/eingelagert.png\" title=\"eingebucht\" style=\"margin-right:1px\" border=\"0\">";
-                $icon_kein_lagerplatz = "<img src=\"./themes/new/images/lagerplatzstop.png\" title=\"kein Standardlager angegeben\" style=\"margin-right:1px\" border=\"0\">";
-                $icon_lagerplatz = "<img src=\"./themes/new/images/lagerplatzgo.png\" title=\"Lager ok\" style=\"margin-right:1px\" border=\"0\">";               
+                $icon_nicht_eingelagert = "<img src=\"./themes/new/images/nicht_eingelagert.png\" title=\"Position ist nicht eingebucht\" style=\"margin-right:1px\" border=\"0\">";
+                $icon_eingelagert = "<img src=\"./themes/new/images/eingelagert.png\" title=\"Position ist eingebucht\" style=\"margin-right:1px\" border=\"0\">";
+                $icon_kein_lagerplatz = "<img src=\"./themes/new/images/lagerplatzstop.png\" title=\"Der Artikel hat kein Standardlager\" style=\"margin-right:1px\" border=\"0\">";
+                $icon_lagerplatz = "<img src=\"./themes/new/images/lagerplatzgo.png\" title=\"Standardlager ok\" style=\"margin-right:1px\" border=\"0\">";
+                $icon_lagerplatz_eingelagert = "<img src=\"./themes/new/images/lagerplatzgo.png\" title=\"Eingelagert\" style=\"margin-right:1px\" border=\"0\">";
+                $icon_kein_lagerartikel = "<img src=\"./themes/new/images/lagerplatz_grau.png\" title=\"Kein Lagerartikel\" style=\"margin-right:1px\" border=\"0\">";                              
               
                 $deletelink = array(
                     "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=wareneingang&action=deletepos&id=",
@@ -1024,13 +1079,22 @@ class Wareneingang {
                                             paketdistribution.vorlaeufig,
                                             CONCAT(
                                                 '$icon_nicht_eingelagert',
-                                                if (
-                                                    artikel.lager_platz = 0,
-                                                    '$icon_kein_lagerplatz',
-                                                    '$icon_lagerplatz'
+                                                if (artikel.lagerartikel,
+                                                    if (
+                                                        artikel.lager_platz = 0,
+                                                        '$icon_kein_lagerplatz',
+                                                        '$icon_lagerplatz'
+                                                    ),   
+                                                    '$icon_kein_lagerartikel'
                                                 )
                                             ),
-                                            '$icon_eingelagert'
+                                            CONCAT(                                                
+                                                '$icon_eingelagert',                                                
+                                                if (artikel.lagerartikel,
+                                                    '$icon_lagerplatz_eingelagert',
+                                                    '$icon_kein_lagerartikel'
+                                                )
+                                            )
                                         ),                                        
                                         '</td></tr></table>' 
                                     )
@@ -1115,9 +1179,38 @@ class Wareneingang {
 
                 $where = "1";
 
+                // Toggle filters
+                $this->app->Tpl->Add('JQUERYREADY', "$('#abgeschlossen').click( function() { fnFilterColumn1( 0 ); } );");                
+
+                for ($r = 1;$r <= 1;$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
+                                           );
+                                         }
+                                         ');
+                }
+
+                $more_data1 = $this->app->Secure->GetGET("more_data1");
+                if ($more_data1 == 1) {
+                } else {
+                   $where .= " AND paketannahme.status <> 'abgeschlossen'";                 
+                }
+
+                // END Toggle filters
+
                 $count = "SELECT count(paketannahme.id) FROM paketannahme 
                     INNER JOIN adresse 
-                    ON paketannahme.adresse = adresse.id";
+                    ON paketannahme.adresse = adresse.id WHERE ".$where;
                 $groupby = "GROUP BY paketannahme.id";
 
                 $moreinfo = true; // Allow drop down details
@@ -1969,36 +2062,91 @@ class Wareneingang {
                     }
                 }
                 break;
+            case 'manuell_hinzufuegen':
+
+                $manuell_artikel_ids = $this->app->Secure->GetPOST('manuell_artikel_ids');
+                $manuell_mengen = $this->app->Secure->GetPOST('manuell_mengen');
+                $manuell_bemerkungen = $this->app->Secure->GetPOST('manuell_bemerkungen');
+              
+                foreach ($manuell_artikel_ids as $key => $artikel) {
+                    $menge = $manuell_mengen[$key];
+                    $bemerkung = $manuell_bemerkungen[$key];
+                    if ($menge <= 0) {
+                        continue;
+                    }
+
+                    $sql = "INSERT INTO paketdistribution(
+                                id,
+                                bearbeiter,
+                                zeit,
+                                paketannahme,
+                                adresse,
+                                artikel,
+                                menge,
+                                vpe,
+                                etiketten,
+                                bemerkung,
+                                bestellung_position,
+                                vorlaeufig
+                            )
+                            VALUES(
+                                '',
+                                '" . $this->app->User->GetName() . "',
+                                NOW(), 
+                                '$id', 
+                                '', 
+                                '$artikel', 
+                                '$menge', 
+                                '1', 
+                                '', 
+                                '".$this->app->DB->real_escape_string($bemerkung)."', 
+                                '',
+                                1
+                            )";
+                    $this->app->DB->Insert($sql);                       
+                }
+                break;
             case 'vorlaeufige_buchen':            
             	$ziellager_from_form = $this->app->erp->ReplaceLagerPlatz(true,$this->app->Secure->GetPOST('ziellager'),true); // Parameters: Target db?, value, from form? 
                 $sql = "SELECT * FROM paketdistribution WHERE paketannahme = ".$id." AND vorlaeufig = 1";
                 $positionen = $this->app->DB->SelectArr($sql);               
                 foreach ($positionen as $position) {
                     $bemerkung = "";                    
+                    $artikel = $position['artikel'];
                     $menge = $position['menge'];
                     $bestellposition = $position['bestellung_position'];                   
                     if ($menge > 0) {
-                        // Gather info bestellung
-                        $bparr = $this->app->DB->SelectRow("
-                            SELECT 
-                                * 
-                            FROM 
-                                bestellung 
-                            INNER JOIN 
-                                bestellung_position ON bestellung_position.bestellung = bestellung.id
-                            INNER JOIN 
-                                artikel ON bestellung_position.artikel = artikel.id 
-                            WHERE 
-                                bestellung_position.id='$bestellposition' 
-                            LIMIT 1
-                        ");
-                        $artikel = $bparr['artikel'];                            
-                        $artikel_nr = $bparr['nummer'];
-                        $projekt = $bparr['projekt'];
-                        $bestellung_belegnr = $bparr['belegnr'];
-                        $vpe = $bparr['vpe'];
-                        $menge_bestellung = $bparr['menge'];
-                        if ($bparr['lagerartikel']) {
+
+                        if (!empty($bestellposition)) {
+                            // Gather info bestellung
+                            $bparr = $this->app->DB->SelectRow("
+                                SELECT 
+                                    * 
+                                FROM 
+                                    bestellung 
+                                INNER JOIN 
+                                    bestellung_position ON bestellung_position.bestellung = bestellung.id
+                                INNER JOIN 
+                                    artikel ON bestellung_position.artikel = artikel.id 
+                                WHERE 
+                                    bestellung_position.id='$bestellposition' 
+                                LIMIT 1
+                            ");                            
+                            $artikel = $bparr['artikel'];                            
+                            $artikel_nr = $bparr['nummer'];
+                            $projekt = $bparr['projekt'];
+                            $bestellung_belegnr = $bparr['belegnr'];
+                            $vpe = $bparr['vpe'];
+                            $menge_bestellung = $bparr['menge'];
+                            $lagerartikel = $bparr['lagerartikel'];
+                            $info_bestellung = ", Bestellung $bestellung_belegnr";
+                        } else {
+                            $artikelarr = $this->app->DB->SelectRow("SELECT nummer, lagerartikel FROM artikel WHERE id =".$position['artikel']);
+                            $lagerartikel = $artikelarr['lagerartikel'];
+                            $artikel_nr = $artikelarr['nummer'];
+                        }
+                        
+                        if ($lagerartikel) {
                             // Get Lager_platz
                             if (empty($ziellager_from_form)) {
                                 $lager = $this->app->DB->Select("SELECT lager_platz FROM artikel WHERE id='" . $artikel . "' LIMIT 1");
@@ -2012,10 +2160,13 @@ class Wareneingang {
                             }
 
                             // Put stock
-                            $this->app->erp->LagerEinlagern($artikel, $menge, $lager, '', "Wareneingang Paket $id, Bestellung $bestellung_belegnr", '', $id);
+                            $this->app->erp->LagerEinlagern($artikel, $menge, $lager, '', "Wareneingang Paket $id".$info_bestellung, '', $id);
                             $lagerplatz_name = $this->app->DB->Select("SELECT kurzbezeichnung FROM lager_platz WHERE lager_platz.id = $lager LIMIT 1");
-                            $bemerkung = $lagerplatz_name;
-                        } 
+                            $bemerkung = trim($position['bemerkung']." ".$lagerplatz_name);
+                        } else {
+                            $bemerkung = $position['bemerkung'];
+                        }
+
                         // Increase bestellung_position geliefert_menge
                         $geliefert = $this->app->DB->Select("SELECT ifnull(geliefert,0) FROM bestellung_position WHERE id='$bestellposition' LIMIT 1");                    
                         $geliefert += $menge;
@@ -2167,12 +2318,17 @@ class Wareneingang {
             //$this->app->Tpl->Set('TAB1TEXT', 'Bestellungen');
             //$this->app->Tpl->Set('TAB1START','<div id=\"tabs-1\">');
             //$this->app->Tpl->Set('TAB1ENDE','</div>');
-
+            $this->app->Tpl->Set('ISNOTLIEFERANTSTART', '<!--');
+            $this->app->Tpl->Set('ISNOTLIEFERANTENDE', '-->');       
+            $this->app->Tpl->Set('TAB1TEXT', 'Artikel aus Bestellungen');
+            $this->app->Tpl->Set('TAB2TEXT', 'Artikel manuell');                        
             $this->app->Tpl->Add('TAB1', "<legend>Offene Artikel aus Bestellungen bei $name:</legend>");
             $this->app->YUI->TableSearch('TAB1', 'wareneingang_lieferant', 'show', '', '', basename(__FILE__), __CLASS__);
+            $this->app->YUI->TableSearch('TAB2', 'wareneingang_manuell', "show", "", "", basename(__FILE__), __CLASS__);
         } else {
             $this->app->Tpl->Set('ISLIEFERANTSTART', '<!--');
-            $this->app->Tpl->Set('ISLIEFERANTENDE', '-->');
+            $this->app->Tpl->Set('ISLIEFERANTENDE', '-->');       
+            $this->app->YUI->TableSearch('TAB1', 'wareneingang_manuell', "show", "", "", basename(__FILE__), __CLASS__);
 /*            $this->app->Tpl->Set('TAB1START', '');
             $this->app->Tpl->Set('TAB1ENDE', '');*/
             // $this->app->Tpl->Set('BEFORETAB1', '<!--');
diff --git a/www/themes/new/images/lagerplatz_grau.png b/www/themes/new/images/lagerplatz_grau.png
new file mode 100644
index 0000000000000000000000000000000000000000..8901793bd07361c12027698940a5c883d5166159
GIT binary patch
literal 8907
zcmeHLXH-*Lx5WZT5kWv{N(e<j1F1kllU}435fqU$2)%?ZC{=osqErC^>C$_X-UOve
z5do1BKt%x&!58q>@xDKIy!ZXP$;ipc-fPXZ)?D-Kk-bB7v{X*ha?nyxP@Gm%Rn#MY
zvmAa-QIW3^As0?lP%v?O8r&f2nY#fTob2%g8ytY>;eZ3++zEIJ3irvPBtk52{po<8
zUsz=1nWm%K5HG|(ect!ILU?*{>&oCpq;8%ye@uv?9|C`{G~4$hEFIv)&aD^8-x<bj
zb~mOs@os8*o$UJJ&eCq%Y}eYJ&lf4cnv>1UF05<sN0-lDL+cxZrocqbMIUa<kJP>U
z6g_5kMA`0@-~iEuCf!>5_wTvf!=I-SOiSN?MFoltZZ{nS_}){N9pe>Pv1vM3XMV-$
zyCe~_Qds|uxN-6R@V&P+z32OKUF5zdFVwpQYCA>=F-2=TdLFPSR}h~aEU4K(lWKl5
zxHn)_(J-A`BPtg;xZbtj88rB8ZKzr5&C*_S!^i5@I#{OYtJzjF-V$jGyskIj$mg^X
zjPM@k65?WpcyCaK(ol$lVEO3m3;Uqa3&P<AW)ZV?VXSG5h1G4>>({2I>?9SwLL>N^
zf{Bh^7OrZcUn8E5o7MCA&N;BN>;=t8dPH_?bR`rd?^pCce6VOxI^FNoWA-ztx$zE2
zlhV56M>y-k*;jX9^h#Q?$kU2zb^aW#_qm(R?y(qA`^jY$3hAA)k*v0CJ<vH`?dzJt
zHj&0vL6{Z?C`zHgY^19cBi*Mt*W(pqD^EgC=-`(5qT!6sdAjdJ&!>jnd8ouaz~8f>
z&wr}^^d1u|`jklBNii(@9S`nz+MDbQqwoCA@U%zEGw_crXGZaKKFSP5Yl?V0ln)ik
zPEpT)gG*P4L@uUWD^?0sfGdRX$KO)Vi?_JGajUk@Nxn!k$-0Sh7<~;?{o3k*%*@UZ
zMq7I4H7R<I>N{j!l{X5yTEQ%=Dccqf8<6TNq{|0cB$%0Z#9zOS8@*&DUMRbNKxwtD
ztSP4FiT2Fwd>ePM`nm8WImihxB<*WstUN`A5~RLt>oyCrV@-IOGpP&Uj}|KgQu+Cq
z(DcbXhdD7CzCXA$t+8oe(<7_&QjmBrWO}g1Ti(`^eU-EHVIapyUyQf&z%72GA{SZv
z0XOOc*S(+3x*@0N%}hcfLIt0U31>W#4m25CTU5VX%bL<`BP7GP8naX>5Chy0#M%lO
zB^q)sRf>){OW)^<n`Ua0Wslp<Ezgs|`d&A(IBUd_Lmg~j%BON=fx2N)qLe{WeOX4^
znrR<@2{(t1EC?yA5@@(Nbl+a&s>?gGq^BKam@O&v851cL|JFw8o1e_rGb0PfkUV4E
zso!s8m1H<NS@(}-!?Q9tFUylgCxKw(%Zc4Y=$eMBRxQ3PLSFnX=(9=0@_d?2IzdT1
zfgxK|p>~bH=gqdOHV2#y2vJJb=Q1@ZuS^vC`n7@MQk~)Uvl+|V*4XeSv$1e~`R(wb
z@4%~bDM)mSn%dP-8WEl;xr5QMADbt6*aD%PR+<r3lG(V576kQ5Y!<kX(6b!yiUSpS
zc3fTKb>3&*+&XJVruI@=!P}L{Yn%EiKwM{{jl~w$Vu*SK0hc`uZf7VeSFV1;hOav9
z?R(Cb-jzXyy1HHHrK1RC>ikoF7KVV#C_Bbe7hTTE4=dn>n1`QVS;SVJ+A+E;rrDff
zX}-F+ENh%G%UG}TWl>^UHD;%rDTisH!4t2I$GXhc6!=6`DOVH-V_UeUmc!3^y5^)0
zd`fYz{7^)q^nwN@F6Q=mZV3)p(O<}gMn4O&)qQ>o<4}b}Ytf8@=O?V}3f3+94fc5(
z7B(FohXW(m()+|gqqnUTI&7D(xz^Aqu@qZUZ9nN(&6};oFt1e?>@dL>J-<u)zZ_dm
z^lOVu>Nffykk648$5krqJAWq#E}3N%Bk&5=GB1!Fpuef=8qx7I+__iiYBDxi;8TD!
z^M0BJ1}YLHTQ+g4jlPy1YVMJF>q=#$`n!av0;B$Cg^bgWCjdJB&oYl6laCxd&Yb=z
zV#RIsL~k&3DEf-wLLzUgJn9R0QWJhDnY~?b+8~Rq3K?XGD&`jhXJI>bWNy|jr7wMK
zZ&qBSe{U3#|Ng4RTkQ-TwD(fHum-jwwM;CMrQcG04+-S~MvX|9J(zFu;`KAlF(Ixy
z0LJe`?x~Mog7o%)r8jPjzNH+<)lGAB@<e}eaLa$12CmhEw)O&RKevaWXCZZ|lg)Vj
z$Mmh2sdy_DQ9LUn7l*X+kKZ?l%ki!VeROhGomO68LPNPM*Ii*wS3vX1Roy+Lmum1V
zqTvIg_uShm^XMVV4TjkOU;2Q%-8W=qt=jv(qal>Vh(ea#0KV{$viLl?=`uNd`uFDm
zm5^^?$oUPyHLi{uXB*l^Ab3jQM-2?DWmaKyi2}Ak$Av(Z;D9HTX+}fb@hp?qZ6*r^
z#$uJ*@+@EGc-I1`6<&1ZdDkQCC3UDqXF<)oLd`r6=ZkFU$MXe6qqwrP)k-f{tlh+$
zl~hL323Ez;8%&){+*kZ&P>(v^eynh|JxZy_%SiB~E4?FRj!T*aER=6@Ba}BQI12p~
z|7uiu)K1#KYU2vg^D!s0j$iP6e!q{P3Jb$Wmrs<%!m5)~rZ@SoN_~)qyk`Eiq_kWx
zdakL~U<CHWh7ZK-$TCd3w3nBA00Ea2?vy7iFrM@&;0@Jn<-Ej-pD?kkV(S&BQl2^A
zmJJnme=r$c0wogAKL_51V_#jY#Tvw63~Ee4<1t<7?<-<Dv9VUiYc&In)@>vMPn2aZ
z_Sh`<Se`e@yU8mV54BByFR!(;v81(WdU{4_&Lp3pwC7oEulUet6k18QeK~i(GNr0`
zuj-<1Tk$e9GIkxe$KdB7H`kPmJHIn8V@k8Eq{6u1WEP6hvVD5u#Pi2n6cNaHaV|SH
zlQto6Wn{AblM+ou_W_2r#CSaMLdKmDt1ftd{>#CINc8ip2f8s6GPafs83OD*^ZA$?
z(b$mz&k=Jdj{@XH<af{R;Co}ip>!>$QjYD%&7G0y$aBxv(Ytx+%UeWHV@(4N>^8?|
z)7pvky8M|j?uH|+(dMl(oDs1kXQSUU;CNk$bME%N3t0@MPfspuz~~=nx#jBv%jcxv
z8gRQenKI8(a(9OLY8(zE?0N@VH0iRkNBwO=?(+8uXuh9h-2Eo$lcYIBEj?SitNem{
z`fk?R!({w0q1>GLYig>vc%|>P-e+bG!!}M$%l^=PNju@e=CUuXny|FcO$D8UfaE(n
zoi88YyQGL)0Nn`J4y)y?S+U4T(#Q_~>GbSw%f_|2c7_*~*=)+res0`v_9_P~FP~3M
zkO-2EU4!tDzV?e!7n8bpvP$WQx>XnKhE4o$%ihqvI=1l6JNOkzZl{oaZiN1eAjebY
z-RRC4*B&tn<KckVg5kU+4ZBF=g3B`^A7sjt8E1V1y1LXX#}UNcxl0FmY7Zps&eH+W
zqf(slo2~=p_pUV$SQt!Q@7uYXsb?fGw4%Yl^ToxgF?Y*2J-@{*+;dtJP6|)8V*V65
zt)?<mn#93`s8>G`5)u64X{02{%ovweK^rnH_3(1?Tu9eL%z>`1{?6#RABEQDHz&l?
zUX8rdCoi-oSzqf51b%2$TaEZuY#aLt>)DZ1Hjo@dC1iM^t<Ix8E}3(y$Uu@65}?T>
z<orh3mV1U!_~Rn{ONWattNs`(XPEDqEH{$PN=K5GsX);rYsKe|G497hCZObQw-EW_
zSf><fxA3twvB(9holswxI#;U~@58Ur{2f$Pk67zU$}Z^FdVGKJ`bil5qY0(i$cIrA
zsGJX6wLaIin#v4&LNO^9^>|a;M_<M2V)SA%*SJDqy%*Y(P1t>N;)`u<X1^=J{6nR_
z*Nn8-U&?!*Imf*(@j0Z>npI6QdgJZA?X*;|+~}P=++<<1R;L+qx@sl+AejVkX4%%q
z>^wNvfA?eS!Arl#AEhUT{pL&;HY=b^8a=l0LaPM|k8_wOUCX-JMVE|W7dGcq!j$!I
z;`8cmM{izu-FQ7NKqhx6kb3&q{rV&~vcihf4%ElfdX+Boq~3kSYCdE=P{kAYS>I)U
zf)4+XDz>=eM2UiZ`Iw6FK$8E1DF}si(oSg+uNu-zudT8ojHc;U)^6I058v(X>Ty3`
zkFQ?))*PR*odM}9R@1kNN!)q)-4%J_#D{VtIyIACv&rk<HR&WL$ESQVG-A({Hb^Q+
z{J@OfkEF9!^a~1m{L(tIX+<sa38%%DHAR$@Jp;8>(fgumb>5{_x`<;o%*KX$VR0v9
zPLGFk9;8-S#7FjGKkiFTO=GH?D%^EHl)Rw7X}^(t=KaqRW$DUY&7_ZBLSF{7M~tG}
z#-?st(l0it*B;*kzWkt>O8PPFX6a$-2V*PM*raRL?or`n@ZQUB>n?_CxiPz%JbUI;
z;BB0mM_}fDLoaokVRhB2FL)t-IX%7tR(`_tg+*5PcJ{Y7jq`qz@3^LnGD4&ZOsTn#
zLpqIL5R*0v);g*)tAg@g4GmFHX*gOARMIY$iHwcU;N}H~Lmz2#3!7F^O>SktbV#d}
zB8y>pMe@4+dVN0Z?>LcflfQMlbq*)g-(l0rd=Ud4<j6~PO6j@7G1bA&hcS6mWciq5
zs}wu<H0L=-be3@FjB!Q5mSVKeb&OF+Dz?9|o}PBdm%p|+5G;n;TBCBT&V4Jnr}uFM
z&{>5#OT+V+sq_`~Ed{G9ro~jgPfA<Zx(gIWCKjrENUr_KGrLySX+BF2&Um^=mNce%
z5H{@EPE=efg%=%6tUpq5-od-N%0ud8T_rWv{om}a5+esa9FfQ4`%Hrio8Ic)WAU6N
zac5T)79f#3scMR2wrvz<F8nNW(@>yTGo0&u$jI|cm)Td9+jwZUe7<ow7E;ov3^$78
zGL{6_kyd@yra-CZRK`VSccjn53ks^Uk$rBwgn~zgb3y>9N{j7qhH_jDpPGm0l#Z^+
zB))}(P)5w-a1VK~Y2#HUp&CZpBQHSc<r=fP8z8R;DmIBX6trqfU|B6U4h`s}iI=Fq
zy}kTX4Jo1Q(aO}FR6Kq~JM?@RLRG9HL6<ZAwePL-D`#EcJs$Y+YGxDu-YB5Yx<H<}
zk`?1|=Pbfqb;+FFJ<4d=RndVG&VJdCq66Re=exQNUhA{8jh>QCpsafYwsIAj`mlam
zY}&Bu?x*iHQGux)G|c?6p~a?MrS)EPO#)5DlA-(WqiHKUx`1=E?x)n<h79$ShbG?p
zpUowWTucbQ_<FsSH|HsPBvh+)(*Ld!DY&lqX8y8)Vq>+dQN><moNmsU0C^+ic1B)R
zM%Pu`n!co}{FyUDmQ>FZ+hUtIXw<J8+HQR=7gMm~p<Tt5hD)7}N_<onu-^40LE44s
z+Il;|H7PbcC6|aMZJ)KUp`xX`u+0_x)hEs^O+rc7)n!k=Z*=UPh(%9hhKq=rL1{+E
z^Q5YQ=ol7;e4mN-SnY_h!cayIlB>tOPUiGVJ+F)MEhkj>=~jdc(nmQKm~*DEd@4xR
z2fQuV!qwR;Z9hU+DJahyWJpi>bPLqIt-7&u;l79I@gF$q`}`tfel$UlF;WAg28)un
zD60Ma;>cOMjR5bF;Tx?k-t0*vkDUx_<#XzxXKuWG8WO#B6}BCFPD{`=>*M>EH>`wO
zpf&zt)X)8~y|z<I@soEGR_ZvOq(!#s(G++g1|B=UWjk$n>(+9UouKS|X=9y~_cKqP
z1yIC{Wm@tIDSd`3h;^U|onBHXqGOcjb8gMObAe{jjTaV`;myU~BW|g=xEV#gG8NPP
z{HyWzSc;2Rt#$LHi&!f&kZ5K{y$Cw_`!w~?^GP>7PkLv6*i%+8G8w6P*Dx}(>=hvr
zRPI=M3M{{#S^oV4C8g-4!Ic&l)2k+O^nS$-7-0@B2ZO7u9Cax*zKDC9p1ayrKldU4
zn?pY{cg)ro&Yqn63fiHdI2J%qP|#6RQ270*gnU4f;vFNc+NQ%2sI9LQqfRZU>e#K5
zdL=Ye!iqIihi8Pg2=%Dp>zO1tpO8qTpLJ_%dPly0Sa~r+u^-^uiTSm6PnUuGZxdNe
z+TG_q%e<^#`t;WO{?Ie<z$yndd`4`zC*aXQQK)puDL^=5Cu96$T)&zgZPS*E_Kbm>
zW7^{Ej>T4iN7%7rG42WMIhqY}QjG-8l${XXLcW6brS>cV)97z8q|h$=lrRxGDHt06
z`b#?#x^$vdow__Wk4c-U%Rn>tE)S`+*CVX_dS2<6^e&x(hd1sqsUj%49hd-+3-IIU
zeb%C!;+o1rM?h(R`<7K~227MMhO!~g=>$@}+4BF{`tglPU=NL`P#i^_8P^hqZTSsl
zl1taFjBCmV8pgX+#b2wMCn@kUY9-Z`6HJV6sYHsWlFF!WZBY1Y2if!%vyk_Kv@Lt=
z-uet|HI(1S8fq(FI)10XT3*lNeD{u#O-OIMZm`}<a%tOM+uBFg;jUB8`Dnf*@{!g)
zfqZmzLsJ8Vv9}d5$J(QDBJQ>h<fAPL3MpB42Xl-yjtD^GEC_bez>oFKKmY+N4KzY%
zf;Al!aFzsBPbZwdr<MW6(;9=s0%c`rrQA_u09zc<9N=ziW9N)=mj)i;qR97$!=gaI
zkqOaS8hArf2cTf@gag1u;38m<k~_f_3Y4J*NI7BgC_P2x-yq1pq=A-1q611))XmLJ
z#0@55?_?ngK_Zc&V5le*3L;y8oIUJ_=I$UnXWm1IUl@uwXN(iUfk?2o0~}(SqwQUY
z(m)`29`Jj9who$_f56*0|HcBD4^ek>2T_O!Sk%^5^sgSyL?u@;$ZrY#M-OKM@(G}*
z9?sd`#R-E`a>dyZdH)K5#r)y#;NoO+R1Ov+inGDll1-h-Q6YZ|siLN-^M}VF1r`Kb
zha)dC*?+Sn67YYL^|#y(XO7DGYa(R#KXCtM{d?_4#$+o^O_ZWN#^o?QHAQLQVSE(U
z9z(#Qj&2bM93GF9z<}_0s5uCZK!QPNF&q|z$KlXWC?1VPh{OH@rDo?$G`GXx4xz~4
zA_Ovy7z80fc7cG9XmL0Q4hLgE<_HWJgn%K%pjZeL42Prt0-^0hAgj{c=C4^DLSe~J
z;&41dTmpj!!O>!95L_IM1fk*Ni#QICM8eP#;t~=PM^IP{O4;7Y)|}i<f~~m)PSnB9
z;%MTKaFm>mnlun90{(ME$Htt9Cp$<3H3)Vt?te}g5NvV!MDs&7A>v>J3<^bxArJ@%
z81}2|BfRT4Cugz}4>2KN5!f%>!?vKv#gK_LKh!B1;0Tsn3rfKWXHK+tGO)L|kp><@
z01iEm<PDJe)f82NGugu9Q1QQMULWW9>({SGz=m)%1ppk$7G;k46~x)x6^A_vME3hN
zg|RfZv%ry`@81OV`#9l0Gz*3ngGwObVju(>OzyWh0t-T8#PA>-97*n@IbH&WG5<Td
zvpt^ZX6}TOvmjSWu7)h2qiO(xM^p;^-P+9(cgPbM3I~B9Ah4JL1c5>zP%!XiFa!k#
z14aM)C6YA<!9cO(!o*;QB0`9PB%pX02n~bb#V~j*9EXAaJ?Z~Ti4cSV1crhmQBcI+
zOOz5lT)2L3s+8#eYWpvPzpQj*YJQE8S5WeTEc(Za{2OP7O8GCoev{jOF#;L--yr{p
z-+$@)m#%-rz&|qnS6%<o^^X|%N5=oE>;H`|+CTSnI6LwmJvZ`>?T(j5GkLd1g}$bu
zNb&RV{iHGXA$f$xLDkrqyhR*8{2Y@POm-&^QWMoQm8h4GouP-YMUiZT$Xoh2HAOiC
ziN1ljfzWv!#=z#~O6E;os*|jgr;SgF>&~`_yFE;;8_)uW#GcZX<5vZs!Y;~R8~i!}
zJ3VY+^k9BEA7yBiG=O(&Vq|S%o7bj^<$GmUoo682?%2QXy64q;y`bX`7%=D@n)zh*
zBXbbX)Oy0+{z1bNLeh<dKt?~nDb?7M_m#7JamK{@8R~<Ktm>Q*l8eohasti|0Ek>L
zyZ*{Xtn>=q{ZXrqIR|&M3_=q91BFaMborYfRs8qinrg#wTDkrU5{2WW&CjnFUs<->
zRr7{sp6PfCjKsVEw>zc`)?R71HqmAI`JpU_5Z;C1Qxitc?r`I`^E$>{Qca42mOR|k
z9xxtn12^?#TP6h+ld#4?wo?=-T9*tAJHYfWm%e=Q3(W*S)~LB%($LT_MA}l<&mR>o
zCe823bS->F${8mx$v?kwg~Gw~ym7+g!6gcfTz#zZK@{vtsGrne-xoa=N*+aa3u9$n
z7H&F`#J<>uTOudr?&s%ItnKWLzfY%2<D(%Y9dDRYTbcSfAxja<^9)AI&isztG72>%
LEyZH_JAVHIQ(`a<

literal 0
HcmV?d00001