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:

SL/RP.pm
1336 1336
  my @accno;
1337 1337
  my $accno;
1338 1338
  my $ref;
1339

  
1339
  #print $query;
1340 1340
  my $sth = $dbh->prepare($query);
1341 1341
  $sth->execute || $form->dberror($query);
1342 1342

  
......
2506 2506

  
2507 2507
  my $last_period     = 0;
2508 2508
  my $category        = "pos_ustva";
2509
  my @categories_cent = qw(51r 86r 97r 93r 96 66 43 45 53 62 65 67);
2509
  my @categories_cent = qw(51r 511 86r 861 97r 971 93r 931
2510
                           96 66 43 45 53 62 65 67);
2510 2511
  my @categories_euro = qw(48 51 86 91 97 93 94);
2511 2512
  $form->{decimalplaces} *= 1;
2512 2513

  
......
2544 2545
  #   }
2545 2546
  #
2546 2547
  #    }
2547

  
2548
  $form->{"51r"} = $form->{"51"} * 0.16;
2549
  $form->{"86r"} = $form->{"86"} * 0.07;
2550
  $form->{"97r"} = $form->{"97"} * 0.16;
2551
  $form->{"93r"} = $form->{"93"} * 0.07;
2552
  $form->{"96"}  = $form->{"94"} * 0.16;
2548
  
2549
  #
2550
  # Berechnung der USTVA Formularfelder
2551
  #
2552
  $form->{"51r"} = $form->{"511"};
2553
  $form->{"86r"} = $form->{"861"};
2554
  $form->{"97r"} = $form->{"971"};
2555
  $form->{"93r"} = $form->{"931"};
2556
  #$form->{"96"}  = $form->{"94"} * 0.16;
2553 2557
  $form->{"43"}  =
2554 2558
    $form->{"51r"} + $form->{"86r"} + $form->{"97r"} + $form->{"93r"} +
2555 2559
    $form->{"96"};
SL/USTVA.pm
556 556
  $main::lxdebug->leave_sub();
557 557
}
558 558

  
559

  
560
sub ustva {
561
  $main::lxdebug->enter_sub();
562

  
563
  my ($self, $myconfig, $form) = @_;
564

  
565
  # connect to database
566
  my $dbh = $form->dbconnect($myconfig);
567

  
568
  my $last_period     = 0;
569
  my $category        = "pos_ustva";
570
  my @categories_cent = qw(511 861 36 80 971 931 98 96 53 74 
571
                           85 65 66 61 62 67 63 64 59 69 39 83 
572
                           Z43 Z45 Z53 Z62 Z65 Z67);
573
                           
574
  my @categories_euro = qw(41 44 49 43 48 51 86 35 77 76 91 97 93 
575
                           95 94 42 60 45 52 73 84);
576

  
577
  $form->{decimalplaces} *= 1;
578

  
579
  foreach $item (@categories_cent) {
580
    $form->{"$item"} = 0;
581
  }
582
  foreach $item (@categories_euro) {
583
    $form->{"$item"} = 0;
584
  }
585

  
586

  
587
  &get_accounts_ustva($dbh, $last_period, $form->{fromdate}, $form->{todate},
588
                  $form, $category);
589

  
590

  
591
  #
592
  # Berechnung der USTVA Formularfelder
593
  #
594
  $form->{"51r"} = $form->{"511"};
595
  $form->{"86r"} = $form->{"861"};
596
  $form->{"97r"} = $form->{"971"};
597
  $form->{"93r"} = $form->{"931"};
598
  $form->{"Z43"} = $form->{"511"}+ $form->{"861"} + 
599
                   $form->{"36"} + $form->{"80"}  +
600
                   $form->{"971"}+ $form->{"931"} + 
601
                   $form->{"96"} + $form->{"98"};
602
  $form->{"Z45"} = $form->{"Z43"};
603
  $form->{"Z53"} = $form->{"Z43"};
604
  $form->{"Z62"} = $form->{"Z43"}- $form->{"66"} -
605
                   $form->{"61"} - $form->{"62"} -
606
                   $form->{"63"} - $form->{"64"} -
607
                   $form->{"59"};
608
  $form->{"Z65"} = $form->{"Z62"}- $form->{"69"};
609
  $form->{"83"}  = $form->{"Z65"}- $form->{"39"};
610
  
611
  foreach $item (@categories_cent) {
612
    $form->{$item} =
613
      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 2), 2, '0');
614
  }
615

  
616
  foreach $item (@categories_euro) {
617
    $form->{$item} =
618
      $form->format_amount($myconfig, $form->round_amount($form->{$item}, 0), 0, '0');
619
  }
620

  
621
  $dbh->disconnect;
622

  
623
  $main::lxdebug->leave_sub();
