Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 82ee2234

Von Stephan Köhler vor fast 19 Jahren hinzugefügt

  • ID 82ee22347be2f2ee96d09a9fd0b45710f9552582
  • Vorgänger de651621
  • Nachfolger f921dcbb

Merge von 704,707,730,731 aus unstable: USTVA Bugfix
-704
Diverse USTVA Bugs geloest
Solve Bug: 49: UST wurde berechnet, jetzt ausgelesen, mit Patchen von Andre Schubert THX
Solve Bug: 164: Grundsätzliche Berechnung der UST
Solve Bug: 173: Teilbezahlte Rechnungen bei IST-Versteuerung sollten jetzt klappen, THX Yvonne Einberger
Vorlagen ueberarbeitet, sub ustva und sub get_accounts_ustva in ustva.pm verlegt.
Alle Variablen der USTVA durchgängig nutzbar gemacht.
-707
Nachtrag zu rev 704. USTVA Berechnung kosmetisch verändert.
-730
Nachtrag zu R704 'Diverse USTVA Bugs geloest'
-731
Solved Bug 237. USTVA Vorsteuer wird nicht richtig berechnet

Unterschiede anzeigen:

bin/mozilla/ustva.pl
831 831

  
832 832
    #yearly report
833 833
    if ($form->{duetyp} eq "13") {
834
      $form->{fromdate} = "1.1.$form->{year}";
835
      $form->{todate}   = "31.12.$form->{year}";
834
      $form->{fromdate} = "$form->{year}-01-01";
835
      $form->{todate}   = "$form->{year}-12-31";
836 836
    }
837 837

  
838 838
    #Quater reports
839 839
    if ($form->{duetyp} eq "A") {
840
      $form->{fromdate} = "1.1.$form->{year}";
841
      $form->{todate}   = "31.3.$form->{year}";
840
      $form->{fromdate} = "$form->{year}-01-01";
841
      $form->{todate}   = "$form->{year}-03-31";
842 842
      $form->{'0441'}   = "X";
843 843
    }
844 844
    if ($form->{duetyp} eq "B") {
845
      $form->{fromdate} = "1.4.$form->{year}";
846
      $form->{todate}   = "30.6.$form->{year}";
845
      $form->{fromdate} = "$form->{year}-04-01";
846
      $form->{todate}   = "$form->{year}-06-30";
847 847
      $form->{'0442'}   = "X";
848 848
    }
849 849
    if ($form->{duetyp} eq "C") {
850
      $form->{fromdate} = "1.7.$form->{year}";
851
      $form->{todate}   = "30.9.$form->{year}";
850
      $form->{fromdate} = "$form->{year}-07-01";
851
      $form->{todate}   = "$form->{year}-09-30";
852 852
      $form->{'0443'}   = "X";
853 853
    }
854 854
    if ($form->{duetyp} eq "D") {
855
      $form->{fromdate} = "1.10.$form->{year}";
856
      $form->{todate}   = "31.12.$form->{year}";
855
      $form->{fromdate} = "$form->{year}-10-01";
856
      $form->{todate}   = "$form->{year}-12-31";
857 857
      $form->{'0444'}   = "X";
858 858
    }
859 859

  
860 860
    #Monthly reports
