Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7540)
+++ /controller/wpsg_ShopController.class.php	(revision 7541)
@@ -335,4 +335,5 @@
 
 			$this->arModule['wpsg_mod_versandarten']->install();
+			$this->arModule['wpsg_mod_prepayment']->install();
 			
 			// Versandzone anlegen
Index: /mods/wpsg_mod_rechnungen.class.php
===================================================================
--- /mods/wpsg_mod_rechnungen.class.php	(revision 7540)
+++ /mods/wpsg_mod_rechnungen.class.php	(revision 7541)
@@ -294,9 +294,9 @@
 			$this->shop->update_option("wpsg_mod_rechnungen_auto", $_REQUEST['wpsg_mod_rechnungen_auto'], false, false, WPSG_SANITIZE_VALUES, ['0', '1', '2']);
 			$this->shop->update_option("wpsg_rechnungen_logo_position", wpsg_getStr($wpsg_rechnungen_logo_position));
-			$this->shop->update_option("wpsg_rechnungen_logo_transparency", $_REQUEST['wpsg_rechnungen_logo_transparency'], false, false, WPSG_SANITIZE_FLOAT);
+			$this->shop->update_option("wpsg_rechnungen_logo_transparency", $_REQUEST['wpsg_rechnungen_logo_transparency'], false, false, WPSG_SANITIZE_FLOAT, ['allowEmpty' => true]);
 			$this->shop->update_option("wpsg_rechnungen_faelligkeit", $_REQUEST['wpsg_rechnungen_faelligkeit'],false, false, WPSG_SANITIZE_FLOAT);
 			$this->shop->update_option('wpsg_rechnungen_pdfperpage', $_REQUEST['wpsg_rechnungen_pdfperpage'], false, false, WPSG_SANITIZE_TEXTFIELD);
 			$this->shop->update_option("wpsg_rechnungen_pbeschreibung", $_REQUEST['wpsg_rechnungen_pbeschreibung'], false, false, WPSG_SANITIZE_CHECKBOX);
-			$this->shop->update_option("wpsg_rechnungen_produktattribute", $_REQUEST['wpsg_rechnungen_produktattribute'], false, false, WPSG_SANITIZE_CHECKBOX);
+			$this->shop->update_option("wpsg_rechnungen_produktattribute", $_REQUEST['wpsg_rechnungen_produktattribute'], false, false, WPSG_SANITIZE_CHECKBOX, ['allowEmpty' => true]);
 			$this->shop->update_option("wpsg_mod_rechnungen_showgutschriftrechnung", $_REQUEST['wpsg_mod_rechnungen_showgutschriftrechnung'], false, false, WPSG_SANITIZE_CHECKBOX);
 			$this->shop->update_option('wpsg_mod_rechnungen_anr', $_REQUEST['wpsg_mod_rechnungen_anr'], false, false, WPSG_SANITIZE_INT);
Index: /views/mods/mod_deliverynote/order_view_content.phtml
===================================================================
--- /views/mods/mod_deliverynote/order_view_content.phtml	(revision 7540)
+++ /views/mods/mod_deliverynote/order_view_content.phtml	(revision 7541)
@@ -69,7 +69,10 @@
 													
 							$wpsg_mod_deliverynote_footer = $this->get_option("wpsg_mod_deliverynote_footer");
-		 					if (!is_array($wpsg_mod_deliverynote_footer)) $wpsg_mod_deliverynote_footer = unserialize($this->get_option("wpsg_mod_deliverynote_footer"));
+		 					
+							if (!is_array($wpsg_mod_deliverynote_footer)) $wpsg_mod_deliverynote_footer = unserialize($this->get_option("wpsg_mod_deliverynote_footer"));
 							if (!is_array($wpsg_mod_deliverynote_footer)) $wpsg_mod_deliverynote_footer = Array();
-		
+							
+							$default = $this->get_option('wpsg_mod_deliverynote_foottext_standard');							
+							
 						?>
 												
@@ -77,5 +80,5 @@
 						<select style="width:300px; float:right;" name="wpsg_mod_deliverynote_select" id="wpsg_mod_deliverynote_select" onchange="jQuery('#wpsg_mod_deliverynote_fusstext').val(this.value);">
 							<?php foreach ($wpsg_mod_deliverynote_footer as $k => $v) { ?>
-							<option <?php echo (($this->get_option('wpsg_mod_deliverynote_foottext_standard') == $k)?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
+							<option <?php echo ((intval($default) === intval($k))?'selected="selected"':''); ?> value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
 							<?php } ?>
 						</select>
Index: /views/mods/mod_rechnungen/order_view.phtml
===================================================================
--- /views/mods/mod_rechnungen/order_view.phtml	(revision 7540)
+++ /views/mods/mod_rechnungen/order_view.phtml	(revision 7541)
@@ -235,7 +235,10 @@
 
                         $wpsg_rechnungen_footer = $this->get_option("wpsg_rechnungen_footer");
+                        
                         if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = unserialize($this->get_option("wpsg_rechnungen_footer"));
                         if (!is_array($wpsg_rechnungen_footer)) $wpsg_rechnungen_footer = Array();
 
+                        $default = $this->get_option('wpsg_rechnungen_foottext_standard');
+                         
                     ?>
 
@@ -243,5 +246,5 @@
                     <select style="width:300px; float:right;" id="wpsg_rechnungen_select" onchange="jQuery('#wpsg_rechnungen_fusstext').val(this.value);">
                         <?php foreach ($wpsg_rechnungen_footer as $k => $v) { ?>
-                        <option value="<?php echo wpsg_hspc($v[1]); ?>"><?php echo wpsg_hspc($v[0]); ?></option>
+                        <option value="<?php echo wpsg_hspc($v[1]); ?>" <?php echo ((intval($default) === intval($k))?'selected="selected"':''); ?>><?php echo wpsg_hspc($v[0]); ?></option>
                         <?php } ?>
                     </select>