Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9fb8eec8

Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt

  • ID 9fb8eec834ac3be77f5995053694b32ec140c877
  • Vorgänger ecf8fe1e
  • Nachfolger 21ca8cb7

Kosmetik.

Unterschiede anzeigen:

bin/mozilla/ustva.pl
93 93
  # Hier Einlesen der user-config
94 94
  # steuernummer entfernt f?r prerelease
95 95
  my @a = qw(
96
    signature      name          company       address        businessnumber 
97
    tel            fax           email         co_chief       co_department 
96
    signature      name          company       address        businessnumber
97
    tel            fax           email         co_chief       co_department
98 98
    co_custom1     co_custom2    co_custom3    co_custom4     co_custom5
99
    co_name1       co_name2      co_street     co_street1     co_zip 
100
    co_city        co_city1      co_country    co_tel         co_tel1 
99
    co_name1       co_name2      co_street     co_street1     co_zip
100
    co_city        co_city1      co_country    co_tel         co_tel1
101 101
    co_tel2        co_fax        co_fax1       co_email       co_email1
102
    co_url         co_url1       ustid         duns           co_bankname 
102
    co_url         co_url1       ustid         duns           co_bankname
103 103
    co_bankname1   co_bankname2  co_bankname3  co_blz         co_blz1
104
    co_blz2        co_blz3       co_accountnr  co_accountnr1  co_accountnr2 
104
    co_blz2        co_blz3       co_accountnr  co_accountnr1  co_accountnr2
105 105
    co_accountnr3
106 106
  );
107 107

  
......
110 110
  my $openings = $form->{FA_Oeffnungszeiten};
111 111
  $openings =~ s/\\\\n/<br>/g;
112 112

  
113
  my $company_given = ($form->{company} ne '') 
113
  my $company_given = ($form->{company} ne '')
114 114
    ? qq|<h3>$form->{company}</h3>\n|
115 115
    : qq|<a href="am.pl?action=config|
116
      . qq|&level=Programm--Preferences">| 
116
      . qq|&level=Programm--Preferences">|
117 117
      . $locale->text('No Company Name given') . qq|!</a><br>|;
118 118

  
119 119

  
......
127 127
  }
128 128

  
129 129

  
130
  my $address_given = 
131
    ($form->{co_street} && ($form->{co_zip} || $form->{co_city})) 
130
  my $address_given =
131
    ($form->{co_street} && ($form->{co_zip} || $form->{co_city}))
132 132
    ? qq|$form->{co_street}<br>|
133 133
        . qq|$form->{co_street1}<br>|
134 134
        . qq|$form->{co_zip} $form->{co_city}|
135 135
    : qq|<a href="am.pl?action=config|
136
        . qq|&level=Programm--Preferences">| 
137
        . $locale->text('No Company Address given') 
136
        . qq|&level=Programm--Preferences">|
137
        . $locale->text('No Company Address given')
138 138
        . qq|!</a>\n|;
139 139

  
140 140
  $form->{co_email} = $form->{email} unless $form->{co_email};
......
152 152

  
153 153
  my @all_years = $form->all_years(\%myconfig);
154 154

  
155
  my $select_year = qq|<select name=year title="| 
155
  my $select_year = qq|<select name=year title="|
156 156
    . $locale->text('Year') . qq|">|;