624
}
625

  
626
sub get_accounts_ustva {
627
  $main::lxdebug->enter_sub();
628

  
629
  my ($dbh, $last_period, $fromdate, $todate, $form, $category) = @_;
630

  
631
  my ($null, $department_id) = split /--/, $form->{department};
632

  
633
  my $query;
634
  my $dpt_where;
635
  my $dpt_join;
636
  my $project;
637
  my $where    = "1 = 1";
638
  my $glwhere  = "";
639
  my $subwhere = "";
640
  my $ARwhere = "";
641
  my $arwhere = "";
642
  my $item;
643

  
644
  if ($fromdate) {
645
    if ($form->{method} eq 'cash') {
646
      $subwhere .= " AND transdate >= '$fromdate'";
647
      $glwhere = " AND ac.transdate >= '$fromdate'";
648
      $ARwhere .= " AND acc.transdate >= '$fromdate'";
649
      $where .= " AND ac.transdate >= '$fromdate'";
650
      
651
    }
652
  }
653

  
654
  if ($todate) {
655
    $where    .= " AND ac.transdate <= '$todate'";
656
    $ARwhere    .= " AND acc.transdate <= '$todate'";
657
    $subwhere .= " AND transdate <= '$todate'";
658
  }
659

  
660
  if ($department_id) {
661
    $dpt_join = qq|
662
               JOIN department t ON (a.department_id = t.id)
663
		  |;
664
    $dpt_where = qq|
665
               AND t.id = $department_id
666
	           |;
667
  }
668

  
669
  if ($form->{project_id}) {
670
    $project = qq|
671
                 AND ac.project_id = $form->{project_id}
672
		 |;
673
  }
674

  
675
  if ($form->{method} eq 'cash') {
676

  
677
    $query = qq|
678

  
679
 SELECT
680
   SUM( ac.amount *
681
      -- Bezahlt / Rechnungssumme
682
     ( 
683
       SELECT SUM(acc.amount)
684
       FROM acc_trans acc
685
       INNER JOIN chart c ON (acc.chart_id = c.id AND c.link like '%AR_paid%')
686
       WHERE
687
        1=1 
688
        $ARwhere
689
        AND acc.trans_id = ac.trans_id
690
        )
691
     / 
692
     ( 
693
      select amount from ar where id = ac.trans_id  
694
     )
695
   ) AS amount,
696
   c.pos_ustva
697
   FROM acc_trans ac
698
   JOIN chart c ON (c.id = ac.chart_id)
699
   --JOIN ar ON (ar.id = ac.trans_id)
700
   where 
701
     1=1 
702
     -- Here no where, please. All Transactions ever should be
703
     -- testet if they are paied in the USTVA report period.
704
   GROUP BY c.pos_ustva
705
	UNION
706

  
707
	         SELECT sum(ac.amount) AS amount,
708
		 c.$category
709
		 FROM acc_trans ac
710
		 JOIN chart c ON (c.id = ac.chart_id)
711
		 JOIN ap a ON (a.id = ac.trans_id)
712
		 $dpt_join
713
		 WHERE $where
714
		 $dpt_where
715
		 AND ac.trans_id IN
716
		   (
717
		     SELECT trans_id
718
		     FROM acc_trans
719
		     JOIN chart ON (chart_id = id)
720
		     WHERE link LIKE '%AP_amount%'
721
		     $subwhere
722
		   )
723

  
724
		 $project
725
		 GROUP BY c.$category
726

  
727
        UNION
728

  
729
		 SELECT sum(ac.amount) AS amount,
730
		 c.$category
731
		 FROM acc_trans ac
732
		 JOIN chart c ON (c.id = ac.chart_id)
733
		 JOIN gl a ON (a.id = ac.trans_id)
734
		 $dpt_join
735
		 WHERE $where
736
		 $glwhere
737
		 $dpt_from
738
		 AND NOT (c.link = 'AR' OR c.link = 'AP')
739
		 $project
740
		 GROUP BY c.$category
741

  
742
		 |;
743

  
744
    if ($form->{project_id}) {
745

  
746
      $query .= qq|
747

  
748
	 UNION
749

  
750
		 SELECT SUM(ac.sellprice * ac.qty) AS amount,
751
		 c.$category
752
		 FROM invoice ac
753
	         JOIN ar a ON (a.id = ac.trans_id)
754
		 JOIN parts p ON (ac.parts_id = p.id)
755
		 JOIN chart c on (p.income_accno_id = c.id)
756
	         $dpt_join
757
	-- use transdate from subwhere
758
		 WHERE 1 = 1 $subwhere
759
		 AND c.category = 'I'
760
		 $dpt_where
761
		 AND ac.trans_id IN
762
		   (
763
		     SELECT trans_id
764
		     FROM acc_trans
765
		     JOIN chart ON (chart_id = id)
766
		     WHERE link LIKE '%AR_paid%'
767
		     $subwhere
768
		   )
769

  
770
		 $project
771
		 GROUP BY c.$category
772

  
773
	 UNION
774

  
775
		 SELECT SUM(ac.sellprice) AS amount,
776
		 c.$category
777
		 FROM invoice ac
778
	         JOIN ap a ON (a.id = ac.trans_id)
779
		 JOIN parts p ON (ac.parts_id = p.id)
780
		 JOIN chart c on (p.expense_accno_id = c.id)
781
	         $dpt_join
782
		 WHERE 1 = 1 $subwhere
783
		 AND c.category = 'E'
784
		 $dpt_where
785
		 AND ac.trans_id IN
786
		   (
787
		     SELECT trans_id
788
		     FROM acc_trans
789
		     JOIN chart ON (chart_id = id)
790
		     WHERE link LIKE '%AP_paid%'
791
		     $subwhere
792
		   )
793

  
794
		 $project
795
		 GROUP BY c.$category
796
		 |;
797
    }
798

  
799
  } else {
800

  
801
    if ($department_id) {
802
      $dpt_join = qq|
803
	      JOIN dpt_trans t ON (t.trans_id = ac.trans_id)
804
	      |;
805
      $dpt_where = qq|
806
               AND t.department_id = $department_id
807
	      |;
808
    }
809

  
810
    $query = qq|
811

  
812
		 SELECT sum(ac.amount) AS amount,
813
		 c.$category
814
		 FROM acc_trans ac
815
		 JOIN chart c ON (c.id = ac.chart_id)
816
		 $dpt_join
817
		 WHERE $where
818
		 $dpt_where
819
		 $project
820
		 GROUP BY c.$category
821
		 |;
822

  
823
    if ($form->{project_id}) {
824

  
825
      $query .= qq|
826

  
827
	UNION
828

  
829
		 SELECT SUM(ac.sellprice * ac.qty) AS amount,
830
		 c.$category
831
		 FROM invoice ac
832
	         JOIN ar a ON (a.id = ac.trans_id)
833
		 JOIN parts p ON (ac.parts_id = p.id)
834
		 JOIN chart c on (p.income_accno_id = c.id)
835
	         $dpt_join
836
	-- use transdate from subwhere
837
		 WHERE 1 = 1 $subwhere
838
		 AND c.category = 'I'
839
		 $dpt_where
840
		 $project
841
		 GROUP BY c.$category
842

  
843
	UNION
844

  
845
		 SELECT SUM(ac.sellprice * ac.qty) * -1 AS amount,
846
		 c.$category
847
		 FROM invoice ac
848
	         JOIN ap a ON (a.id = ac.trans_id)
849
		 JOIN parts p ON (ac.parts_id = p.id)
850
		 JOIN chart c on (p.expense_accno_id = c.id)
851
	         $dpt_join
852
		 WHERE 1 = 1 $subwhere
853
		 AND c.category = 'E'
854
		 $dpt_where
855
		 $project
856
		 GROUP BY c.$category
857
		 |;
858

  
859
    }
860
  }
861

  
862
  my @accno;
863
  my $accno;
864
  my $ref;
865
  #print $query;
866
  my $sth = $dbh->prepare($query);
867
  $sth->execute || $form->dberror($query);
868

  
869
  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
870
    if ($ref->{amount} < 0) {
871
      $ref->{amount} *= -1;
872
    }
873
    if ($category eq "pos_bwa") {
874
      if ($last_period) {
875
        $form->{ $ref->{$category} }{kumm} += $ref->{amount};
876
      } else {
877
        $form->{ $ref->{$category} }{jetzt} += $ref->{amount};
878
      }
879
    } else {
880
      $form->{ $ref->{$category} } += $ref->{amount};
881
    }
882
  }
