Kreditoren-, Debitoren- und Dialogbuchenmasken:

1. Die Checkboxen "Korrektur" entfernt.
2. Die Eingabezeilen für den Steuerbetrag in einfache Anzeigen des von Lx-Office ausgerechneten Steuerbetrages umgewandelt.

Grund ist, dass Steuern, die mit "Korrektur" eingegeben wurden und nicht exakt dem Steuersatz entsprachen, die zum ausgewählten Steuerschlüssel gehörten, dafür gesorgt haben, dass diese Transaktion nicht über die DATEV-Schnittstelle exportiert werden kann.

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 30453f61983ef3ee329e2cf36f4058f7fa17acb4..1adf6b317d42861ba7aa2a2bbc0d0687ef99fe22 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -498,8 +498,6 @@ $jsscript
     . $locale->text('Amount') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
     . $locale->text('Amount') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>

-          <th class=listheading style="width:5%">|
-    . $locale->text('Korrektur') . qq|</th>

           <th class=listheading style="width:10%">|
     . $locale->text('Taxkey') . qq|</th>
           <th class=listheading style="width:10%">|
           <th class=listheading style="width:10%">|
     . $locale->text('Taxkey') . qq|</th>
           <th class=listheading style="width:10%">|


@@ -555,8 +553,6 @@ $jsscript
                            '-default' => $selected_taxchart))
       . qq|</td>|;
 
                            '-default' => $selected_taxchart))
       . qq|</td>|;
 

