Automatischen Zeilenumbruch in bestimmten Tabellenzellen in Einkaufs- und Verkaufsmas...

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 7b97beb43c0fcef7bab9d88382e9b61024fc4e80..2d8169dbe39c811a7b5f7598ec331653bb6cfc6f 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -142,7 +142,8 @@ sub display_row {
   $deliverydate  = $locale->text('Required by');
 
   # special alignings
   $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;
 
   $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"};
 
     $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 = ();
 
     # second row
     my @ROW2 = ();

diff --git a/templates/webpages/oe/sales_order_de.html b/templates/webpages/oe/sales_order_de.html
index f5eabde9c62450b0f1882994d84ca91637931f9f..b34efdaba7d66063b847215a8b12fe783b0a70b9 100644 (file)
--- 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 %]
 
    [% 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 %]
      </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 b70965240c9ccbe4702fbe1d5e033594a54a6c8e..55f0766d12f9349b178b2eae3efec85ba269cb49 100644 (file)
--- 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 %]
 
    [% 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 %]
      </tr>
 
      [% FOREACH hidden = row.HIDDENS %][% hidden.value %]