883
  $sth->finish;
884

  
885
  $main::lxdebug->leave_sub();
886
}
887

  
888

  
559 889
1;
bin/mozilla/am.pl
111 111
	      </tr>|;
112 112

  
113 113
  $form->{selectustva} = "<option>\n";
114
  %ustva = (48 => "Steuerfrei, Zeile 48",
115
            51 => "Steuerpflichtig 16%, Zeile 51",
116
            86 => "Steuerpflichtig 7%, Zeile 86",
117
            91 => "Steuerfrei, Zeile 91",
118
            97 => "Steuerpflichtig 16%, Zeile 97",
119
            93 => "Steuerpflichtig 7%, Zeile 93",
120
            94 => "Steuerpflichtig 16%, Zeile 94",
121
            66 => "Vorsteuer, Zeile 66");
114
  %ustva = (41  => "Steuerfrei IGL a. Abnehmer m. UStID (?4 Nr. 1b UStG), Nr. 41",
115
            44  => "Steuerfrei IGL n. Fahrz. o. UStID (?4 Nr. 1b UStG), Nr. 44",
116
            49  => "Steuerfrei IGL n. Fahrz. a. Unternehmen (?2a UStG), Nr. 49",
117
            43  => "Weit Steuerfreie Ums?tze m. VSt Abzug (Ausfuhr, Ums?tze ?4 Nr.2-7 UStG), Nr. 43",
118
            48  => "Steuerfreie Ums?tze ohne VSt.abzug (?4 Nr.8-28 UStG), Nr. 48",
119
            51  => "Steuerpflichtige Ums?tze 16%, Nr. 51",
120
            511 => "Steuerpflichtige Ums?tze 16%, Nr. 51 rechts",
121
            86  => "Steuerpflichtige Ums?tze 7%, Nr. 86",
122
            861 => "Steuerpflichtige Ums?tze 7%, Nr. 86 rechts",
123
            35  => "Nr. 35",
124
            77  => "Nr. 77",
125
            76  => "Nr. 76",
126
            80  => "Nr. 80",
127
            91  => "Steuerfrei, Nr. 91",
128
            97  => "Steuerpflichtig 16%, Nr. 97",
129
            971 => "Steuerpflichtig 16%, Nr. 97 rechts",
130
            93  => "Steuerpflichtig 7%, Nr. 93",
131
            931 => "Steuerpflichtig 7%, Nr. 93 rechts",
132
            95  => "Nr. 95",
133
            94  => "Steuerpflichtig 16%, Nr. 94",            
134
            96  => "Nr. 96",
135
            42  => "Nr. 42",
136
            60  => "Nr. 60",
137
            45  => "Nr. 45",
138
            52  => "Nr. 52",
139
            53  => "Nr. 53",
140
            73  => "Nr. 73",
141
            74  => "Nr. 74",
142
            84  => "Nr. 84",
143
            85  => "Nr. 85",
144
            65  => "Nr. 65",
145
            66  => "Abziehbare Vorsteuerbetr?ge, Nr. 66",
146
            61  => "Nr. 61",
147
            62  => "Nr. 62",
148
            67  => "Nr. 67",
149
            63  => "Nr. 63",
150
            64  => "Nr. 64",
151
            59  => "Nr. 59",
152
            69  => "Nr. 69",
153
            39  => "Nr. 39");
