From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 14 Nov 2007 09:11:01 +0000 (+0000)
Subject: Automatischen Zeilenumbruch in bestimmten Tabellenzellen in Einkaufs- und Verkaufsmas... 
X-Git-Tag: release-2.6.0beta1~410
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2e7ea276960b1643001276199f6ce48cd6a5aca7;p=kivitendo-erp.git

Automatischen Zeilenumbruch in bestimmten Tabellenzellen in Einkaufs- und Verkaufsmasken verhindern.
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 7b97beb43..2d8169dbe 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -142,7 +142,8 @@ sub display_row {
   $deliverydate  = $locale->text('Required by');
 
   # special alignings
-  my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal);
+  my %align  = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal);
+  my %nowrap = map { $_ => 1 }       qw(description unit);
 
   $form->{marge_total}           = 0;
   $form->{sellprice_total}       = 0;
@@ -249,7 +250,7 @@ sub display_row {
     $column_data{linetotal}   = $form->format_amount(\%myconfig, $linetotal, 2);
     $column_data{bin}         = $form->{"bin_$i"};
 
-    my @ROW1 = map { value => $column_data{$_}, align => $align{$_} }, @column_index;
+    my @ROW1 = map { value => $column_data{$_}, align => $align{$_}, nowrap => $nowrap{$_} }, @column_index;
 
     # second row
     my @ROW2 = ();
diff --git a/templates/webpages/oe/sales_order_de.html b/templates/webpages/oe/sales_order_de.html
index f5eabde9c..b34efdaba 100644
--- a/templates/webpages/oe/sales_order_de.html
+++ b/templates/webpages/oe/sales_order_de.html
@@ -11,7 +11,7 @@
 
    [% FOREACH row = ROWS %]
      <tr valign="top" class="listrow[% loop.count % 2 %]">[% FOREACH row1 = row.ROW1 %]
-      <td align="[% row1.align %]">[% row1.value %]</td>[% END %]
+      <td align="[% row1.align %]"[% IF row1.nowrap %] nowrap[% END %]>[% row1.value %]</td>[% END %]
      </tr>
 
      [% FOREACH hidden = row.HIDDENS %][% hidden.value %]
diff --git a/templates/webpages/oe/sales_order_master.html b/templates/webpages/oe/sales_order_master.html
index b70965240..55f0766d1 100644
--- a/templates/webpages/oe/sales_order_master.html
+++ b/templates/webpages/oe/sales_order_master.html
@@ -11,7 +11,7 @@
 
    [% FOREACH row = ROWS %]
      <tr valign="top" class="listrow[% loop.count % 2 %]">[% FOREACH row1 = row.ROW1 %]
-      <td align="[% row1.align %]">[% row1.value %]</td>[% END %]
+      <td align="[% row1.align %]"[% IF row1.nowrap %] nowrap[% END %]>[% row1.value %]</td>[% END %]
      </tr>
 
      [% FOREACH hidden = row.HIDDENS %][% hidden.value %]