From 5d44361c86fe35b3fb0485f2dbface7cf6d73b1d Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 7 Jan 2009 13:16:59 +0000 Subject: [PATCH] =?utf8?q?Kreditoren-,=20Debitoren-=20und=20Dialogbuchenma?= =?utf8?q?sken:=201.=20Die=20Checkboxen=20"Korrektur"=20entfernt.=202.=20D?= =?utf8?q?ie=20Eingabezeilen=20f=C3=BCr=20den=20Steuerbetrag=20in=20einfac?= =?utf8?q?he=20Anzeigen=20des=20von=20Lx-Office=20ausgerechneten=20Steuerb?= =?utf8?q?etrages=20umgewandelt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- bin/mozilla/ap.pl | 23 +++++---------- bin/mozilla/ar.pl | 25 ++++++---------- bin/mozilla/gl.pl | 74 +++++++++++++++++------------------------------ locale/de/all | 1 - locale/de/ap | 1 - locale/de/ar | 1 - locale/de/gl | 1 - 7 files changed, 44 insertions(+), 82 deletions(-) diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 30453f619..1adf6b317 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -498,8 +498,6 @@ $jsscript . $locale->text('Amount') . qq| | . $locale->text('Tax') . qq| - | - . $locale->text('Korrektur') . qq| | . $locale->text('Taxkey') . qq| | @@ -555,8 +553,6 @@ $jsscript '-default' => $selected_taxchart)) . qq||; - my $korrektur = $form->{"korrektur_$i"} ? 'checked' : ''; - my $projectnumber = NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@project_values, @@ -567,8 +563,7 @@ $jsscript $selectAP_amount {"amount_$i"}> - {"tax_$i"}> - + $form->{"tax_$i"} $tax $projectnumber @@ -869,17 +864,15 @@ sub update { 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 { - $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); diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index efd4c3245..9320bfaf9 100644 --- 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 ($selectAR_amount, $selectAR_paid, $korrektur_checked, $ARselected, $tax); + my ($selectAR_amount, $selectAR_paid, $ARselected, $tax); my (@column_index, %column_data); @@ -544,8 +544,6 @@ $jsscript | . $locale->text('Tax') . qq| | - . $locale->text('Korrektur') . qq| - | . $locale->text('Taxkey') . qq| | . $locale->text('Project') . qq| @@ -600,8 +598,6 @@ $jsscript '-default' => $selected_taxchart)) . qq||; - $korrektur_checked = ($form->{"korrektur_$i"} ? 'checked' : ''); - my $projectnumber = NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@project_values, @@ -612,8 +608,7 @@ $jsscript $selectAR_amount {"amount_$i"}> - {"tax_$i"}> - + $form->{"tax_$i"} $tax $projectnumber @@ -932,17 +927,15 @@ sub update { 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 { - $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); diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index 0f5f94452..075a397d8 100644 --- 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; } - 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 { - $form->{"tax_$i"} = 0; + $form->{"tax_$i"} = $amount * $rate; } + } else { + $form->{"tax_$i"} = 0; } for (@flds) { $a[$j]->{$_} = $form->{"${_}_$i"} } @@ -862,8 +860,6 @@ sub display_rows { . qq||; if ($init) { - $korrektur = - qq||; if ($form->{transfer}) { $fx_transaction = qq| @@ -898,14 +894,9 @@ sub display_rows { $x |; } - $checked = ($form->{"korrektur_$i"}) ? "checked" : ""; - $korrektur = - qq||; $form->hide_form("accno_$i"); } else { - $korrektur = - qq||; if ($form->{transfer}) { $fx_transaction = qq| @@ -936,8 +927,7 @@ sub display_rows { $fx_transaction - - $korrektur + $form->{"tax_$i"} $tax|; if ($form->{show_details}) { @@ -1197,8 +1187,6 @@ sub form_header { | . $locale->text('Tax') . qq| | - . $locale->text('Korrektur') . qq| - | . $locale->text('Taxkey') . qq||; if ($form->{show_details}) { @@ -1421,33 +1409,25 @@ sub post_transaction { $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) { - $debittax = 1; + $form->{"debit_$i"} = $form->{"debit_$i"} - $form->{"tax_$i"}; } 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 { - $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"} } diff --git a/locale/de/all b/locale/de/all index e4f77326f..3a24bddf9 100644 --- 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)', - 'Korrektur' => 'Korrektur', 'L' => 'L', 'LP' => 'LP', 'LaTeX Templates' => 'LaTeX-Vorlagen', diff --git a/locale/de/ap b/locale/de/ap index b0a9bd18d..cdfa4b8be 100644 --- a/locale/de/ap +++ b/locale/de/ap @@ -115,7 +115,6 @@ $self->{texts} = { 'July' => 'Juli', 'Jun' => 'Jun', 'June' => 'Juni', - 'Korrektur' => 'Korrektur', 'MAILED' => 'Gesendet', 'Manage license keys' => 'Lizenzschlüssel verwalten', 'Mar' => 'März', diff --git a/locale/de/ar b/locale/de/ar index 37273bb94..87d025302 100644 --- a/locale/de/ar +++ b/locale/de/ar @@ -119,7 +119,6 @@ $self->{texts} = { 'July' => 'Juli', 'Jun' => 'Jun', 'June' => 'Juni', - 'Korrektur' => 'Korrektur', 'MAILED' => 'Gesendet', 'Manage license keys' => 'Lizenzschlüssel verwalten', 'Mar' => 'März', diff --git a/locale/de/gl b/locale/de/gl index 7f2c3984f..43b9d9451 100644 --- a/locale/de/gl +++ b/locale/de/gl @@ -111,7 +111,6 @@ $self->{texts} = { 'July' => 'Juli', 'Jun' => 'Jun', 'June' => 'Juni', - 'Korrektur' => 'Korrektur', 'Liability' => 'Passiva/Mittelherkunft', 'MAILED' => 'Gesendet', 'Manage license keys' => 'Lizenzschlüssel verwalten', -- 2.20.1