122 154
  foreach $item (sort({ $a <=> $b } keys %ustva)) {
123 155
    if ($item == $form->{pos_ustva}) {
124 156
      $form->{selectustva} .= "<option value=$item selected>$ustva{$item}\n";
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 
doc/ustva.html
211 211
</tr>
212 212
<tr class="listrow0">
213 213
 <td>51r</td>
214
 <td></td>
214
 <td><%511%></td>
215 215
 <td>
216 216
   <%51r%>
217 217
 </td>
......
254 254
</tr>
255 255
<tr class="listrow1">
256 256
 <td>86r </td>
257
 <td> </td>
257
 <td><%861%> </td>
258 258
 <td><%86r%> </td>
259 259
</tr>
260 260
<tr class="listrow0">
......
273 273
</tr>
274 274
<tr class="listrow0">
275 275
 <td>93r </td>
276
 <td> </td>
276
 <td><%931%> </td>
277 277
 <td><%93r%> </td>
278 278
</tr>
279 279
<tr class="listrow1">
......
297 297
</tr>
298 298
<tr class="listrow0">
299 299
 <td>97r </td>
300
 <td> </td>
300
 <td><%971%> </td>
301 301
 <td><%97r%> </td>
302 302
</tr>
303 303
</table>
sql/Germany-DATEV-SKR03EU-chart.sql
1
-- created by Yvonne Einberger
2
-- contributed by Andre Schubert
3
-- 
1 4
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0027', 'EDV-Software', 'A', 'A', 'AP_amount', '0027', 9, NULL, NULL, NULL, NULL, FALSE);
2 5
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0090', 'Gesch?ftsbauten', 'A', 'A', 'AP_amount', '0090', 9, NULL, NULL, NULL, NULL, FALSE);
3 6
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0200', 'Techn.Anlagen und Maschinen', 'A', 'A', 'AP_amount', '0200', 9, NULL, NULL, NULL, NULL, FALSE);
......
191 194
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0650', 'Vblk.geg.Kreditinst.- Restlaufzeit gr?sser als 5 Jahre', 'A', 'A', '', '0650', 0, NULL, NULL, NULL, NULL, FALSE);
192 195
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4510', 'Kfz-Steuer', 'A', 'E', 'AP_amount', '4510', 0, NULL, 19, NULL, 15, FALSE);
193 196
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('4520', 'Kfz-Versicherungen', 'A', 'E', 'AP_amount', '4520', 0, NULL, 14, NULL, 16, FALSE);
194
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1771', 'Umsatzsteuer 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1771', 0, NULL, NULL, NULL, 5, FALSE);
195
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1775', 'Umsatzsteuer 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1775', 0, NULL, NULL, NULL, 6, FALSE);
197
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1771', 'Umsatzsteuer 7%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1771', 861, NULL, NULL, NULL, 5, FALSE);
198
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1775', 'Umsatzsteuer 16%', 'A', 'I', 'AR_tax:IC_taxpart:IC_taxservice:CT_tax', '1775', 511, NULL, NULL, NULL, 6, FALSE);
196 199
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1767', 'Im anderen EG-Staat steuerpfl. Lieferung', 'A', ' ', '', '1767', 10, NULL, 0, NULL, NULL, FALSE);
197 200
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('0853', 'Satzungsm.R?cklagen 0% Vorbelast.(st.Einlagekto.)', 'A', 'Q', '', '0853', 0, NULL, NULL, NULL, NULL, FALSE);
198 201
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, taxkey_id, pos_ustva, pos_bwa, pos_bilanz, pos_eur, datevautomatik) VALUES ('1607', 'Vblk.a.LuL ohne Vorsteuer (E?R)', 'A', 'L', 'AP', '1607', 0, NULL, NULL, NULL, NULL, FALSE);
sql/Pg-upgrade-2.1.1-2.1.2.sql
235 235
ALTER TABLE orderitems ADD column pricegroup_id integer;
236 236

  
237 237
update defaults set version = '2.1.2', audittrail = 't';
238
--
239 238

  
240
-- add fields for ordnumber/transdate/cusordnumber in invoice/orderitems (r690 cleanup)
239
-- USTVA Update solve Bug 49 conributed by Andre Schubert
240
update chart set pos_ustva='861' where accno='1771';
241
update chart set pos_ustva='511' where accno='1775';
242
update chart set pos_ustva='511' where pos_ustva='51r';
243
update chart set pos_ustva='861' where pos_ustva='86r';
244
update chart set pos_ustva='971' where pos_ustva='97r';
245
update chart set pos_ustva='931' where pos_ustva='93r';
241 246

  
247
-- add fields for ordnumber/transdate/cusordnumber in invoice/orderitems (r690 cleanup)
242 248
alter table orderitems add column ordnumber text;
243 249
alter table orderitems add column transdate text;
244 250
alter table orderitems add column cusordnumber text;
sql/liste.sql
83 83
UPDATE chart set taxkey_id=0, pos_eur=31 WHERE accno='4397';
84 84
UPDATE chart set taxkey_id=0, pos_eur=17 WHERE accno='4500';
85 85
UPDATE chart set taxkey_id=9, pos_bwa=14, pos_eur=17 WHERE accno='4530';
86
UPDATE chart set taxkey_id=0, pos_ustva=0, pos_bwa=1 WHERE accno='8100';
86
UPDATE chart set taxkey_id=0, pos_ustva=48, pos_bwa=1 WHERE accno='8100';
87 87
UPDATE chart set taxkey_id=0, pos_eur=1 WHERE accno='8110';
88 88
UPDATE chart set taxkey_id=2, pos_ustva=86, pos_bwa=1, pos_eur=1 WHERE accno='8300';
89 89
UPDATE chart set taxkey_id=9, pos_bwa=14, pos_eur=17 WHERE accno='4540';
......
141 141
UPDATE chart set taxkey_id=0, pos_bwa=20, pos_eur=24 WHERE accno='4970';
142 142
UPDATE chart set taxkey_id=9, pos_bwa=20, pos_eur=24 WHERE accno='4980';
143 143
UPDATE chart set taxkey_id=9, pos_eur=19 WHERE accno='4985';
144
UPDATE chart set taxkey_id=0, pos_ustva=48, pos_bwa=1, pos_eur=1 WHERE accno='8120';
144
UPDATE chart set taxkey_id=0, pos_ustva=43, pos_bwa=1, pos_eur=1 WHERE accno='8120';
145 145
UPDATE chart set taxkey_id=0, pos_ustva=41, pos_bwa=1, pos_eur=1 WHERE accno='8125';
146 146
UPDATE chart set taxkey_id=0, pos_eur=1 WHERE accno='8130';
147 147
UPDATE chart set taxkey_id=0, pos_eur=1 WHERE accno='8135';
templates/German-ustva-2004.tex
57 57
\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
58 58
\end{tabular}\\[28.5mm]
59 59
\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
60
&&&&\\[42mm]
61
\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
62
\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[46mm]
63
\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
64
\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[7.9mm]
60
&&&&\\[22mm]
61
\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[14.5mm]
62
\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
63
\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[46mm]
64
\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
65
\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[7.9mm]
65 66
\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[14mm]
66
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\
67
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
67 68
%\multicolumn{2}{||r|}{1000} & & & \\
68 69
%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
69 70
%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
......
74 75
\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
75 76
\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
76 77
&&&&\\
77
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%45%>}\\[46mm]
78
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\[7.9mm]
78
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[46mm]
79
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[7.9mm]
79 80
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[39.8mm]
80
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[26.5mm]
81
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
81
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[26.5mm]
82
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
82 83
\end{tabular}\\[35mm]
83 84
<%if FA_steuerberater%>
84 85
\vspace{11mm}
templates/German-ustva-2005.tex
57 57
\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
58 58
\end{tabular}\\[28.5mm]
59 59
\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
60
&&&&\\[35mm]
61
\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
62
\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[39mm]
63
\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
64
\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[7.9mm]
60
&&&&\\[22.5mm]
61
\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
62
\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
63
\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[39mm]
64
\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
65
\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[7.9mm]
65 66
\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
66
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\
67
%\multicolumn{2}{||r|}{1000} & & & \\
68
%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
69
%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
67
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
70 68
\end{tabular}
71 69

  
72 70
\newpage
......
74 72
\vspace*{-10mm}\hspace{27mm}<%steuernummer%>\\[-2.5mm]
75 73
\begin{tabular}[b]{p{95mm}p{28mm}p{2.55mm}p{4mm}p{35mm}}
76 74
&&&&\\
77
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%45%>}\\[46mm]
78
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\[7.9mm]
75
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[46mm]
76
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[7.9mm]
79 77
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[40mm]
80
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[26.5mm]
81
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
78
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[26.5mm]
79
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
82 80
\end{tabular}\\[35mm]
83 81
<%if FA_steuerberater%>
84 82
\vspace{11mm}
templates/German-ustva-2006.tex
57 57
\multicolumn{2}{p{7.5cm}}{\small{<%email%>}}& & & & &\\[-1mm]
58 58
\end{tabular}\\[29.5mm]
59 59
\begin{tabular}[b]{p{99mm}p{26.5mm}p{4.55mm}p{4mm}p{35mm}}
60
&&&&\\[38mm]
61
\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%51r%>}\\[1.5mm]
62
\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%86r%>}\\[42mm]
63
\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%97r%>}\\[1.5mm]
64
\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%93r%>}\\[8.5mm]
60
&&&&\\[24.5mm]
61
\multicolumn{2}{r}{<%48%>} & & \multicolumn{2}{r}{}\\[7.5mm]
62
\multicolumn{2}{r}{<%51%>} & & \multicolumn{2}{r}{<%511%>}\\[1.5mm]
63
\multicolumn{2}{r}{<%86%>} & & \multicolumn{2}{r}{<%861%>}\\[42mm]
64
\multicolumn{2}{r}{<%97%>} & & \multicolumn{2}{r}{<%971%>}\\[1.5mm]
65
\multicolumn{2}{r}{<%93%>} & & \multicolumn{2}{r}{<%931%>}\\[8.5mm]
65 66
\multicolumn{2}{r}{<%94%>} & & \multicolumn{2}{r}{<%96%>}\\[28mm]
66
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\
67
%\multicolumn{2}{||r|}{1000} & & & \\
68
%\multicolumn{2}{||r|}{1000} & & \multicolumn{2}{r}{100.000.000~~00}\\
69
%\multicolumn{3}{||r|}{1.000.000.000~~00} & \multicolumn{2}{r}{100.000.000~~00}\\
67
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z43%>}\\
70 68
\end{tabular}
71 69

  
72 70
\newpage
......
74 72
\vspace*{-9.5mm}\hspace{27mm}<%steuernummer%>\\[-2.7mm]
75 73
\begin{tabular}[b]{p{99mm}p{25.2mm}p{2.55mm}p{10mm}p{32mm}}
76 74
&&&&\\
77
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%45%>}\\[48mm]
78
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%43%>}\\[8.9mm]
75
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z45%>}\\[48mm]
76
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z53%>}\\[8.9mm]
79 77
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%66%>}\\[42mm]
80
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%62%>}\\[28mm]
81
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%67%>}}\\[26mm]
78
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{<%Z62%>}\\[28mm]
79
\multicolumn{2}{r}{} & & \multicolumn{2}{r}{\textbf{<%83%>}}\\[26mm]
82 80
\end{tabular}\\[35mm]
83 81
<%if FA_steuerberater%>
84 82
\vspace{11mm}
templates/German-ustva.html
80 80
<table border="0" cellspacing="2" cellpadding="2">
81 81
  <tbody>