157 157
  foreach my $key (@all_years) {
158 158
    $select_year .= qq|<option |;
......
166 166
  my $checkbox_kz_10 = qq|<input name="FA_10" id=FA_10 class=checkbox|
167 167
    . qq| type=checkbox value="1" $_checked title = "|
168 168
    . $locale->text('Amended Advance Turnover Tax Return (Nr. 10)')
169
    . qq|">| 
170
    . $locale->text('Amended Advance Turnover Tax Return'); 
169
    . qq|">|
170
    . $locale->text('Amended Advance Turnover Tax Return');
171 171

  
172
  my $method_local = ($form->{method} eq 'accrual') ? $locale->text('accrual') 
172
  my $method_local = ($form->{method} eq 'accrual') ? $locale->text('accrual')
173 173
                   : ($form->{method} eq 'cash')    ? $locale->text('cash')
174 174
                   : '';
175 175

  
176 176
  my $period_local = ( $form->{FA_voranmeld} eq 'month')   ? $locale->text('month')
177 177
                   : ( $form->{FA_voranmeld} eq 'quarter') ? $locale->text('quarter')
178
                   : '';  
178
                   : '';
179 179

  
180 180
  my $tax_office_banks_ref = [
181 181
    { BLZ             => $form->{FA_BLZ_1},
......
187 187
      Bankbezeichnung => $form->{FA_Bankbezeichnung_oertlich}
188 188
    }
189 189
  ];
190
 
191
  # Which COA is in use? 
192
  
190

  
191
  # Which COA is in use?
192

  
193 193
  USTVA->get_coa($form, $myconfig);
194 194

  
195 195
  my $template_ref = {
196
    openings         => $openings,  
196
    openings         => $openings,
197 197
    company_given    => $company_given,
198
    address_given    => $address_given,     
198
    address_given    => $address_given,
199 199
    taxnumber_given  => $taxnumber_given,
200 200
    taxnumber        => $myconfig->{taxnumber},
201
    select_year      => $select_year,      
201
    select_year      => $select_year,
202 202
    period_local     => $period_local,
203 203
    method_local     => $method_local,
204 204
    ustva_vorauswahl => $ustva_vorauswahl,
205 205
    checkbox_kz_10   => $checkbox_kz_10,
206
    tax_office_banks => $tax_office_banks_ref,    
207
    select_options   => &show_options,    
206
    tax_office_banks => $tax_office_banks_ref,
207
    select_options   => &show_options,
208 208

  
209 209
  };
210
  
210

  
211 211
  print($form->parse_html_template('ustva/report', $template_ref));
212 212

  
213 213

  
......
261 261
  $form->{month} = substr($date, 4, 2);
262 262
  $form->{year}  = substr($date, 0, 4);
263 263
  $lxdebug->message(LXDebug::DEBUG1, qq|
264
    Actual date from Database: $date\n    
264
    Actual date from Database: $date\n
265 265
    Actual year from Database: $form->{year}\n
266 266
    Actual day from Database: $form->{day}\n
267 267
    Actual month from Database: $form->{month}\n|);
......
468 468
    $select_vorauswahl .= qq|</select>|;
469 469
  }
470 470
  $lxdebug->leave_sub();
471
  
471

  
472 472
  return $select_vorauswahl;
473 473
}
474 474

  
......
515 515
      . qq|</option>|
516 516
      . qq|<option value=elstertaxbird>|
517 517
      . $locale->text('ELSTER Export (Taxbird)')
518
      . qq|</option>|;      
518
      . qq|</option>|;
519 519
  }
520 520

  
521 521
  #$format .= qq|<option value=elster>|.$locale->text('ELSTER Export nach Winston').qq|</option>|;
......
526 526
    . $locale->text('Choose Outputformat') . qq|">$format</select>
527 527
  |;
528 528
  $lxdebug->leave_sub();
529
  
529

  
530 530
  return $show_options;
531 531
}
532 532

  
......
541 541

  
542 542
  # init some form vars
543 543
  my @anmeldungszeitraum =
544
    qw('0401' '0402' '0403' 
545
       '0404' '0405' '0406' 
546
       '0407' '0408' '0409' 
547
       '0410' '0411' '0412' 
544
    qw('0401' '0402' '0403'
545
       '0404' '0405' '0406'
546
       '0407' '0408' '0409'
547
       '0410' '0411' '0412'
548 548
       '0441' '0442' '0443' '0444');
549 549

  
550 550
  foreach my $item (@anmeldungszeitraum) {
......
565 565
    #
566 566
    # using dates in ISO-8601 format: yyyymmmdd  for Postgres...
567 567
    #
568
    
568

  
569 569
    #yearly report
570 570
    if ($form->{period} eq "13") {
571 571
      $form->{fromdate} = "$form->{year}0101";
......
673 673
      };
674 674
    }
675 675

  
676
  # Kontrollvariable f?r die Templates 
676
  # Kontrollvariable f?r die Templates
677 677
  $form->{'year2007'} = ($form->{year} >= 2007 ) ? "1":"0";
678 678

  
679 679

  
......
751 751
  # Nation specific customisations
752 752
  #
753 753
  ################################
754
  
754

  
755 755
  # Germany
756
  
756

  
757 757
  if ( $form->{coa} eq 'Germany-DATEV-SKR03EU' or $form->{coa} eq 'Germany-DATEV-SKR04EU') {
758
      
758

  
759 759
    #
760 760
    # Outputformat specific customisation's
761 761
    #
......
767 767
        attribute   => 'position',
768 768
        dec_places  => '2',
769 769
    });
