Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 8099)
+++ /controller/wpsg_ShopController.class.php	(revision 8100)
@@ -1181,6 +1181,6 @@
 					$b = call_user_func_array(array($m, $func_name), $arParam);
 
-					if ($b == -1) break;
-					else if ($b == -2) {
+					if ($b === -1) break;
+					else if ($b === -2) {
 					
 						if ($fixView) $this->view = $view;
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 8099)
+++ /lib/wpsg_calculation.class.php	(revision 8100)
@@ -1434,4 +1434,16 @@
             
         }
+
+		public function setWeight($weight) {
+
+			$this->dWeight = $weight;
+			
+		}
+
+		public function getWeight() {
+			
+			return $this->dWeight;
+			
+		}
 	
 		/**
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 8099)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 8100)
@@ -1137,4 +1137,5 @@
 						'menge' => $order_product_info['amount'],
 						'price' => $oOrderProduct->getPrice($tax_view),
+						'weight' => $oOrderProduct->weight,
 						'anr' => $oOrderProduct->getProduct()->getNr(), 
 						'mwst_value' => $oOrder->getInvoiceCountry()->getTax($oOrderProduct->getTaxKey()),
@@ -1145,4 +1146,6 @@
 						'beschreibung' => $oOrderProduct->getDescription()						
 					];
+
+					$sum['weight_gesamt'] += $p['weight'];
 					
 					// Übersetzung
@@ -1166,4 +1169,6 @@
 				
 			}
+
+			$oCalculation->setWeight($sum['weight_gesamt']); // Gesamtgewicht des Warenkrobs setzen
 			
 			$this->shop->view['basket'] = [
@@ -1415,4 +1420,5 @@
 						'menge' => $order_product_info['amount'],
 						'price' => $oOrderProduct->getPrice($tax_view),
+						'weight' => $oOrderProduct->weight,
 						'anr' => $oOrderProduct->getProduct()->getNr(), 
 						'mwst_value' => $oOrder->getInvoiceCountry()->getTax($oOrderProduct->getTaxKey()),
@@ -1423,4 +1429,6 @@
 						'beschreibung' => $oOrderProduct->getDescription()						
 					];
+
+					$sum['weight_gesamt'] += $p['weight'];
 					
 					if ($oCalculationOrder->getTaxMode() === \wpsg\wpsg_calculation::TAXMODE_B2B) {
@@ -1451,4 +1459,6 @@
 				
 			}
+
+			$oCalculation->setWeight($sum['weight_gesamt']);
 							
 			if (($_REQUEST['wpsg_rechnungen_shippay']??'0') === '1') {