82 82
    <tr>
83
      <td class="text"><b class="h3">Steuerpflichtige Ums&auml;tze</b></td>
83
      <td class="text"><b class="h3">I. Anmeldung der
84
Umsatzsteuer-Vorauszahlung </b></td>
85
      <td colspan="4"></td>
86
    </tr>
87
    <tr>
88
      <td class="text"><b class="h4">Lieferungen und sonstige Leistungen</b></td>
89
      <td colspan="4"></td>
90
    </tr>
91
        <tr>
92
      <td class="text">???</td>
93
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>41<span class="nodis">)</span></td>
94
      <td class="betrag ausfuellen" width="70"><%41%><br></td>
95
      <td class="spalte"><span class="nodis"></span></td>
96
      <td class="betrag"></td>
97
    </tr>
98
    <tr>
99
      <td class="text">???</td>
100
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>44<span class="nodis">)</span></td>
101
      <td class="betrag ausfuellen" width="70"><%44%><br></td>
102
      <td class="spalte"><span class="nodis"></span></td>
103
      <td class="betrag"></td>
104
    </tr>
105
    <tr>
106
      <td class="text">???</td>
107
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>49<span class="nodis">)</span></td>
108
      <td class="betrag ausfuellen" width="70"><%49%><br></td>
109
      <td class="spalte"><span class="nodis"></span></td>
