Merge von 753,754,755 aus unstable: Bugfix Preisgruppen

753
-Nachtrag zu Bug 154 - Firefox ignoriert rechten Rand/Rahmen bei Berichte->BWA
Dank an Sven
754
-Einmal quoting hinzugefuegt, und einmal ueberfluessige Newlines in den Variablen entfernt
755
-Zeilenanzahl der Preisgruppen im Dialog Stammdaten->Dienstleistung erfassen gefixt.

diff --git a/SL/Form.pm b/SL/Form.pm
index f6e3bf2..c163532 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -877,6 +877,7 @@ sub parse_template {
     }
 
     s/<%(.+?)%>/$self->{$1}/g;
+    s/<nobr><\/nobr>/&nbsp;/g;
     print OUT;
   }
 

diff --git a/SL/IC.pm b/SL/IC.pm
index eb230ef..fd8a230 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -163,7 +163,7 @@ sub get_part {
       $form->{"price_$i"} =
         $form->format_amount($myconfig, $form->{"price_$i"}, 5);
       $form->{"pricegroup_id_$i"} = "$name->{id}";
-      $form->{"pricegroup_$i"}    = "$name->{pricegroup}\n";
+      $form->{"pricegroup_$i"}    = "$name->{pricegroup}";
       $i++;
     }
   }
@@ -263,7 +263,7 @@ sub get_pricegroups {
       $form->{"price_$i"} =
         $form->format_amount($myconfig, $form->{"price_$i"}, 5);
       $form->{"pricegroup_id_$i"} = "$name->{id}";
-      $form->{"pricegroup_$i"}    = "$name->{pricegroup}\n";
+      $form->{"pricegroup_$i"}    = "$name->{pricegroup}";
       $i++;
     }
   }

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index f5e581d..daddf6a 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -3042,7 +3042,7 @@ sub price_row {
   for $i (1 .. $numrows) {
     print qq|
         <tr>
-          <td width=50%><input type=hidden name="pricegroup_$i" size=30  value=$form->{"pricegroup_$i"}>$form->{"pricegroup_$i"}</td>
+          <td width=50%><input type=hidden name="pricegroup_$i" size=30  value="$form->{"pricegroup_$i"}">$form->{"pricegroup_$i"}</td>
           <td width=50%><input name="price_$i" size=11 value="$form->{"price_$i"}"></td>
           <input type=hidden name="pricegroup_id_$i" value="$form->{"pricegroup_id_$i"}">
         </tr>

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 22acf97..c704209 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -826,7 +826,7 @@ sub display_form {
     $subroutine = "assembly_row";
   }
   if ($form->{item} eq 'service') {
-    $numrows    = ++$form->{price_rows};
+    $numrows    = $form->{price_rows};
     $subroutine = "price_row";
 
     &{$subroutine}($numrows);