Keine globalen Variablen überschreiben.

[kivitendo-erp.git] / bin / mozilla / am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index e7d7db2..1ebd598 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -94,14 +94,13 @@ sub account_header {
   $form->{description} =~ s/\"/"/g;
 
   if (@{ $form->{TAXKEY} }) {
-    $form->{selecttaxkey} = "<option value=0>Keine Steuer 0%\n";
     foreach $item (@{ $form->{TAXKEY} }) {
-      if ($item->{taxkey} == $form->{taxkey_id}) {
+      if ($item->{tax} == $form->{tax}) {
         $form->{selecttaxkey} .=
-          "<option value=$item->{taxkey} selected>$item->{taxdescription}\n";
+          "<option value=$item->{tax} selected>$item->{taxdescription}\n";
       } else {
         $form->{selecttaxkey} .=
-          "<option value=$item->{taxkey}>$item->{taxdescription}\n";
+          "<option value=$item->{tax}>$item->{taxdescription}\n";
       }
 
     }
@@ -110,8 +109,9 @@ sub account_header {
   $taxkey = qq|
              <tr>
                <th align=right>| . $locale->text('Steuersatz') . qq|</th>
-               <td><select name=taxkey_id>$form->{selecttaxkey}</select></td>
-               <input type=hidden name=selecttaxkey value="$form->{selecttaxkey}">
+               <td><select name=tax>$form->{selecttaxkey}</select></td>
+               <th align=right>| . $locale->text('Gültig ab') . qq|</th>
+                <td><input name=startdate value="$form->{startdate}"></td>
              </tr>|;
 
   if (@{ $form->{NEWACCOUNT} }) {
@@ -1712,6 +1712,9 @@ sub add_buchungsgruppe {
     "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
   AM->get_buchungsgruppe(\%myconfig, \%$form);
+  if ($eur) {
+    $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"};
+  }
 
   &buchungsgruppe_header;
   &form_footer;
@@ -2261,6 +2264,9 @@ sub add_payment {
     "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}"
     unless $form->{callback};
 
+  $form->{terms_netto} = 0;
+  $form->{terms_skonto} = 0;
+  $form->{percent_skonto} = 0;
   &payment_header;
   &form_footer;
 
@@ -2435,10 +2441,6 @@ sub payment_header {
     <th align=right>| . $locale->text('Description') . qq|</th>
     <td><input name=description size=30 value="$form->{description}"></td>
   <tr>
-  <tr>
-    <th align=right>| . $locale->text('Ranking') . qq|</th>
-    <td><input name=ranking size=30 value="$form->{ranking}"></td>
-  <tr>
   <tr>
     <th align=right>| . $locale->text('Long Description') . qq|</th>
     <td><input name=description_long size=50 value="$form->{description_long}"></td>
@@ -3073,40 +3075,40 @@ sub config {
              </tr>
            </table>
          </td>
-       </tr>
-       <tr class=listheading>
-         <th colspan=2>| . $locale->text('Tax Accounts') . qq|</th>
-       </tr>
-       <tr>
-         <td colspan=2>
-           <table>
-             <tr>
-               <th>&nbsp;</th>
-               <th>| . $locale->text('Rate') . qq| (%)</th>
-               <th>| . $locale->text('Number') . qq|</th>
-             </tr>
-|;
-
-  foreach $accno (sort keys %{ $form->{taxrates} }) {
-    print qq|
-              <tr>
-               <th align=right>$form->{taxrates}{$accno}{description}</th>
-               <td><input name=$form->{taxrates}{$accno}{id} size=6 value=$form->{taxrates}{$accno}{rate}></td>
-               <td><input name="taxnumber_$form->{taxrates}{$accno}{id}" value="$form->{taxrates}{$accno}{taxnumber}"></td>
-             </tr>
-|;
-    $form->{taxaccounts} .= "$form->{taxrates}{$accno}{id} ";
-  }
-
-  chop $form->{taxaccounts};
-
-  print qq|
-<input name=taxaccounts type=hidden value="$form->{taxaccounts}">
-
-            </table>
-         </td>
-       </tr>
-      </table>
+       </tr>|;
+#      <tr class=listheading>
+#        <th colspan=2>| . $locale->text('Tax Accounts') . qq|</th>
+#      </tr>
+#      <tr>
+#        <td colspan=2>
+#          <table>
+#            <tr>
+#              <th>&nbsp;</th>
+#              <th>| . $locale->text('Rate') . qq| (%)</th>
+#              <th>| . $locale->text('Number') . qq|</th>
+#            </tr>
+# |;
+# 
+#   foreach $accno (sort keys %{ $form->{taxrates} }) {
+#     print qq|
+#               <tr>
+#              <th align=right>$form->{taxrates}{$accno}{description}</th>
+#              <td><input name=$form->{taxrates}{$accno}{id} size=6 value=$form->{taxrates}{$accno}{rate}></td>
+#              <td><input name="taxnumber_$form->{taxrates}{$accno}{id}" value="$form->{taxrates}{$accno}{taxnumber}"></td>
+#            </tr>
+# |;
+#     $form->{taxaccounts} .= "$form->{taxrates}{$accno}{id} ";
+#   }
+# 
+#   chop $form->{taxaccounts};
+# 
+#   print qq|
+# <input name=taxaccounts type=hidden value="$form->{taxaccounts}">
+# 
+#             </table>
+#        </td>
+#      </tr>
+print qq|      </table>
     </td>
   </tr>
   <tr>