Index: /views/mods/mod_deliverytime/basket_row.phtml
===================================================================
--- /views/mods/mod_deliverytime/basket_row.phtml	(revision 5666)
+++ /views/mods/mod_deliverytime/basket_row.phtml	(revision 5669)
@@ -9,8 +9,9 @@
 	<td colspan="1"><?php echo __('Lieferzeit', 'wpsg'); ?>:</td>
 	<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>" class="wpsg_cell_deliverytime_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">
-		<?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) || $this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 */ ?>
-			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime']; ?>
-		<?php } else {?>
-			<?php echo wpsg_translate(__('sofort lieferbar', 'wpsg')); ?>
+		<?php if ($this->view['data']['wpsg_mod_deliverytime_deliverytime'] >= '1') { /* Lieferzeit > 0 im Produkte */ ?>
+ 			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime']; ?>
+		<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 Global */ ?>
+		<?php } else { /*Sonst sofort lieferbar*/ ?>
+ 			<?php echo wpsg_translate(__('sofort lieferbar', 'wpsg')); ?>
 		<?php } ?>
 	</td>
Index: /views/mods/mod_deliverytime/overview_row.phtml
===================================================================
--- /views/mods/mod_deliverytime/overview_row.phtml	(revision 5666)
+++ /views/mods/mod_deliverytime/overview_row.phtml	(revision 5669)
@@ -8,11 +8,12 @@
 <tr class="wpsg_<?php echo (($this->view['i'] % 2 == 0)?'odd':'even'); ?>">
 	<td><?php echo __('Lieferzeit', 'wpsg'); ?>:</td>
-	<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'2':'1'); ?>" class="wpsg_cell_deliverytime_value">
-		<?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) || $this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 */ ?>
-				<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime']; ?>
-		<?php } else {?>
-			<?php echo wpsg_translate(__('sofort lieferbar','wpsg')); ?>
-	<?php } ?>
-	</td>
+	<td colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'3':'2'); ?>" class="wpsg_cell_deliverytime_value" colspan="<?php echo ((sizeof($this->view['basket']['mwst']) > 1 || $this->get_option('wpsg_showMwstAlways') == '1')?'4':'3'); ?>">
+		<?php if ($this->view['data']['wpsg_mod_deliverytime_deliverytime'] >= '1') { /* Lieferzeit > 0 im Produkte */ ?>
+ 			<?php echo $this->view['wpsg_mod_deliverytime']['deliverytime']; ?>
+		<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 Global */ ?>
+		<?php } else { /*Sonst sofort lieferbar*/ ?>
+ 			<?php echo wpsg_translate(__('sofort lieferbar', 'wpsg')); ?>
+		<?php } ?>
+	</td>	
 </tr>
 
Index: /views/produkttemplates/standard.phtml
===================================================================
--- /views/produkttemplates/standard.phtml	(revision 5666)
+++ /views/produkttemplates/standard.phtml	(revision 5669)
@@ -139,6 +139,7 @@
 				
 					<div class="wpsg_mod_deliverytime">
-						<?php if (($this->view['data']['wpsg_mod_deliverytime_deliverytime']) || $this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 */ ?>
+						<?php if ($this->view['data']['wpsg_mod_deliverytime_deliverytime'] >= '1') { /* Lieferzeit > 0 im Produkte */ ?>
 							<?php echo wpsg_translate(__('Lieferzeit: #1#', 'wpsg'), $this->callMod('wpsg_mod_deliverytime', 'getProductDeliveryTime', array($this->view['data']['id']))); ?>
+						<?php } else if ($this->get_option('wpsg_mod_deliverytime_mode_days_default') >= '1') { /* Lieferzeit > 0 Global */ ?>
 						<?php } else { /* Lieferzeit = 0 */ ?>
 							<?php echo wpsg_translate(__('Lieferzeit: sofort lieferbar', 'wpsg')); ?>