X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/75cd107d1bb8f3c8a1023d1dab1f198fe99d967f..a205ed210bf303bff2af7abcedf128c61d957f3a:/SL/USTVA.pm diff --git a/SL/USTVA.pm b/SL/USTVA.pm index 3551efab4..97a8a6fde 100644 --- a/SL/USTVA.pm +++ b/SL/USTVA.pm @@ -63,38 +63,40 @@ sub create_steuernummer { sub steuernummer_input { $main::lxdebug->enter_sub(); - ($elsterland, $elsterFFFF, $steuernummer) = @_; + my ($self, $elsterland, $elsterFFFF, $steuernummer) = @_; + my $steuernummer_input = ''; + $elster_land = $elsterland; $elster_FFFF = $elsterFFFF; $steuernummer = '0000000000' if ($steuernummer eq ''); # $steuernummer formatieren (nur Zahlen) -> $stnr - $stnr = $steuernummer; + my $stnr = $steuernummer; $stnr =~ s/\D+//g; #Pattern description Elstersteuernummer my %elster_STNRformat = ( - 'Mecklenburg Vorpommern' => 'FFF/BBB/UUUUP', # '/' 3 - 'Hessen' => '0FF BBB UUUUP', # ' ' 3 - 'Nordrhein Westfalen' => 'FFF/BBBB/UUUP', # '/' 3 - 'Schleswig Holstein' => 'FF BBB UUUUP', # ' ' 2 - 'Berlin' => 'FF/BBB/UUUUP', # '/' 3 - 'Thüringen' => 'FFF/BBB/UUUUP', # '/' 3 - 'Sachsen' => 'FFF/BBB/UUUUP', # '/' 3 - 'Hamburg' => 'FF/BBB/UUUUP', # '/' 3 - 'Baden Würtemberg' => 'FF/BBB/UUUUP', # '/' 2 - 'Sachsen Anhalt' => 'FFF/BBB/UUUUP', # '/' 3 - 'Saarland' => 'FFF/BBB/UUUUP', # '/' 3 - 'Bremen' => 'FF BBB UUUUP', # ' ' 3 - 'Bayern' => 'FFF/BBB/UUUUP', # '/' 3 - 'Rheinland Pfalz' => 'FF/BBB/UUUU/P', # '/' 4 - 'Niedersachsen' => 'FF/BBB/UUUUP', # '/' 3 - 'Brandenburg' => 'FFF/BBB/UUUUP', # '/' 3 + 'Mecklenburg Vorpommern' => 'FFF/BBB/UUUUP', # '/' 3 + 'Hessen' => '0FF BBB UUUUP', # ' ' 3 + 'Nordrhein Westfalen' => 'FFF/BBBB/UUUP', # '/' 3 + 'Schleswig Holstein' => 'FF BBB UUUUP', # ' ' 2 + 'Berlin' => 'FF/BBB/UUUUP', # '/' 3 + 'Thüringen' => 'FFF/BBB/UUUUP', # '/' 3 + 'Sachsen' => 'FFF/BBB/UUUUP', # '/' 3 + 'Hamburg' => 'FF/BBB/UUUUP', # '/' 3 + 'Baden Würtemberg' => 'FF/BBB/UUUUP', # '/' 2 + 'Sachsen Anhalt' => 'FFF/BBB/UUUUP', # '/' 3 + 'Saarland' => 'FFF/BBB/UUUUP', # '/' 3 + 'Bremen' => 'FF BBB UUUUP', # ' ' 3 + 'Bayern' => 'FFF/BBB/UUUUP', # '/' 3 + 'Rheinland Pfalz' => 'FF/BBB/UUUU/P', # '/' 4 + 'Niedersachsen' => 'FF/BBB/UUUUP', # '/' 3 + 'Brandenburg' => 'FFF/BBB/UUUUP', # '/' 3 ); #split the pattern - $elster_pattern = $elster_STNRformat{$elster_land}; + my $elster_pattern = $elster_STNRformat{$elster_land}; my @elster_pattern = split(' ', $elster_pattern); my $delimiter = ' '; my $patterncount = @elster_pattern; @@ -108,76 +110,77 @@ sub steuernummer_input { # no we have an array of patternparts and a delimiter # create the first automated and fixed part and delimiter - print qq||; - $part = ''; + $steuernummer_input .= qq||; + my $part = ''; SWITCH: { $elster_pattern[0] eq 'FFF' && do { $part = substr($elster_FFFF, 1, 4); - print qq|$part|; + $steuernummer_input .= qq|$part|; last SWITCH; }; $elster_pattern[0] eq '0FF' && do { $part = '0' . substr($elster_FFFF, 2, 4); - print qq|$part|; + $steuernummer_input .= qq|$part|; last SWITCH; }; $elster_pattern[0] eq 'FF' && do { $part = substr($elster_FFFF, 2, 4); - print qq|$part|; + $steuernummer_input .= qq|$part|; last SWITCH; }; 1 == 1 && do { - print qq|Fehler!|; + $steuernummer_input .= qq|Fehler!|; last SWITCH; }; } #now the rest of the Steuernummer ... - print qq||; - print qq|\n + $steuernummer_input .= qq||; + $steuernummer_input .= qq|\n |; - my $h = 0; - my $i = 0; - my $j = 0; - $k = 0; - for ($h = 1; $h < $patterncount; $h++) { - print qq| $delimiter \n|; - for ($i = 1; $i <= length($elster_pattern[$h]); $i++) { - print qq|\n|; + $steuernummer_input .= qq|\n|; } } + $main::lxdebug->leave_sub(); + + return $steuernummer_input; } sub fa_auswahl { $main::lxdebug->enter_sub(); - use SL::Form; +# use SL::Form; # Referenz wird übergeben, hash of hash wird nicht # in neues Hash kopiert, sondern direkt über die Referenz verändert # Prototyp für diese Konstruktion - my ($land, $elsterFFFF, $elster_init) = - @_; #Referenz auf Hash von Hash übergeben + my ($self, $land, $elsterFFFF, $elster_init) = @_; + my $terminal = ''; my $FFFF = $elsterFFFF; my $ffff = ''; @@ -191,8 +194,7 @@ sub fa_auswahl { #} #if ( $terminal eq 'mozilla' or $terminal eq 'js' ) { - print qq| -
+ my $fa_auswahl = qq| @@ -236,18 +238,18 @@ sub fa_auswahl { |; if ($elsterFFFF eq '') { - print qq||; + $fa_auswahl .= qq||; } else { foreach $ffff (sort { $elster_land_fa{$a} cmp $elster_land_fa{$b} } keys(%elster_land_fa) ) { - print qq| + $fa_auswahl .= qq| |; + $fa_auswahl .= qq|>$elster_land_fa{$ffff} ($ffff)|; } } - print qq| + $fa_auswahl .= qq| |; $main::lxdebug->leave_sub(); + return $fa_auswahl; } sub info { @@ -400,7 +403,8 @@ sub stichtag { sub query_finanzamt { $main::lxdebug->enter_sub(); - my ($myconfig, $form) = @_; + my ($self, $myconfig, $form) = @_; + my $dbh = $form->dbconnect($myconfig) or $self->error(DBI->errstr); #Test, if table finanzamt exist @@ -568,19 +572,25 @@ sub ustva { my $last_period = 0; my $category = "pos_ustva"; - my @categories_cent = qw(511 861 36 80 971 931 98 96 53 74 - 85 65 66 61 62 67 63 64 59 69 39 83 - Z43 Z45 Z53 Z62 Z65 Z67); + my @category_cent = qw( + 511 861 36 80 971 931 98 96 53 74 + 85 65 66 61 62 67 63 64 59 69 + 39 83 Z43 Z45 Z53 Z62 Z65 Z67 + ); - my @categories_euro = qw(41 44 49 43 48 51 86 35 77 76 91 97 93 - 95 94 42 60 45 52 73 84); + my @category_euro = qw( + 41 44 49 43 48 51 + 86 35 77 76 91 97 + 93 95 94 42 60 45 + 52 73 84 + ); $form->{decimalplaces} *= 1; - foreach $item (@categories_cent) { + foreach $item (@category_cent) { $form->{"$item"} = 0; } - foreach $item (@categories_euro) { + foreach $item (@category_euro) { $form->{"$item"} = 0; } @@ -590,33 +600,23 @@ sub ustva { # # Berechnung der USTVA Formularfelder # + $form->{"51r"} = $form->{"511"}; $form->{"86r"} = $form->{"861"}; $form->{"97r"} = $form->{"971"}; $form->{"93r"} = $form->{"931"}; $form->{"Z43"} = - $form->{"511"} + $form->{"861"} + $form->{"36"} + $form->{"80"} + - $form->{"971"} + $form->{"931"} + $form->{"96"} + $form->{"98"}; + $form->{"511"} + $form->{"861"} + $form->{"36"} + $form->{"80"} + + $form->{"971"} + $form->{"931"} + $form->{"96"} + $form->{"98"}; $form->{"Z45"} = $form->{"Z43"}; $form->{"Z53"} = $form->{"Z43"}; $form->{"Z62"} = - $form->{"Z43"} - $form->{"66"} - $form->{"61"} - $form->{"62"} - - $form->{"63"} - $form->{"64"} - $form->{"59"}; + $form->{"Z43"} - $form->{"66"} - $form->{"61"} - $form->{"62"} - + $form->{"63"} - $form->{"64"} - $form->{"59"}; $form->{"Z65"} = $form->{"Z62"} - $form->{"69"}; $form->{"83"} = $form->{"Z65"} - $form->{"39"}; - - foreach $item (@categories_cent) { - $form->{$item} = - $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2), - 2, '0'); - } - - foreach $item (@categories_euro) { - $form->{$item} = - $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0), - 0, '0'); - } - + # Hier fehlen moeglicherweise noch einige Berechnungen! + $dbh->disconnect; $main::lxdebug->leave_sub(); @@ -637,6 +637,7 @@ sub get_accounts_ustva { my $glwhere = ""; my $subwhere = ""; my $ARwhere = ""; + my $APwhere = ''; my $arwhere = ""; my $item; @@ -645,6 +646,7 @@ sub get_accounts_ustva { $subwhere .= " AND transdate >= '$fromdate'"; $glwhere = " AND ac.transdate >= '$fromdate'"; $ARwhere .= " AND acc.transdate >= '$fromdate'"; + $APwhere .= " AND AP.transdate >= '$fromdate'"; } $where .= " AND ac.transdate >= '$fromdate'"; } @@ -653,6 +655,7 @@ sub get_accounts_ustva { $where .= " AND ac.transdate <= '$todate'"; $ARwhere .= " AND acc.transdate <= '$todate'"; $subwhere .= " AND transdate <= '$todate'"; + $APwhere .= " AND AP.transdate <= '$todate'"; } if ($department_id) { @@ -708,18 +711,19 @@ sub get_accounts_ustva { UNION -- alle Ausgaben AP erfassen - SELECT sum(ac.amount) AS amount, c.$category - FROM acc_trans ac - JOIN chart c ON (c.id = ac.chart_id) - $dpt_join - WHERE - $where - AND c.link LIKE '%AP_amount%' - $dpt_where - $project - GROUP BY c.$category + SELECT + sum(ac.amount) AS amount, pos_ustva + FROM acc_trans ac + JOIN AP ON (AP.id = ac.trans_id ) + JOIN chart c ON (c.id = ac.chart_id AND pos_ustva NOT LIKE '') + WHERE + 1=1 + $APwhere + $dpt_where + $project + GROUP BY pos_ustva - UNION -- alle Ausgaben und Einnahmen direkter gl Buchungen erfassen + UNION -- alle Ausgaben und Einnahmen direkter gl Buchungen erfassen SELECT sum ( @@ -782,9 +786,7 @@ sub get_accounts_ustva { while ($ref = $sth->fetchrow_hashref(NAME_lc)) { # Bug 365 solved?! -# if ($ref->{amount} < 0) { - $ref->{amount} *= -1; -# } + $ref->{amount} *= -1; if ($category eq "pos_bwa") { if ($last_period) { $form->{ $ref->{$category} }{kumm} += $ref->{amount}; @@ -800,4 +802,6 @@ sub get_accounts_ustva { $main::lxdebug->leave_sub(); } + + 1;