X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4a36e49bdabb28714ee88c2c9ae9e6b13ae46194..2567740ec63137b5a51542d11ea69428d17b3783:/SL/USTVA.pm diff --git a/SL/USTVA.pm b/SL/USTVA.pm index e4fb191c0..b4dc32b3e 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -460,11 +460,8 @@ sub query_finanzamt { sub process_query { $main::lxdebug->enter_sub(); - # Copyright D. Simander -> SL::Form under Gnu GPL. my ($form, $dbh, $filename) = @_; - # return unless (-f $filename); - open my $FH, "<", "$filename" or $form->error("$filename : $!\n"); my $query = ""; my $sth; @@ -533,7 +530,7 @@ sub ustva { attribute => 'position', dec_places => '2', }); - + push @category_cent, ("pos_ustva_811b_kivi", "pos_ustva_861b_kivi"); if ( $form->{coa} eq 'Germany-DATEV-SKR03EU' or $form->{coa} eq 'Germany-DATEV-SKR04EU') { push @category_cent, qw(Z43 Z45 Z53 Z54 Z62 Z65 Z67); } @@ -544,7 +541,7 @@ sub ustva { attribute => 'position', dec_places => '0', }); - + push @category_euro, ("pos_ustva_81b_kivi", "pos_ustva_86b_kivi"); @{$form->{category_cent}} = @category_cent; @{$form->{category_euro}} = @category_euro; $form->{decimalplaces} *= 1; @@ -571,7 +568,7 @@ sub ustva { # Germany - if ( $form->{coa} eq 'Germany-DATEV-SKR03EU' or $form->{coa} eq 'Germany-DATEV-SKR04EU'){ + if ( $form->{coa} eq 'Germany-DATEV-SKR03EU' or $form->{coa} eq 'Germany-DATEV-SKR04EU') { # 16%/19% Umstellung # Umordnen der Kennziffern @@ -594,7 +591,7 @@ sub ustva { # Fixme: Wird auch noch für Oesterreich gebraucht, # weil kein eigenes Ausgabeformular - # sotte aber aus der allgeméinen Steuerberechnung verschwinden + # sollte aber aus der allgemeinen Steuerberechnung verschwinden # # Berechnung der USTVA Formularfelder laut Bogen 207 # @@ -690,7 +687,7 @@ sub get_accounts_ustva { SUM( ac.amount * -- Bezahlt / Rechnungssumme ( - SELECT SUM(acc.amount) + SELECT SUM(acc.amount), t.rate, c.accno FROM acc_trans acc INNER JOIN chart c ON (acc.chart_id = c.id AND c.link like '%AR_paid%') @@ -708,6 +705,7 @@ sub get_accounts_ustva { FROM acc_trans ac LEFT JOIN chart c ON (c.id = ac.chart_id) LEFT JOIN ar ON (ar.id = ac.trans_id) + LEFT JOIN tax t ON (t.id = ac.tax_id) LEFT JOIN taxkeys tk ON ( tk.id = ( SELECT id FROM taxkeys @@ -719,7 +717,7 @@ sub get_accounts_ustva { ) WHERE $acc_trans_where - GROUP BY tk.pos_ustva + GROUP BY tk.pos_ustva, t.rate, c.accno |; } elsif ($form->{accounting_method} eq 'accrual') { @@ -731,10 +729,11 @@ sub get_accounts_ustva { -- Alle Einnahmen AR und pos_ustva erfassen SELECT - sum(ac.amount) AS amount, - tk.pos_ustva + tk.pos_ustva, t.rate, c.accno FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) JOIN ar ON (ar.id = ac.trans_id) + JOIN tax t ON (t.id = ac.tax_id) JOIN taxkeys tk ON ( tk.id = ( SELECT id FROM taxkeys @@ -746,7 +745,7 @@ sub get_accounts_ustva { $dpt_join WHERE 1 = 1 $where - GROUP BY tk.pos_ustva + GROUP BY tk.pos_ustva, t.rate, c.accno |; } else { @@ -764,10 +763,11 @@ sub get_accounts_ustva { SELECT sum(ac.amount) AS amount, - tk.pos_ustva + tk.pos_ustva, t.rate, c.accno FROM acc_trans ac JOIN ap ON (ap.id = ac.trans_id ) JOIN chart c ON (c.id = ac.chart_id) + JOIN tax t ON (t.id = ac.tax_id) LEFT JOIN taxkeys tk ON ( tk.id = ( SELECT id FROM taxkeys @@ -781,16 +781,17 @@ sub get_accounts_ustva { WHERE 1=1 $where - GROUP BY tk.pos_ustva + GROUP BY tk.pos_ustva, t.rate, c.accno UNION -- Einnahmen direkter gl Buchungen erfassen SELECT sum ( - ac.amount) AS amount, - tk.pos_ustva + tk.pos_ustva, t.rate, c.accno FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) JOIN gl a ON (a.id = ac.trans_id) + JOIN tax t ON (t.id = ac.tax_id) LEFT JOIN taxkeys tk ON ( tk.id = ( SELECT id FROM taxkeys @@ -804,17 +805,18 @@ sub get_accounts_ustva { $dpt_join WHERE 1 = 1 $where - GROUP BY tk.pos_ustva + GROUP BY tk.pos_ustva, t.rate, c.accno UNION -- Ausgaben direkter gl Buchungen erfassen SELECT sum (ac.amount) AS amount, - tk.pos_ustva + tk.pos_ustva, t.rate, c.accno FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) JOIN gl a ON (a.id = ac.trans_id) + JOIN tax t ON (t.id = ac.tax_id) LEFT JOIN taxkeys tk ON ( tk.id = ( SELECT id FROM taxkeys @@ -828,7 +830,7 @@ sub get_accounts_ustva { $dpt_join WHERE 1 = 1 $where - GROUP BY tk.pos_ustva + GROUP BY tk.pos_ustva, t.rate, c.accno |; @@ -843,11 +845,42 @@ sub get_accounts_ustva { my $sth = $dbh->prepare($query); $sth->execute || $form->dberror($query); - + # ugly, but we need to use static accnos + my $accno_five = 3803; # SKR04 + my $accno_sixteen = 3805; # SKR04 + if ($form->{coa} eq 'Germany-DATEV-SKR03EU') { + $accno_five = 1773; + $accno_sixteen = 1775; + } while (my $ref = $sth->fetchrow_hashref("NAME_lc")) { - # Bug 365 solved?! + next unless $ref->{$category}; $ref->{amount} *= -1; $form->{ $ref->{$category} } += $ref->{amount}; + + # umsatzsteuer 16% pos 35 + if ($ref->{pos_ustva} eq '35') { + if ($ref->{rate} == 0.16) { + $form->{"pos_ustva_81b_kivi"} += $ref->{amount}; + } elsif ($ref->{rate} == 0.05) { + $form->{"pos_ustva_86b_kivi"} += $ref->{amount}; + } else {die ("No valid tax rate for pos 35"); } + } + if ($ref->{pos_ustva} eq '36') { + if ($ref->{accno} eq $accno_sixteen) { + $form->{"pos_ustva_811b_kivi"} += $ref->{amount}; + } elsif ($ref->{accno} eq $accno_five) { + $form->{"pos_ustva_861b_kivi"} += $ref->{amount}; + } else { die "No valid accno for pos 36"; } + } + # umsatzsteuer 5% temp + #if ($ref->{rate} == 0.05 && $ref->{pos_ustva} ne '66') { + # if ($ref->{pos_ustva} eq '35') { + # $form->{"pos_ustva_86b_kivi"} += $ref->{amount}; + # } elsif ($ref->{pos_ustva} eq '36') { + # $form->{"pos_ustva_861b_kivi"} += $ref->{amount}; + # } else { die "Kein pos_ustva Eintrag!" . Dumper($ref); } + #} + } $sth->finish;