-    my $korrektur = $form->{"korrektur_$i"} ? 'checked' : '';
-

     my $projectnumber =
       NTI($cgi->popup_menu('-name' => "project_id_$i",
                            '-values' => \@project_values,
     my $projectnumber =
       NTI($cgi->popup_menu('-name' => "project_id_$i",
                            '-values' => \@project_values,


@@ -567,8 +563,7 @@ $jsscript
        <tr>
           <td>$selectAP_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
        <tr>
           <td>$selectAP_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>

-          <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
-          <td><input type="checkbox" name="korrektur_$i" value="1" "$korrektur"></td>
+          <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>

           $tax
           <td>$projectnumber</td>
        </tr>
           $tax
           <td>$projectnumber</td>
        </tr>


@@ -869,17 +864,15 @@ sub update {
     if ($form->{"amount_$i"}) {
       push @a, {};
       $j = $#a;
     if ($form->{"amount_$i"}) {
       push @a, {};
       $j = $#a;

-      if (!$form->{"korrektur_$i"}) {
-        ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-        if ($taxkey > 1) {
-          if ($form->{taxincluded}) {
-            $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
-          } else {
-            $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
-          }
+      ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+      if ($taxkey > 1) {
+        if ($form->{taxincluded}) {
+          $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;

         } else {
         } else {

-          $form->{"tax_$i"} = 0;
+          $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;

         }
         }

+      } else {
+        $form->{"tax_$i"} = 0;

       }
       $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
 
       }
       $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
 

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index efd4c32452df41cd0662297669f333806b8051a0..9320bfaf92baf90ea5879a94ab999c51b388fb57 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -214,7 +214,7 @@ sub form_header {
   my ($title, $readonly, $exchangerate, $rows);
   my ($taxincluded, $notes, $department, $customer, $employee, $amount, $project);
   my ($jsscript, $button1, $button2, $onload);
   my ($title, $readonly, $exchangerate, $rows);
   my ($taxincluded, $notes, $department, $customer, $employee, $amount, $project);
   my ($jsscript, $button1, $button2, $onload);

-  my ($selectAR_amount, $selectAR_paid, $korrektur_checked, $ARselected, $tax);
+  my ($selectAR_amount, $selectAR_paid, $ARselected, $tax);

   my (@column_index, %column_data);
 
 
   my (@column_index, %column_data);
 
 


@@ -544,8 +544,6 @@ $jsscript
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
           <th class=listheading style="width:5%">|
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
           <th class=listheading style="width:5%">|

-    . $locale->text('Korrektur') . qq|</th>
-          <th class=listheading style="width:10%">|

     . $locale->text('Taxkey') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Project') . qq|</th>
     . $locale->text('Taxkey') . qq|</th>
           <th class=listheading style="width:10%">|
     . $locale->text('Project') . qq|</th>


@@ -600,8 +598,6 @@ $jsscript
                            '-default' => $selected_taxchart))
       . qq|</td>|;
 
                            '-default' => $selected_taxchart))
       . qq|</td>|;
 

-    $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : '');
-

     my $projectnumber =
       NTI($cgi->popup_menu('-name' => "project_id_$i",
                            '-values' => \@project_values,
     my $projectnumber =
       NTI($cgi->popup_menu('-name' => "project_id_$i",
                            '-values' => \@project_values,


@@ -612,8 +608,7 @@ $jsscript
        <tr>
           <td>$selectAR_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>
        <tr>
           <td>$selectAR_amount</td>
           <td><input name="amount_$i" size=10 value=$form->{"amount_$i"}></td>

-          <td><input name="tax_$i" size=10 value=$form->{"tax_$i"}></td>
-          <td><input type="checkbox" name="korrektur_$i" value="1" $korrektur_checked></td>
+          <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>

           $tax
           <td>$projectnumber</td>
        </tr>
           $tax
           <td>$projectnumber</td>
        </tr>


@@ -932,17 +927,15 @@ sub update {
     if ($form->{"amount_$i"}) {
       push @a, {};
       my $j = $#a;
     if ($form->{"amount_$i"}) {
       push @a, {};
       my $j = $#a;

-      if (!$form->{"korrektur_$i"}) {
-        my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-        if ($taxkey > 1) {
-          if ($form->{taxincluded}) {
-            $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;
-          } else {
-            $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;
-          }
+      my ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+      if ($taxkey > 1) {
+        if ($form->{taxincluded}) {
+          $form->{"tax_$i"} = $form->{"amount_$i"} / ($rate + 1) * $rate;

         } else {
         } else {

-          $form->{"tax_$i"} = 0;
+          $form->{"tax_$i"} = $form->{"amount_$i"} * $rate;

         }
         }

+      } else {
+        $form->{"tax_$i"} = 0;

       }
       $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
 
       }
       $form->{"tax_$i"} = $form->round_amount($form->{"tax_$i"}, 2);
 

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index 0f5f944528ae8f194ae4a81e0beac7e9ed799dee..075a397d858ecaa3b58e310f76ff4fc9e335daf1 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -701,22 +701,20 @@ sub update {
         $form->{"taxchart_$i"} = "0--0.00";
         $form->{"tax_$i"}      = 0;
       }
         $form->{"taxchart_$i"} = "0--0.00";
         $form->{"tax_$i"}      = 0;
       }

-      if (!$form->{"korrektur_$i"}) {
-        ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-        if ($taxkey > 1) {
-          if ($debitcredit) {
-            $debittax = 1;
-          } else {
-            $credittax = 1;
-          }
-          if ($form->{taxincluded}) {
-            $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
-          } else {
-            $form->{"tax_$i"} = $amount * $rate;
-          }
+      ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+      if ($taxkey > 1) {
+        if ($debitcredit) {
+          $debittax = 1;
+        } else {
+          $credittax = 1;
+        }
+        if ($form->{taxincluded}) {
+          $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;

         } else {
         } else {

-          $form->{"tax_$i"} = 0;
+          $form->{"tax_$i"} = $amount * $rate;

         }
         }

+      } else {
+        $form->{"tax_$i"} = 0;

       }
 
       for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
       }
 
       for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }


@@ -862,8 +860,6 @@ sub display_rows {
       . qq|</td>|;
 
     if ($init) {
       . qq|</td>|;
 
     if ($init) {

-      $korrektur =
-        qq|<td><input type="checkbox" name="korrektur_$i" value="1"></td>|;

       if ($form->{transfer}) {
         $fx_transaction = qq|
         <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>
       if ($form->{transfer}) {
         $fx_transaction = qq|
         <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>


@@ -898,14 +894,9 @@ sub display_rows {
       <td><input type=hidden name="fx_transaction_$i" value="$checked">$x</td>
     |;
         }
       <td><input type=hidden name="fx_transaction_$i" value="$checked">$x</td>
     |;
         }

-        $checked = ($form->{"korrektur_$i"}) ? "checked" : "";
-        $korrektur =
-          qq|<td><input type="checkbox" name="korrektur_$i" value="1" $checked></td>|;

         $form->hide_form("accno_$i");
 
       } else {
         $form->hide_form("accno_$i");
 
       } else {

-        $korrektur =
-          qq|<td><input type="checkbox" name="korrektur_$i" value="1"></td>|;

         if ($form->{transfer}) {
           $fx_transaction = qq|
       <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>
         if ($form->{transfer}) {
           $fx_transaction = qq|
       <td><input name="fx_transaction_$i" class=checkbox type=checkbox value=1></td>


@@ -936,8 +927,7 @@ sub display_rows {
     $fx_transaction
     <td><input name="debit_$i" size="8" value="$form->{"debit_$i"}" accesskey=$i $copy2credit $debitreadonly></td>
     <td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" $creditreadonly></td>
     $fx_transaction
     <td><input name="debit_$i" size="8" value="$form->{"debit_$i"}" accesskey=$i $copy2credit $debitreadonly></td>
     <td><input name="credit_$i" size=8 value="$form->{"credit_$i"}" $creditreadonly></td>

-    <td><input name="tax_$i" size=6 value="$form->{"tax_$i"}"></td>
-    $korrektur
+    <td><input type="hidden" name="tax_$i" value="$form->{"tax_$i"}">$form->{"tax_$i"}</td>

     $tax|;
 
     if ($form->{show_details}) {
     $tax|;
 
     if ($form->{show_details}) {


@@ -1197,8 +1187,6 @@ sub form_header {
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
           <th class=listheading style="width:5%">|
           <th class=listheading style="width:10%">|
     . $locale->text('Tax') . qq|</th>
           <th class=listheading style="width:5%">|

-    . $locale->text('Korrektur') . qq|</th>
-          <th class=listheading style="width:10%">|

     . $locale->text('Taxkey') . qq|</th>|;
 
   if ($form->{show_details}) {
     . $locale->text('Taxkey') . qq|</th>|;
 
   if ($form->{show_details}) {


@@ -1421,33 +1409,25 @@ sub post_transaction {
       $form->{"taxchart_$i"} = "0--0.00";
       $form->{"tax_$i"}      = 0;
     }
       $form->{"taxchart_$i"} = "0--0.00";
       $form->{"tax_$i"}      = 0;
     }

-    if (!$form->{"korrektur_$i"}) {
-      ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
-      if ($taxkey > 1) {
+    ($taxkey, $rate) = split(/--/, $form->{"taxchart_$i"});
+    if ($taxkey > 1) {
+      if ($debitcredit) {
+        $debittax = 1;
+      } else {
+        $credittax = 1;
+      }
+      if ($form->{taxincluded}) {
+        $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;

         if ($debitcredit) {
         if ($debitcredit) {

-          $debittax = 1;
+          $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};

         } else {
         } else {

-          $credittax = 1;
-        }
-        if ($form->{taxincluded}) {
-          $form->{"tax_$i"} = $amount / ($rate + 1) * $rate;
-          if ($debitcredit) {
-            $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
-          } else {
-            $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
-          }
-        } else {
-          $form->{"tax_$i"} = $amount * $rate;
+          $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};

         }
       } else {
         }
       } else {

-        $form->{"tax_$i"} = 0;
-      }
-    } elsif ($form->{taxincluded}) {
-      if ($debitcredit) {
-        $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"};
-      } else {
-        $form->{"credit_$i"} = $form->{"credit_$i"} - $form->{"tax_$i"};
+        $form->{"tax_$i"} = $amount * $rate;

       }
       }

+    } else {
+      $form->{"tax_$i"} = 0;

     }
 
     for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }
     }
 
     for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} }

diff --git a/locale/de/all b/locale/de/all
index e4f77326f895178ea8c7e4474e2f071eaa90cb4a..3a24bddf9dbd09dbf48703fd6e190c519f166557 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -785,7 +785,6 @@ $self->{texts} = {
   'Keine Suchergebnisse gefunden!' => 'Keine Suchergebnisse gefunden!',
   'Konten'                      => 'Konten',
   'Kontonummernerweiterung (KNE)' => 'Kontonummernerweiterung (KNE)',
   'Keine Suchergebnisse gefunden!' => 'Keine Suchergebnisse gefunden!',
   'Konten'                      => 'Konten',
   'Kontonummernerweiterung (KNE)' => 'Kontonummernerweiterung (KNE)',

-  'Korrektur'                   => 'Korrektur',

   'L'                           => 'L',
   'LP'                          => 'LP',
   'LaTeX Templates'             => 'LaTeX-Vorlagen',
   'L'                           => 'L',
   'LP'                          => 'LP',
   'LaTeX Templates'             => 'LaTeX-Vorlagen',

diff --git a/locale/de/ap b/locale/de/ap
index b0a9bd18df42c2f056812f7d49ab60bd02cd954c..cdfa4b8be7007f3f1c0aeb1f0c97a59adb7c7a72 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -115,7 +115,6 @@ $self->{texts} = {
   'July'                        => 'Juli',
   'Jun'                         => 'Jun',
   'June'                        => 'Juni',
   'July'                        => 'Juli',
   'Jun'                         => 'Jun',
   'June'                        => 'Juni',

-  'Korrektur'                   => 'Korrektur',

   'MAILED'                      => 'Gesendet',
   'Manage license keys'         => 'Lizenzschlüssel verwalten',
   'Mar'                         => 'März',
   'MAILED'                      => 'Gesendet',
   'Manage license keys'         => 'Lizenzschlüssel verwalten',
   'Mar'                         => 'März',

diff --git a/locale/de/ar b/locale/de/ar
index 37273bb9468cc961e018ff1fa7fd6b13fd5a3bdb..87d0253025e57222403fac29dbf95a21c93f90e3 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -119,7 +119,6 @@ $self->{texts} = {
   'July'                        => 'Juli',
   'Jun'                         => 'Jun',
   'June'                        => 'Juni',
   'July'                        => 'Juli',
   'Jun'                         => 'Jun',
   'June'                        => 'Juni',

-  'Korrektur'                   => 'Korrektur',

   'MAILED'                      => 'Gesendet',
   'Manage license keys'         => 'Lizenzschlüssel verwalten',
   'Mar'                         => 'März',
   'MAILED'                      => 'Gesendet',
   'Manage license keys'         => 'Lizenzschlüssel verwalten',
   'Mar'                         => 'März',

diff --git a/locale/de/gl b/locale/de/gl
index 7f2c3984f3c5a6f50894e5f3e8d1184c564b726e..43b9d945162cd2bcc1e51d37658283336de18509 100644 (file)
--- a/locale/de/gl
+++ b/locale/de/gl
@@ -111,7 +111,6 @@ $self->{texts} = {
   'July'                        => 'Juli',
   'Jun'                         => 'Jun',
   'June'                        => 'Juni',
   'July'                        => 'Juli',
   'Jun'                         => 'Jun',
   'June'                        => 'Juni',

-  'Korrektur'                   => 'Korrektur',

   'Liability'                   => 'Passiva/Mittelherkunft',
   'MAILED'                      => 'Gesendet',
   'Manage license keys'         => 'Lizenzschlüssel verwalten',
   'Liability'                   => 'Passiva/Mittelherkunft',
   'MAILED'                      => 'Gesendet',
   'Manage license keys'         => 'Lizenzschlüssel verwalten',