861 861
  SWITCH: {
862 862
      $form->{duetyp} eq "01" && do {
863
        $form->{fromdate} = "1.1.$form->{year}";
864
        $form->{todate}   = "31.1.$form->{year}";
863
        $form->{fromdate} = "$form->{year}-01-01";
864
        $form->{todate}   = "$form->{year}-01-31";
865 865
        $form->{'0401'}   = "X";
866 866
        last SWITCH;
867 867
      };
868 868
      $form->{duetyp} eq "02" && do {
869
        $form->{fromdate} = "1.2.$form->{year}";
869
        $form->{fromdate} = "$form->{year}-02-01";
870 870

  
871 871
        #this works from 1901 to 2099, 1900 and 2100 fail.
872 872
        my $leap = ($form->{year} % 4 == 0) ? "29" : "28";
873
        $form->{todate} = "$leap.2.$form->{year}";
873
        $form->{todate} = "$form->{year}-02-$leap";
874 874
        $form->{"0402"} = "X";
875 875
        last SWITCH;
876 876
      };
877 877
      $form->{duetyp} eq "03" && do {
878
        $form->{fromdate} = "1.3.$form->{year}";
879
        $form->{todate}   = "31.3.$form->{year}";
878
        $form->{fromdate} = "$form->{year}-03-01";
879
        $form->{todate}   = "$form->{year}-03-31";
880 880
        $form->{"0403"}   = "X";
881 881
        last SWITCH;
882 882
      };
883 883
      $form->{duetyp} eq "04" && do {
884
        $form->{fromdate} = "1.4.$form->{year}";
885
        $form->{todate}   = "30.4.$form->{year}";
884
        $form->{fromdate} = "$form->{year}-04-01";
885
        $form->{todate}   = "$form->{year}-04-30";
886 886
        $form->{"0404"}   = "X";
887 887
        last SWITCH;
888 888
      };
889 889
      $form->{duetyp} eq "05" && do {
890
        $form->{fromdate} = "1.5.$form->{year}";
891
        $form->{todate}   = "31.5.$form->{year}";
890
        $form->{fromdate} = "$form->{year}-05-01";
891
        $form->{todate}   = "$form->{year}-05-31";
892 892
        $form->{"0405"}   = "X";
893 893
        last SWITCH;
894 894
      };
895 895
      $form->{duetyp} eq "06" && do {
896
        $form->{fromdate} = "1.6.$form->{year}";
897
        $form->{todate}   = "30.6.$form->{year}";
896
        $form->{fromdate} = "$form->{year}-06-01";
897
        $form->{todate}   = "$form->{year}-06-30";
898 898
        $form->{"0406"}   = "X";
899 899
        last SWITCH;
900 900
      };
901 901
      $form->{duetyp} eq "07" && do {
902
        $form->{fromdate} = "1.7.$form->{year}";
903
        $form->{todate}   = "31.7.$form->{year}";
902
        $form->{fromdate} = "$form->{year}-07-01";
903
        $form->{todate}   = "$form->{year}-07-31";
904 904
        $form->{"0407"}   = "X";
905 905
        last SWITCH;
906 906
      };
907 907
      $form->{duetyp} eq "08" && do {
908
        $form->{fromdate} = "1.8.$form->{year}";
909
        $form->{todate}   = "31.8.$form->{year}";
908
        $form->{fromdate} = "$form->{year}-08-01";
909
        $form->{todate}   = "$form->{year}-08-31";
910 910
        $form->{"0408"}   = "X";
911 911
        last SWITCH;
912 912
      };
913 913
      $form->{duetyp} eq "09" && do {
914
        $form->{fromdate} = "1.9.$form->{year}";
915
        $form->{todate}   = "30.9.$form->{year}";
914
        $form->{fromdate} = "$form->{year}-09-01";
915
        $form->{todate}   = "$form->{year}-09-30";
916 916
        $form->{"0409"}   = "X";
917 917
        last SWITCH;
918 918
      };
919 919
      $form->{duetyp} eq "10" && do {
920
        $form->{fromdate} = "1.10.$form->{year}";
921
        $form->{todate}   = "31.10.$form->{year}";
920
        $form->{fromdate} = "$form->{year}-10-01";
921
        $form->{todate}   = "$form->{year}-10-31";
922 922
        $form->{"0410"}   = "X";
923 923
        last SWITCH;
924 924
      };
925 925
      $form->{duetyp} eq "11" && do {
926
        $form->{fromdate} = "1.11.$form->{year}";
927
        $form->{todate}   = "30.11.$form->{year}";
926
        $form->{fromdate} = "$form->{year}-11-01";
927
        $form->{todate}   = "$form->{year}-11-30";
928 928
        $form->{"0411"}   = "X";
929 929
        last SWITCH;
930 930
      };
931 931
      $form->{duetyp} eq "12" && do {
932
        $form->{fromdate} = "1.12.$form->{year}";
933
        $form->{todate}   = "31.12.$form->{year}";
932
        $form->{fromdate} = "$form->{year}-12-01";
933
        $form->{todate}   = "$form->{year}-12-31";
934 934
        $form->{"0412"}   = "X";
935 935
        last SWITCH;
936 936
      };
......
938 938
  }
939 939

  
940 940
  #$myconfig = \%myconfig;
941
  RP->ustva(\%myconfig, \%$form);
941
  #$myconfig->{dateformat} = 'yyyy-mm-dd';
942
  #$form->{fromdate}= $locale->date(\%myconfig, $form->{fromdate}, 0, 0, 0);
943
  #$form->{todate}= $locale->date(\%myconfig, $form->{todate}, 0, 0, 0);
944
  USTVA->ustva(\%myconfig, \%$form);
942 945

  
943 946
  #??($form->{department}) = split /--/, $form->{department};
944 947

  
......
1013 1016
    $form->{br}      = '\\\\';
1014 1017

  
1015 1018
    
1016
    my @numbers = qw(51r 86r 97r 93r 96 43 45
1017
      66 62 67);
1019
    my @numbers = qw(511 861 36 80 971 931 98 96 53 74
1020
                     85 65 66 61 62 Z67 63 64 59 69 39 83
1021
                     Z43 Z45 Z53 Z62 Z65);
1022
      
1018 1023
    my $number = '';
1019 1024
    # Zahlenformatierung f?r Latex USTVA Formulare
1020 1025
    if ($myconfig{numberformat} eq '1.000,00' or 

Auch abrufbar als: Unified diff