110
      <td class="betrag"></td>
111
    </tr>
112
    <tr>
113
      <td class="text">???</td>
114
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>43<span class="nodis">)</span></td>
115
      <td class="betrag ausfuellen" width="70"><%43%><br></td>
116
      <td class="spalte"><span class="nodis"></span></td>
117
      <td class="betrag"></td>
118
    </tr>
119
    <tr>
120
      <td class="text">Steuerfreie Ums&auml;tze ohne
121
Vorsteuerabzug. </b><br />Ums?tze nach ? 4 Nr. 8 bis 20 UStG</td>
122
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>48<span class="nodis">)</span></td>
123
      <td class="betrag ausfuellen" width="70"><%48%><br></td>
124
      <td class="spalte"><span class="nodis"></span></td>
125
      <td class="betrag"></td>
126
    </tr>
127

  
128
    <tr>
129
      <td class="text"><b class="h4">Steuerpflichtige Ums&auml;tze</b></td>
84 130
      <td colspan="4"></td>
85 131
    </tr>
86 132
    <tr>
......
88 134
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>51<span class="nodis">)</span></td>
89 135
      <td class="betrag ausfuellen" width="70"><%51%><br></td>
90 136
      <td class="spalte"><span class="nodis">(Spalte 51 rechts)</span></td>
91
      <td class="betrag"><%51r%></td>
137
      <td class="betrag"><%511%></td>
92 138
    </tr>
93 139
    <tr>
94 140
      <td class="text">zum Steuersatz von 7 v.H.</td>
95 141
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>86<span class="nodis">)</span></td>
96 142
      <td class="betrag ausfuellen"><%86%></td>
97 143
      <td class="spalte"><span class="nodis">(Spalte 86 rechts)</span></td>
98
      <td class="betrag"><%86r%></td>
144
      <td class="betrag"><%861%></td>
145
    </tr>
146
    <tr>
147
      <td class="text">andere Steuers?tze</td>
148
      <td class="spalte ausfuellen"><span class="nodis"></span>35 <span class="nodis"></span></td>
