From: Sven Schöling <s.schoeling@linet-services.de>
Date: Thu, 6 Mar 2008 15:40:23 +0000 (+0000)
Subject: Aenderung Darstellung Warendialog:
X-Git-Tag: release-2.6.0beta1~192
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=8d316ac574fb30ec29c715332b07504267ac6dd3;p=kivitendo-erp.git

Aenderung Darstellung Warendialog:

Formel und Bemerkung haben jetzt dieselbe Hoehe, und werden nicht kleiner gemacht als 4.
---

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index ec0c58035..6bd04483f 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -33,6 +33,7 @@
 #$locale->text('ea');
 
 use POSIX qw(strftime);
+use List::Util qw(max);
 
 use SL::IC;
 use SL::ReportGenerator;
@@ -1463,6 +1464,7 @@ sub form_header {
   $form->{eur}              = $eur; # config dumps into namespace - yuck
   $form->{pg_keys}          = sub { "$_[0]->{partsgroup}--$_[0]->{id}" };
   $form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1;
+  $form->{notes_rows}       =  max 4, $form->numtextrows($form->{notes}, 40), $form->numtextrows($form->{formel}, 40);
 
   map { $form->{"is_$_"}  = ($form->{item} eq $_) } qw(part service assembly);
   map { $form->{$_}       =~ s/"/&quot;/g;        } qw(unit);
@@ -1470,9 +1472,6 @@ sub form_header {
   $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS', 
                    'partsgroup'    => 'all_partsgroup');
 
-  $rows = 4 if $rows = $form->numtextrows($form->{notes}, 40) < 2;
-  $form->{notes_rows} = $rows;
-
   IC->retrieve_buchungsgruppen(\%myconfig, $form);
   @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} };
 
diff --git a/templates/webpages/ic/form_header_de.html b/templates/webpages/ic/form_header_de.html
index 808953217..1496be708 100644
--- a/templates/webpages/ic/form_header_de.html
+++ b/templates/webpages/ic/form_header_de.html
@@ -131,7 +131,7 @@
               <td>
                <ilayer>
                 <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br>Es muss jeweils die Gesamte Zeile eingegeben werden')">
-                 <textarea name="formel" rows="4" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+                 <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
                </td>
               [%- END %]
              </tr>
diff --git a/templates/webpages/ic/form_header_master.html b/templates/webpages/ic/form_header_master.html
index ccffa1674..8a1c20d47 100644
--- a/templates/webpages/ic/form_header_master.html
+++ b/templates/webpages/ic/form_header_master.html
@@ -131,7 +131,7 @@
               <td>
                <ilayer>
                 <layer onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('<translate>The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br></translate>')">
-                 <textarea name="formel" rows="4" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
+                 <textarea name="formel" rows="[% HTML.escape(notes_rows) %]" cols="30" wrap="soft">[% HTML.escape(formel) %]</textarea></layer></ilayer>
                </td>
               [%- END %]
              </tr>