Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b989d7cf

Von Kivitendo Admin vor mehr als 10 Jahren hinzugefügt

  • ID b989d7cfb4bd8de5c3e290b8df0519ad34d5dd0c
  • Vorgänger f207efd1
  • Nachfolger f5c454e3

Auf Datenbankebene Steuerzonen konfigurierbar gemacht

Damit können jetzt mehr als die 4 Standardsteuerzonen eingerichtet
werden. Die bisherigen Steuerzonen wurden aus der Tabelle
buchungsgruppen in die neue Tabelle taxzone_charts ausgelagert.

Konzeption siehe Ticket #2295

Es wurden noch keinerlei Veränderungen an der Kivitendo
Benutzeroberfläche durchgeführt, durch dieses Upgrade können die
Buchungsgruppen also nicht mehr konfiguriert werden, dies muß auf
Datenbankebene passieren.

Rose schon angepasst.

Conflicts:

SL/DB/MetaSetup/Buchungsgruppe.pm

Unterschiede anzeigen:

SL/AM.pm
747 747

  
748 748
  # connect to database
749 749
  my $dbh = $form->dbconnect($myconfig);
750

  
750
  # TODO: extract information about income/expense accounts from new table taxzone_chart
751 751
  my $query = qq|SELECT id, description,
752 752
                 inventory_accno_id,
753
                 (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno,
754
                 income_accno_id_0,
755
                 (SELECT accno FROM chart WHERE id = income_accno_id_0) AS income_accno_0,
756
                 expense_accno_id_0,
757
                 (SELECT accno FROM chart WHERE id = expense_accno_id_0) AS expense_accno_0,
758
                 income_accno_id_1,
759
                 (SELECT accno FROM chart WHERE id = income_accno_id_1) AS income_accno_1,
760
                 expense_accno_id_1,
761
                 (SELECT accno FROM chart WHERE id = expense_accno_id_1) AS expense_accno_1,
762
                 income_accno_id_2,
763
                 (SELECT accno FROM chart WHERE id = income_accno_id_2) AS income_accno_2,
764
                 expense_accno_id_2,
765
                 (select accno FROM chart WHERE id = expense_accno_id_2) AS expense_accno_2,
766
                 income_accno_id_3,
767
                 (SELECT accno FROM chart WHERE id = income_accno_id_3) AS income_accno_3,
768
                 expense_accno_id_3,
769
                 (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3
753
                 (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno
770 754
                 FROM buchungsgruppen
771 755
                 ORDER BY sortkey|;
772 756

  
......
794 778
  my $dbh = $form->dbconnect($myconfig);
795 779

  
796 780
  if ($form->{id}) {
781
    # TODO: extract information about income/expense accounts from new table taxzone_chart
797 782
    $query =
798 783
      qq|SELECT description, inventory_accno_id,
799
         (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno,
800
         income_accno_id_0,
801
         (SELECT accno FROM chart WHERE id = income_accno_id_0) AS income_accno_0,
802
         expense_accno_id_0,
803
         (SELECT accno FROM chart WHERE id = expense_accno_id_0) AS expense_accno_0,
804
         income_accno_id_1,
805
         (SELECT accno FROM chart WHERE id = income_accno_id_1) AS income_accno_1,
806
         expense_accno_id_1,
807
         (SELECT accno FROM chart WHERE id = expense_accno_id_1) AS expense_accno_1,
808
         income_accno_id_2,
809
         (SELECT accno FROM chart WHERE id = income_accno_id_2) AS income_accno_2,
810
         expense_accno_id_2,
811
         (select accno FROM chart WHERE id = expense_accno_id_2) AS expense_accno_2,
812
         income_accno_id_3,
813
         (SELECT accno FROM chart WHERE id = income_accno_id_3) AS income_accno_3,
814
         expense_accno_id_3,
815
         (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3
784
         (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno
816 785
         FROM buchungsgruppen
817 786
         WHERE id = ?|;
818 787
    my $sth = $dbh->prepare($query);

Auch abrufbar als: Unified diff