From: Udo Spallek <info@wissensvermittlung.com>
Date: Thu, 23 Nov 2006 07:26:46 +0000 (+0000)
Subject: Repaired calculation display  of formula in goods and services.
X-Git-Tag: release-2.4.0^2~195
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7f820f8f8e6634a1a20325e21afd6971bfc85276;p=kivitendo-erp.git

Repaired calculation display  of formula in goods and services.
locale/de need to be fixed...
---

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 51be87c0c..d190a4887 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -2494,7 +2494,6 @@ sub form_header {
 
   $formel =
     qq|<ilayer><layer  onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('| . $locale->text('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><br>For alu article:<br>Length:<br>Weight/m:<br>Length ist total length of article and weight/m ist the weight pro meter') . qq|')"><textarea name=formel rows=4 cols=60 wrap=soft>$form->{formel}</textarea></layer><ilayer>|;
-  $formel = "";
     $imagelinks = qq|
   <tr>
     <td>
@@ -2634,11 +2633,15 @@ sub form_header {
               </td>
               <tr>
                 <th align="left">| . $locale->text('Notes') . qq|</th>
+                <th align="left">| . $locale->text('Formula') . qq|</th>
               </tr>
               <tr>
                 <td>
                   $notes
                 </td>
+                <td>
+                  $formel
+                </td>
               </tr>
               <tr>
                 <td colspan=2>
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b71ca90b7..3cb1e82c4 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -300,7 +300,7 @@ sub display_row {
     $column_data{qty} =
         qq|<td align=right><input name="qty_$i" size=5 value=|
       . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|>|;
-    if ($form->{formel}) {
+    if ($form->{"formel_$i"}) {
     $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>
           <input type=hidden name="formel_$i" value="$form->{"formel_$i"}"><input type=hidden name="alu_$i" value="$form->{"alu_$i"}"></td>|;
     }
diff --git a/templates/webpages/generic/calculate_qty_de.html b/templates/webpages/generic/calculate_qty_de.html
index a5e110a68..c87570efd 100644
--- a/templates/webpages/generic/calculate_qty_de.html
+++ b/templates/webpages/generic/calculate_qty_de.html
@@ -38,7 +38,7 @@
  </form>
 
  <script type="text/javascript">
-  //<!--
+  <!--//
       function calculate_qty() {
         <TMPL_LOOP NAME=VARIABLES>
         var <TMPL_VAR NAME=name> = document.getElementsByName("<TMPL_VAR NAME=name>")[0].value.replace(/,/g, ".");
diff --git a/templates/webpages/generic/calculate_qty_master.html b/templates/webpages/generic/calculate_qty_master.html
index e2149ff7c..fd20af32e 100644
--- a/templates/webpages/generic/calculate_qty_master.html
+++ b/templates/webpages/generic/calculate_qty_master.html
@@ -38,7 +38,7 @@
  </form>
 
  <script type="text/javascript">
-  //<!--
+  <!--//
       function calculate_qty() {
         <TMPL_LOOP NAME=VARIABLES>
         var <TMPL_VAR NAME=name> = document.getElementsByName("<TMPL_VAR NAME=name>")[0].value.replace(/,/g, ".");