149
      <td class="betrag ausfuellen"><%35%></td>
150
      <td class="spalte">36</td>
151
      <td class="betrag ausfuellen"><%36%></td>
152
    </tr>
153
    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
154
   <tr>
155
      <td class="text">???</td>
156
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>77<span class="nodis">)</span></td>
157
      <td class="betrag ausfuellen" width="70"><%77%><br></td>
158
      <td class="spalte"><span class="nodis"></span></td>
159
      <td class="betrag"></td>
160
    </tr>
161
    <tr>
162
      <td class="text">???</td>
163
      <td class="spalte ausfuellen"><span class="nodis"></span>76 <span class="nodis"></span></td>
164
      <td class="betrag ausfuellen"><%76%></td>
165
      <td class="spalte">80</td>
166
      <td class="betrag ausfuellen"><%80%></td>
99 167
    </tr>
100

  
101 168
    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
102

  
103 169
    <tr>
104
      <td class="text"><b class="h3">Steuerpflichtige innergemeinsachftliche Erwerbe</b></td>
170
      <td class="text"><b class="h3">Innergemeinsachftliche Erwerbe</b></td>
105 171
      <td colspan="4"></td>
106 172
    </tr>
173
   <tr>
174
      <td class="text">???</td>
175
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>91<span class="nodis">)</span></td>
176
      <td class="betrag ausfuellen" width="70"><%91%><br></td>
177
      <td class="spalte"><span class="nodis"></span></td>
178
      <td class="betrag"></td>
179
    </tr>
180

  
107 181
    <tr>
108
      <td class="text">zum Steuersatz von 16 v.H.</td>
182
      <td class="text">Steuerpflichtige innergemeinsachftliche Erwerbe<br />
183
      zum Steuersatz von 16 v.H.</td>
109 184
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>97<span class="nodis">)</span></td>
110 185
      <td class="betrag ausfuellen"><%97%><br></td>
111 186
      <td class="spalte"><span class="nodis">(Spalte 97 rechts)</span></td>
112
      <td class="betrag"><%97r%></td>
187
      <td class="betrag"><%971%></td>
113 188
    </tr>
114 189
    <tr>
115 190
      <td class="text">zum Steuersatz von 7 v.H.</td>
116 191
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>93<span class="nodis">)</span></td>
117 192
      <td class="betrag ausfuellen"><%93%></td>
118 193
      <td class="spalte"><span class="nodis">(Spalte 93 rechts)</span></td>
119
      <td class="betrag"><%93r%></td>
194
      <td class="betrag"><%931%></td>
120 195
    </tr>
196
    <tr>
197
      <td class="text">???</td>
198
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>95<span class="nodis">)</span></td>
199
      <td class="betrag ausfuellen"><%95%></td>
200
      <td class="spalte">98</td>
201
      <td class="betrag"><%98%></td>
202
    </tr>
203

  
121 204

  
122
    <tr><td class="text">&nbsp;</td><td colspan="4"></td></tr>
123 205

  
124 206
    <tr>
125
      <td class="text"><b class="h3">neuer Fahrzeuge von Lieferern</b><br/>
207
      <td class="text"><b class="h4">neuer Fahrzeuge von Lieferern</b><br/>
126 208
             von Lieferanten <b>ohne</b> USt.IdNr. <br class="nodis" />
127 209
	     zum allgemeinen Steuersatz</td>
128 210
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>94<span class="nodis">)</span></td>
......
130 212
      <td class="spalte"><span class="nodis">(Spalte </span>96<span class="nodis">)</span></td>
131 213
      <td class="betrag"><%96%></td>
132 214
    </tr>
215
        <tr><td class="text">&nbsp;</td><td colspan="4"></td></tr>
216
   <tr>
217
      <td class="text">???</td>
218
      <td class="spalte ausfuellen">42</td>
219
      <td class="betrag ausfuellen" width="70"><%42%><br></td>
220
      <td class="spalte"><span class="nodis"></span></td>
221
      <td class="betrag"></td>
222
    </tr>
223
   <tr>
224
      <td class="text">???</td>
225
      <td class="spalte ausfuellen">60</td>
226
      <td class="betrag ausfuellen" width="70"><%60%><br></td>
227
      <td class="spalte"><span class="nodis"></span></td>
228
      <td class="betrag"></td>
229
    </tr>
230
   <tr>
231
      <td class="text">???</td>
232
      <td class="spalte ausfuellen">45</td>
233
      <td class="betrag ausfuellen" width="70"><%45%><br></td>
234
      <td class="spalte"><span class="nodis"></span></td>
235
      <td class="betrag"></td>
236
    </tr>
133 237

  
134 238
    <tr><td class="text">&nbsp;</td><td class="spacer" colspan="2"></td><td colspan="2"></td></tr>
135 239

  
136 240
    <tr>
137 241
      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
138 242
      <td class="zeile"><span class="nodis">(</span>Zeile 43<span class="nodis">)</span></td>
139
      <td class="betrag"><%43%></td>
243
      <td class="betrag"><%Z43%></td>
140 244
    </tr>
245

  
141 246
    <tr class="uebertrag">
142 247
      <td class="text" colspan="3"><b class="h3">&Uuml;bertrag</td>
