X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=fec1b038c66ee3fd3febd9d32e78a58eb09e1ccd;hb=0e53c08e76f1fa8a2627f229033b67a1a662c7e7;hp=8696cba0da19d48bde3c8627b2c0d37cfa91b3c6;hpb=0acf0e35540578a0802d660ede4f338afc0a6aa5;p=kivitendo-erp.git

diff --git a/SL/AM.pm b/SL/AM.pm
index 8696cba0d..fec1b038c 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -48,7 +48,7 @@ sub get_account {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
   my $query =
-    qq!SELECT c.accno, c.description, c.charttype, c.gifi_accno, c.category,! .
+    qq!SELECT c.accno, c.description, c.charttype, c.category,! .
     qq!  c.link, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from, ! .
     qq!  c.pos_bwa, ! .
     qq!  tk.taxkey_id, tk.pos_ustva, tk.tax_id, ! .
@@ -183,13 +183,13 @@ sub save_account {
   if ($form->{id}) {
     $query = qq|UPDATE chart SET
                 accno = ?, description = ?, charttype = ?,
-                gifi_accno = ?, category = ?, link = ?,
+                category = ?, link = ?,
                 taxkey_id = ?,
                 pos_ustva = ?, pos_bwa   = ?, pos_bilanz = ?,
                 pos_eur = ?, new_chart_id = ?, valid_from = ?
                 WHERE id = ?|;
     @values = ($form->{accno}, $form->{description}, $form->{charttype},
-               $form->{gifi_accno}, $form->{category}, $form->{link},
+               $form->{category}, $form->{link},
                conv_i($taxkey),
                conv_i($form->{pos_ustva}), conv_i($form->{pos_bwa}),
                conv_i($form->{pos_bilanz}), conv_i($form->{pos_eur}),
@@ -205,14 +205,12 @@ sub save_account {
   } else {
     $query = qq|INSERT INTO chart
                 (accno, description, charttype,
-                 gifi_accno, category, link,
-                 taxkey_id,
+                 category, link, taxkey_id,
                  pos_ustva, pos_bwa, pos_bilanz, pos_eur,
                  new_chart_id, valid_from)
                 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
     @values = ($form->{accno}, $form->{description}, $form->{charttype},
-               $form->{gifi_accno}, $form->{category}, $form->{link},
-               conv_i($taxkey),
+               $form->{category}, $form->{link}, conv_i($taxkey),
                conv_i($form->{pos_ustva}), conv_i($form->{pos_bwa}),
                conv_i($form->{pos_bilanz}), conv_i($form->{pos_eur}),
                conv_i($form->{new_chart_id}),
@@ -1671,7 +1669,7 @@ sub unit_select_data {
     push(@{$select}, { "name" => "", "base_unit" => "", "factor" => "", "selected" => "" });
   }
 
-  foreach my $unit (sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } keys(%{$units}))) {
+  foreach my $unit (sort({ $units->{$a}->{"sortkey"} <=> $units->{$b}->{"sortkey"} } keys(%{$units}))) {
     push(@{$select}, { "name" => $unit,
                        "base_unit" => $units->{$unit}->{"base_unit"},
                        "factor" => $units->{$unit}->{"factor"},
@@ -1690,7 +1688,7 @@ sub unit_select_html {
 
   my $select = "<select name=${name}>";
 
-  foreach my $unit (sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } keys(%{$units}))) {
+  foreach my $unit (sort({ $units->{$a}->{"sortkey"} <=> $units->{$b}->{"sortkey"} } keys(%{$units}))) {
     if (!$convertible_into ||
         ($units->{$convertible_into} &&
          ($units->{$convertible_into}->{"base_unit"} eq $units->{$unit}->{"base_unit"}))) {