770
    
770

  
771 771
    push @category_cent, qw(83  Z43  Z45  Z53  Z62  Z65  Z67);
772 772

  
773 773
    my @category_euro = USTVA->report_variables({
......
815 815
      foreach $number (@category_cent) {
816 816
        $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '2', '0');
817 817
      }
818
      
818

  
819 819
      foreach $number (@category_euro) {
820 820
        $form->{$number} = $form->format_amount(\%myconfig, $form->{$number}, '0', '0');
821 821
      }
......
823 823
    } elsif ( $form->{format} eq 'elsterwinston' ) {
824 824

  
825 825
      $form->{IN} = 'winston.xml';
826
      
826

  
827 827
      #
828 828
      # Build Winston filename
829 829
      #
830
      
830

  
831 831
      my $file = 'U';     # 1. char 'U' = USTVA
832 832
      $file .= $form->{period};
833 833
      #4. and 5. char = year modulo 100
......
843 843
      $form->{tmpfile} = "$userspath/$file";
844 844

  
845 845
      $form->{attachment_filename} = $file;
846
   
846

  
847 847
      # Zahlenformatierung f?r Winston
848 848

  
849 849
      my $temp_numberformat = $myconfig{numberformat};
......
855 855
      foreach my $number (@category_cent) {
856 856
        $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
857 857
      }
858
      
858

  
859 859
      foreach my $number (@category_euro) {
860 860
        $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : '';
861 861
      }
......
869 869
      );
870 870

  
871 871
      foreach my $kennziffer (@category_cent, @category_euro) {
872
      
872

  
873 873
        next if ( $kennziffer =~ m/Z\d\d/);
874 874
        next if (   $form->{$kennziffer} == 0 );
875
        
875

  
876 876
        if (defined $winston_id_for{$kennziffer} ) {
877 877
          push(@{ $form->{id}}, $winston_id_for{$kennziffer});
878 878
        } else {
879
          push(@{ $form->{id}}, "Kz$kennziffer"); 
879
          push(@{ $form->{id}}, "Kz$kennziffer");
880 880
        }
881 881
        push(@{ $form->{amount}}, $form->{$kennziffer});
882
      }    
882
      }
883 883

  
884 884
    } elsif ( $form->{format} eq 'elstertaxbird' ) {
885 885

  
886 886
      # Define serveral filenames
887 887
      $form->{IN} = 'taxbird.txb';
888 888

  
889
      $form->{attachment_filename} = "USTVA-" . $form->{period} 
889
      $form->{attachment_filename} = "USTVA-" . $form->{period}
890 890
      . sprintf("%02d", $form->{year} % 100) . ".txb";
891
      
891

  
892 892
      $form->{attachment_filename} =~ s|.*/||;
893 893
      $form->{tmpfile} = "$userspath/" . $form->{attachment_filename};
894 894

  
......
903 903
                     '43' => '14',
904 904
                     '44' => '15',
905 905
                   );
906
      
906

  
907 907
        foreach my $quarter ( keys %periods ) {
908 908
          $form->{taxbird_period} = $periods{$quarter} if ( $form->{period} eq $quarter);
909 909
        }
......
918 918
        USTVA::error( $locale->text('Wrong Period' ));
919 919
        exit(0);
920 920
      }
921
      