143 248
      <td class="zeile"><span class="nodis">(</span>Zeile 45<span class="nodis">)</span></td>
144
      <td class="betrag"><%45%></td>
249
      <td class="betrag"><%Z45%></td>
250
    </tr>
251

  
252
    <tr>
253
      <td class="text">???</td>
254
      <td class="spalte ausfuellen">52</td>
255
      <td class="betrag ausfuellen"><%52%></td>
256
      <td class="spalte">53</td>
257
      <td class="betrag"><%53%></td>
258
    </tr>
259
    <tr>
260
      <td class="text">???</td>
261
      <td class="spalte ausfuellen">73</td>
262
      <td class="betrag ausfuellen"><%73%></td>
263
      <td class="spalte">74</td>
264
      <td class="betrag"><%74%></td>
265
    </tr>
266
    <tr>
267
      <td class="text">???</td>
268
      <td class="spalte ausfuellen">84</td>
269
      <td class="betrag ausfuellen"><%84%></td>
270
      <td class="spalte">85</td>
271
      <td class="betrag"><%85%></td>
272
    </tr>
273
    <tr>
274
      <td class="text" colspan="3">???</td>
275
      <td class="spalte ausfuellen">65</td>
276
      <td class="betrag ausfuellen"><%65%></td>
145 277
    </tr>
146 278

  
279

  
280

  
147 281
    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
148 282

  
149 283
    <tr>
150 284
      <td class="text" colspan="3"><b class="h3">Umsatzsteuer</td>
151 285
      <td class="zeile"><span class="nodis">(</span>Zeile 53<span class="nodis">)</span></td>
152
      <td class="betrag"><%43%></td>
286
      <td class="betrag"><%Z53%></td>
153 287
    </tr>
154 288

  
155 289
    <tr><td class="text" colspan="3">&nbsp;</td><td class="spacer" colspan="4"></td></tr>
......
165 299
      <td class="spalte ausfuellen"><span class="nodis">(Spalte </span>66<span class="nodis">)</span></td>
166 300
      <td class="betrag ausfuellen"><%66%></td>
167 301
    </tr>
168

  
169
    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="2"></td></tr>
302
    <tr>
303
      <td class="text" colspan="3">???</td>
304
      <td class="spalte ausfuellen">61</td>
305
      <td class="betrag ausfuellen"><%61%></td>
306
    </tr>
307
    <tr>
308
      <td class="text" colspan="3">???</td>
309
      <td class="spalte ausfuellen">62</td>
310
      <td class="betrag ausfuellen"><%62%></td>
311
    </tr>
312
    <tr>
313
      <td class="text" colspan="3">???</td>
314
      <td class="spalte ausfuellen">67</td>
315
      <td class="betrag ausfuellen"><%67%></td>
316
    </tr>
317
    <tr>
318
      <td class="text" colspan="3">???</td>
319
      <td class="spalte ausfuellen">63</td>
320
      <td class="betrag ausfuellen"><%63%></td>
321
    </tr>
322
    <tr>
323
      <td class="text" colspan="3">???</td>
324
      <td class="spalte ausfuellen">64</td>
325
      <td class="betrag ausfuellen"><%64%></td>
326
    </tr>
327
    <tr>
328
      <td class="text" colspan="3">???</td>
329
      <td class="spalte ausfuellen">59</td>
330
      <td class="betrag ausfuellen"><%59%></td>
331
    </tr>
170 332

  
171 333
    <tr>
172 334
      <td class="text" colspan="3">Verbleibender Betrag</td>
173 335
      <td class="zeile"><span class="nodis">(</span>Zeile 62<span class="nodis">)</span></td>
174
      <td class="betrag"><%62%></td>
336
      <td class="betrag"><%Z62%></td>
337
    </tr>
338
    <tr>
339
      <td class="text" colspan="3">???</td>
340
      <td class="spalte ausfuellen">69</td>
341
      <td class="betrag ausfuellen"><%69%></td>
175 342
    </tr>
176 343

  
177 344
    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
......
179 346
    <tr>
180 347
      <td class="text" colspan="3"><b class="h3">Umsatzsteuer-Vorauszahlung/&Uuml;berschuss</b></td>
181 348
      <td class="zeile"><span class="nodis">(</span>Zeile 65<span class="nodis">)</span></td>
182
      <td class="betrag"><%65%></td>
349
      <td class="betrag"><%Z65%></td>
350
    </tr>
351
    <tr>
352
      <td class="text" colspan="3">???</td>
353
      <td class="spalte ausfuellen">39</td>
354
      <td class="betrag ausfuellen"><%39%></td>
183 355
    </tr>
184 356

  
185 357
    <tr><td class="text" colspan="3">&nbsp;</td><td colspan="4"></td></tr>
......
187 359
    <tr class="noborder">
188 360
      <td class="text" colspan="3"><u>Verbleibende Umsatzsteuer-Vorauszahlung</u><br/>
189 361
                                      Verbleibender &Uuml;berschuss</td>
190
      <td class="zeile"><span class="nodis">(</span>Zeile 67<span class="nodis">)</span></td>
191
      <td class="summe"><%67%></td>
362
      <td class="spalte ausfuellen">83</td>
363
      <td class="summe"><%83%></td>
192 364
    </tr>
193 365

  
194 366
  </tbody>

Auch abrufbar als: Unified diff