Korrekturen zu r2737: Speichern von Steuern funktionierte nicht, taxnumber mitspeiche...

diff --git a/SL/AM.pm b/SL/AM.pm
index dc6774d..77c67e6 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -2186,25 +2186,27 @@ sub save_tax {
 
   $form->{rate} = $form->{rate} / 100;
 
-  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id} );
+  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, $form->{chart_id}, $form->{chart_id} );
   if ($form->{id}) {
-    $query = qq|UPDATE _tax SET
+    $query = qq|UPDATE tax SET
                   taxkey         = ?,
                   taxdescription = ?,
                   rate           = ?,
-                  chart_id       = ?
+                  chart_id       = ?,
+                  taxnumber      = (SELECT accno FROM chart WHERE id= ? )
                 WHERE id = ?|;
     push(@values, $form->{id});
   } 
   else {
     #ok
-    $query = qq|INSERT INTO _tax (
+    $query = qq|INSERT INTO tax (
                   taxkey,
                   taxdescription,
                   rate,
-                  chart_id
+                  chart_id,
+                  taxnumber
                 )
-                VALUES (?, ?, ?, ? )|;
+                VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?) )|;
   }
   do_query($form, $dbh, $query, @values);
 
@@ -2221,7 +2223,7 @@ sub delete_tax {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  $query = qq|DELETE FROM _tax
+  $query = qq|DELETE FROM tax
               WHERE id = ?|;
   do_query($form, $dbh, $query, $form->{id});
 

diff --git a/templates/webpages/am/edit_tax_de.html b/templates/webpages/am/edit_tax_de.html
index 2925617..3b54ae1 100644 (file)
--- a/templates/webpages/am/edit_tax_de.html
+++ b/templates/webpages/am/edit_tax_de.html
@@ -5,7 +5,7 @@
 
 <table width="100%">
   <tr>
-    <th class="listtop" colspan="2"><TMPL_VAR title> Steuer</th>
+    <th class="listtop" colspan="2">Steuer <TMPL_VAR title></th>
   </tr>
 </table>
 <table width="100%">

diff --git a/templates/webpages/am/edit_tax_master.html b/templates/webpages/am/edit_tax_master.html
index 1b5934c..b1dfd24 100644 (file)
--- a/templates/webpages/am/edit_tax_master.html
+++ b/templates/webpages/am/edit_tax_master.html
@@ -5,7 +5,7 @@
 
 <table width="100%">
   <tr>
-    <th class="listtop" colspan="2"><TMPL_VAR title> <translate>Tax-O-Matic</translate></th>
+    <th class="listtop" colspan="2"><translate>Tax-O-Matic</translate> <TMPL_VAR title></th>
   </tr>
 </table>
 <table width="100%">