921

  
922 922
      my %lands = ( # Lx => taxbird # TODO: besser als array...
923 923
                  'Baden W?rtemberg'       => '0',
924 924
                  'Bayern'                 => '1',
......
940 940
      foreach my $land ( keys %lands ){
941 941
        $form->{taxbird_land_nr} = $lands{$land} if ($form->{elsterland} eq $land );
942 942
      }
943
      
943

  
944 944
      $form->{co_zip} = $form->{co_city};
945 945
      $form->{co_zip} =~ s/\D//g;
946 946
      $form->{co_city} =~ s/\d//g;
947 947
      $form->{co_city} =~ s/^\s//g;
948
      
948

  
949 949
      ($form->{co_phone_prefix}, $form->{co_phone}) = split("-", $form->{tel});
950 950
      $form->{co_phone_prefix} =~ s/\s//g;
951 951
      $form->{co_phone} =~ s/\s//g;
952
      
952

  
953 953
       $form->{taxbird_steuernummer} = $form->{steuernummer};
954 954
      #      $form->{taxbird_steuernummer} =~ s/\D//g;
955 955
      $form->{taxbird_steuernummer} =~ s/\///; # ersten Querstrich ersetzen
956
      
956

  
957 957
      # Numberformatting for Taxbird
958 958
      my $temp_numberformat = $myconfig{numberformat};
959 959
      # Numberformat must be '1000,00' for Taxbird ?!
......
961 961
      foreach my $number (@category_cent) {
962 962
        $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '2', '') : '';
963 963
      }
964
      
964

  
965 965
      foreach my $number (@category_euro) {
966 966
        $form->{$number} = ( $form->{$number} !=0 ) ? $form->format_amount(\%myconfig, $form->{$number}, '0', '') : '';
967 967
      }
968 968
      # Re-set Numberformat
969 969
      $myconfig{numberformat} = $temp_numberformat;
970
      
970

  
971 971
      # push Kennziffern to <%foreach Array fo easyer
972 972
      # output in xml format. Thx to Moritz.
973 973
      my %taxbird_id_for = (
974
           
974

  
975 975
          '511'  =>  'Kz51-calc',
976 976
          '861'  =>  'Kz86-calc',
977 977
          '971'  =>  'Kz97-calc',
......
984 984
          'Z65'  =>  'ust-sum+69',
985 985
          'Z67'  =>  'ust-vz',
986 986
      );
987
            
988
      
987

  
988

  
989 989
      for my $kennziffer (@category_cent, @category_euro) {
990 990

  
991 991
        next if ($kennziffer eq 'Z43');
......
994 994
          if (defined $taxbird_id_for{$kennziffer}) {
995 995
            push(@{ $form->{id}}, $taxbird_id_for{$kennziffer});
996 996
          } else {
997
            push(@{ $form->{id}}, "Kz$kennziffer"); 
997
            push(@{ $form->{id}}, "Kz$kennziffer");
998 998
          }
999 999
          push(@{ $form->{amount}}, $form->{$kennziffer});
1000 1000
        }
1001
      }    
1002
      
1001
      }
1002

  
1003 1003
    } elsif ( $form->{format} eq '' ){ # No format error.
1004 1004
      $form->header;
1005 1005
      USTVA::error( $locale->text('Application Error. No Format given' ) . "!");
1006 1006
      exit(0);
1007
   
1007

  
1008 1008
    } else { # All other Formats are wrong
1009 1009
      $form->header;
1010 1010
      USTVA::error( $locale->text('Application Error. Wrong Format') . ": " . $form->{format} );
1011 1011
      exit(0);
1012 1012
    }
1013 1013

  
1014
  
1014

  
1015 1015
  } else  # Outputformat for generic output
1016 1016
  {
1017 1017

  
......
1034 1034
    $form->{USTVA} = [];
1035 1035

  
1036 1036
    if ( $form->{format} eq 'generic') { # Formatierungen f?r HTML Ausgabe
1037
      
1037

  
1038 1038
      my $rec_ref = {};
1039 1039
      for my $kennziffer (@category_cent, @category_euro) {
1040 1040
        $rec_ref = {};
1041 1041
        $rec_ref->{id} = $kennziffer;
1042 1042
        $rec_ref->{amount} = $form->format_amount(\%myconfig, $form->{$kennziffer}, 2, '0');
1043
        
1043

  
1044 1044
        $lxdebug->message($LXDebug::DEBUG, "Kennziffer $kennziffer: '$form->{$kennziffer}'" );
1045 1045
        $lxdebug->dump($LXDebug::DEBUG, $rec_ref );
1046 1046
        push @ { $form->{USTVA} }, $rec_ref;
1047 1047
      }
1048
      
1048

  
1049 1049
    }
1050 1050

  
1051 1051
  }
