Merge von 635 aus unstable: Formulare

Ueber die Variable <%tax_rate%> kann nun in den Druckvorlagen der Steuersatz einer Zeile mit ausgegeben werden.

diff --git a/SL/IS.pm b/SL/IS.pm
index 8664b994e1b5768d0921d629954b0462231e1eb0..c5950b15a7475ad35c3f30201a436b1d50dce778 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -214,7 +214,8 @@ sub invoice_details {
           $taxbase{$item} += $taxbase;
         }
       }
           $taxbase{$item} += $taxbase;
         }
       }

-
+      $tax_rate = $taxrate*100;
+      push(@{ $form->{tax_rate} }, qq|$tax_rate|);

       if ($form->{"assembly_$i"}) {
         $sameitem = "";
 
       if ($form->{"assembly_$i"}) {
         $sameitem = "";
 

diff --git a/SL/OE.pm b/SL/OE.pm
index d5d1aa7ba6f82d9eff518927ee0d614106571a34..cf20a1b07f902f35cdb1a773ff9c3f71f56c9e6d 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -857,6 +857,9 @@ sub order_details {
         }
       }
 
         }
       }
 

+      $tax_rate = $taxrate*100;
+      push(@{ $form->{tax_rate} }, qq|$tax_rate|);
+

       if ($form->{"assembly_$i"}) {
         $sameitem = "";
 
       if ($form->{"assembly_$i"}) {
         $sameitem = "";