Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b85b47c5

Von Udo Spallek vor fast 18 Jahren hinzugefügt

  • ID b85b47c5656456624239794cf821c824a947a93f
  • Vorgänger 0eeecc3c
  • Nachfolger 8b5fe5b9

Erstes Update zur USTVA Anpassung an 16%/19%.
- Kennziffern 81,811, 51,511 werden 2006 und 2007 unterstützt.
- HTML testscript für selenium IDE

Unterschiede anzeigen:

SL/USTVA.pm
597 597
  &get_accounts_ustva($dbh, $last_period, $form->{fromdate}, $form->{todate},
598 598
                      $form, $category);
599 599

  
600

  
601
  # 16%/19% Umstelung
602
  # Umordnen der Kennziffern und abfangen von Fehlern 
603

  
604
#  $form->header;
605
#  print $form->{81};
606

  
607
  if ( $form->{year} < 2007) {
608
    $form->{35} += $form->{81};
609
    $form->{36} += $form->{811};
610
    $form->{95} += $form->{89};
611
    $form->{98} += $form->{891};
612
    map { delete $form->{$_} } qw(81 811 89 891);
613
  } else {
614
    $form->{35} += $form->{51};
615
    $form->{36} += $form->{511};
616
    $form->{95} += $form->{97};
617
    $form->{98} += $form->{971};
618
    map { delete $form->{$_} } qw(51 511 97 971);
619
  }
620

  
600 621
  #
601 622
  # Berechnung der USTVA Formularfelder laut Bogen 207
602 623
  #
......
705 726
      select amount from ar where id = ac.trans_id  
706 727
     )
707 728
   ) AS amount,
708
   c.pos_ustva
729
   tk.pos_ustva
709 730
   FROM acc_trans ac
710
   JOIN chart c ON (c.id = ac.chart_id)
711
   --JOIN ar ON (ar.id = ac.trans_id)
712
   where 
731
   LEFT JOIN chart c ON (c.id = ac.chart_id)
732
   LEFT JOIN ar ON (ar.id = ac.trans_id)
733
   LEFT JOIN taxkeys tk ON (
734
     tk.id = (
735
       SELECT id FROM taxkeys 
736
       WHERE chart_id=ac.chart_id 
737
         AND taxkey_id=ac.taxkey 
738
         
739
         AND startdate <= COALESCE(ar.deliverydate, ar.transdate)
740
       ORDER BY startdate DESC LIMIT 1
741
     )
742
   )
743
   WHERE 
713 744
     1=1 
714 745
     -- Here no where, please. All Transactions ever should be
715 746
     -- testet if they are paied in the USTVA report period.
716
   GROUP BY c.pos_ustva
747
   GROUP BY tk.pos_ustva
717 748

  
718 749
 UNION -- alle Ausgaben AP erfassen
719 750

  

Auch abrufbar als: Unified diff