1052
  
1052

  
1053 1053
  if ( $form->{period} eq '13' and $form->{format} ne 'html') {
1054 1054
    $form->header;
1055 1055
    USTVA::info(
......
1057 1057
      'Yearly taxreport not yet implemented')
1058 1058
      . '!');
1059 1059
  }
1060
    
1060

  
1061 1061
  $form->{templates} = $myconfig{templates};
1062 1062
  $form->{templates} = "doc" if ( $form->{type} eq 'help' );
1063 1063

  
......
1072 1072
    print($form->parse_html_template('ustva/generic_taxreport', $template_ref));
1073 1073

  
1074 1074
  } else
1075
  { 
1075
  {
1076 1076

  
1077 1077
    $form->parse_template(\%myconfig, $userspath);
1078 1078

  
......
1108 1108

  
1109 1109
  my $_hidden_variables_ref;
1110 1110

  
1111
  my %_hidden_local_variables = (    
1111
  my %_hidden_local_variables = (
1112 1112
    'saved'       => $locale->text('Check Details'),
1113 1113
    'nextsub'     => 'config_step2',
1114 1114
    'warnung'     => '0',
1115 1115
  );
1116 1116

  
1117 1117
  foreach my $variable (keys %_hidden_local_variables) {
1118
    push @{ $_hidden_variables_ref }, 
1118
    push @{ $_hidden_variables_ref },
1119 1119
        { 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} };
1120 1120
  }
1121 1121

  
1122 1122
  my @_hidden_form_variables = qw(
1123
    FA_Name             FA_Strasse        FA_PLZ             
1124
    FA_Ort              FA_Telefon        FA_Fax           
1125
    FA_PLZ_Grosskunden  FA_PLZ_Postfach   FA_Postfach 
1126
    FA_BLZ_1            FA_Kontonummer_1  FA_Bankbezeichnung_1  
1123
    FA_Name             FA_Strasse        FA_PLZ
1124
    FA_Ort              FA_Telefon        FA_Fax
1125
    FA_PLZ_Grosskunden  FA_PLZ_Postfach   FA_Postfach
1126
    FA_BLZ_1            FA_Kontonummer_1  FA_Bankbezeichnung_1
1127 1127
    FA_BLZ_2            FA_Kontonummer_2  FA_Bankbezeichnung_oertlich
1128 1128
    FA_Oeffnungszeiten  FA_Email          FA_Internet
1129 1129
    steuernummer        elsterland        elstersteuernummer
......
1131 1131
  );
1132 1132

  
1133 1133
  foreach my $variable (@_hidden_form_variables) {
1134
    push @{ $_hidden_variables_ref}, 
1134
    push @{ $_hidden_variables_ref},
1135 1135
        { 'variable' => $variable, 'value' => $form->{$variable} };
1136 1136
  }
1137 1137

  
1138
# Which COA is in use? 
1139
  
1138
# Which COA is in use?
1139

  
1140 1140
  USTVA->get_coa($form, \%myconfig);
1141 1141

  
1142 1142
  # h?? kann die weg?
......
1151 1151
     checked_quarterly               => $checked_quarterly,
1152 1152
     checked_dauerfristverlaengerung => $checked_dauerfristverlaengerung,
1153 1153
     hidden_variables                => $_hidden_variables_ref,
1154
     
1154

  
1155 1155
  };
1156
  
1156

  
1157 1157
  # Ausgabe des Templates
1158 1158
  print($form->parse_html_template('ustva/config_step1', $template_ref));
1159 1159

  
......
1206 1206
    $form->{elsterland}   = $elsterland;
1207 1207
    $form->{elsterFFFF}   = $elsterFFFF;
1208 1208
    $form->{steuernummer} = '';
1209
    
1209

  
1210 1210
    create_steuernummer();
1211 1211

  
1212 1212
    # rebuild elster_amt
......
1243 1243
  my $steuernummer = $form->{steuernummer} if ($steuernummer eq '');
1244 1244

  
1245 1245
  $form->{FA_Oeffnungszeiten} =~ s/\\\\n/\n/g;
1246
  
1247
  
1246

  
1247

  
1248 1248

  
1249 1249
  my $input_steuernummer = USTVA->steuernummer_input(
1250
                             $form->{elsterland}, 
1250
                             $form->{elsterland},
1251 1251
                             $form->{elsterFFFF},
1252 1252
                             $form->{steuernummer}
1253 1253
  );
1254 1254

  
1255 1255
  $lxdebug->message(LXDebug::DEBUG1, qq|$input_steuernummer|);
1256
 
1256

  
1257 1257

  
1258 1258
  my $_hidden_variables_ref;
1259 1259

  
......
1265 1265
      'steuernummer'        => $stnr,
1266 1266
      'lastsub'             => 'config_step1',
1267 1267
      'nextsub'             => 'save',
1268
      
1268

  
1269 1269
  );
