Korrekturen

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6283 0d5edaf7-2b12-4e95-93f4-047927463d4b

10 files changed, 10 insertions, 15 deletions

diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml
index 6a6527c..d3127c3 100644
--- a/views/admin/extended.phtml
+++ b/views/admin/extended.phtml
@@ -54,5 +54,4 @@
 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 	

 	</form>

-</div>

-  
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/views/admin/hilfe.phtml b/views/admin/hilfe.phtml
index 24859fc..9e75985 100644
--- a/views/admin/hilfe.phtml
+++ b/views/admin/hilfe.phtml
@@ -87,5 +87,4 @@
 	); ?>

 	<?php echo wpsg_drawForm_AdminboxEnd(); ?>

 			

-</div>

-	
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/views/admin/includes.phtml b/views/admin/includes.phtml
index 50e58e5..22eb1c3 100644
--- a/views/admin/includes.phtml
+++ b/views/admin/includes.phtml
@@ -35,4 +35,4 @@
 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 		

 	</form>

-</div>

+</div>
\ No newline at end of file
diff --git a/views/admin/kundendaten_tab1.phtml b/views/admin/kundendaten_tab1.phtml
index d11e4f0..4c4ff1d 100644
--- a/views/admin/kundendaten_tab1.phtml
+++ b/views/admin/kundendaten_tab1.phtml
@@ -26,5 +26,4 @@
 <?php echo wpsg_drawForm_Select('pflicht[plz]', __('Postleitzahl', 'wpsg'), $arSelect, $this->view['pflicht']['plz'])?>

 <?php echo wpsg_drawForm_Select('pflicht[ort]', __('Ort', 'wpsg'), $arSelect, $this->view['pflicht']['ort'])?>

 <?php echo wpsg_drawForm_Select('pflicht[land]', __('Land', 'wpsg'), $arSelect, $this->view['pflicht']['land'])?>

-<?php echo wpsg_drawForm_Select('pflicht[ustidnr]', __('UStIdNr.', 'wpsg'), $arSelect, $this->view['pflicht']['ustidnr'])?>

- 

+<?php echo wpsg_drawForm_Select('pflicht[ustidnr]', __('UStIdNr.', 'wpsg'), $arSelect, $this->view['pflicht']['ustidnr'])?>
\ No newline at end of file
diff --git a/views/admin/kundendaten_tab3.phtml b/views/admin/kundendaten_tab3.phtml
index 815a37b..6c9016f 100644
--- a/views/admin/kundendaten_tab3.phtml
+++ b/views/admin/kundendaten_tab3.phtml
@@ -14,5 +14,4 @@
 <?php echo wpsg_drawForm_Select('wpsg_customerpreset_title', __('Standardanrede', 'wpsg'), $this->view['arTitle'], $this->get_option('wpsg_customerpreset_title'), array( 'help' => 'wpsg_customerpreset_title',

 	'hint' => 'nohspc_'.wpsg_translate(__('Die Auswahl kann in den <a href="#1#">Kundendaten</a> definiert werden.', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=kundendaten'),

 	'noIndex' => true 

-)); ?>

-	

+)); ?>
\ No newline at end of file
diff --git a/views/admin/laender_list.phtml b/views/admin/laender_list.phtml
index 8551f7c..e887dbd 100644
--- a/views/admin/laender_list.phtml
+++ b/views/admin/laender_list.phtml
@@ -83,5 +83,4 @@
 
 <?php } else { ?>
     <p><?php echo __('Noch keine Länder angelegt.', 'wpsg'); ?></p>
-<?php } ?>
-
+<?php } ?>
\ No newline at end of file
diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml
index 164a0c8..93ef855 100644
--- a/views/admin/ueber.phtml
+++ b/views/admin/ueber.phtml
@@ -132,4 +132,4 @@
 <?php } ?>

 

 

-</div>

+</div>
\ No newline at end of file
diff --git a/views/admin/widerrufsbelehrung.phtml b/views/admin/widerrufsbelehrung.phtml
index 3f1e805..8cb9f7b 100644
--- a/views/admin/widerrufsbelehrung.phtml
+++ b/views/admin/widerrufsbelehrung.phtml
@@ -59,4 +59,4 @@
 		<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit" /></p>

 

 	</form>

-</div>

+</div>
\ No newline at end of file
diff --git a/views/mailtemplates/adminmail.phtml b/views/mailtemplates/adminmail.phtml
index aea3f82..47719ef 100644
--- a/views/mailtemplates/adminmail.phtml
+++ b/views/mailtemplates/adminmail.phtml
@@ -78,4 +78,4 @@
 

 <?php if ($this->view['basket']['checkout']['comment'] != '') { ?>

 <?php echo __('Bestellkommentar', 'wpsg') ?>: <?php echo $this->view['basket']['checkout']['comment'] ?>

-<?php }?>

+<?php }?>
\ No newline at end of file
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index b9a1b5d..47ec7ec 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -849,7 +849,7 @@
 		//$shipping_adress .= $this->view['data']['shipping_land']['kuerzel'].'-';

 		

 		$shipping_adress .= $this->view['data']['shipping_plz'].' '.$this->view['data']['shipping_ort']."\r\n";

-		$shipping_adress .= $this->view['data']['shipping_land']['name'];

+		$shipping_adress .= $this->view['data']['shipping_land'];		//['name'];

 		

 		

 		$start = $pdf->getY();