1270
  
1270

  
1271 1271
  foreach my $variable (keys %_hidden_local_variables) {
1272
    push @{ $_hidden_variables_ref }, 
1272
    push @{ $_hidden_variables_ref },
1273 1273
        { 'variable' => $variable, 'value' => $_hidden_local_variables{$variable} };
1274 1274
  }
1275
 
1275

  
1276 1276
  my @_hidden_form_variables = qw(
1277
    FA_steuerberater_name   FA_steuerberater_street 
1277
    FA_steuerberater_name   FA_steuerberater_street
1278 1278
    FA_steuerberater_city   FA_steuerberater_tel
1279 1279
    FA_voranmeld            method
1280
    FA_dauerfrist           FA_71 
1281
    elster                  
1282
    type                    elster_init 
1280
    FA_dauerfrist           FA_71
1281
    elster
1282
    type                    elster_init
1283 1283
    saved                   callback
1284 1284
  );
1285 1285

  
1286 1286
  foreach my $variable (@_hidden_form_variables) {
1287
    push @{ $_hidden_variables_ref}, 
1287
    push @{ $_hidden_variables_ref},
1288 1288
        { 'variable' => $variable, 'value' => $form->{$variable} };
1289 1289
  }
1290 1290

  
......
1295 1295
     callback                        => $callback,
1296 1296
     hidden_variables                => $_hidden_variables_ref,
1297 1297
  };
1298
  
1298

  
1299 1299
  # Ausgabe des Templates
1300 1300
  print($form->parse_html_template('ustva/config_step2', $template_ref));
1301 1301

  
......
1364 1364
  my @config = qw(
1365 1365
    elster              elsterland            elstersteuernummer  steuernummer
1366 1366
    elsteramt           elsterFFFF            FA_Name             FA_Strasse
1367
    FA_PLZ              FA_Ort                FA_Telefon          FA_Fax 
1368
    FA_PLZ_Grosskunden  FA_PLZ_Postfach       FA_Postfach         FA_BLZ_1 
1367
    FA_PLZ              FA_Ort                FA_Telefon          FA_Fax
1368
    FA_PLZ_Grosskunden  FA_PLZ_Postfach       FA_Postfach         FA_BLZ_1
1369 1369
    FA_Kontonummer_1    FA_Bankbezeichnung_1  FA_BLZ_2            FA_Kontonummer_2
1370 1370
    FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten
1371 1371
    FA_Email FA_Internet FA_voranmeld method FA_steuerberater_name
......
1374 1374

  
1375 1375
  # Hier kommt dann die Plausibilit?tspr?fung der ELSTERSteuernummer
1376 1376
  if ($form->{elstersteuernummer} ne '000000000') {
1377
    
1377

  
1378 1378
    $form->{elster} = '1';
1379
    
1379

  
1380 1380
    open my $ustvaconfig, ">", "$userspath/$filename" or $form->error("$filename : $!");
1381 1381

  
1382 1382
    # create the config file
......
1434 1434
  $lxdebug->leave_sub();
1435 1435
  return $finanzamt;
1436 1436
}
1437

  
1438

  

Auch abrufbar als: Unified diff