X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAM.pm;h=2cf6a43f14c07f0fc816fdc48a3ad517c32e398c;hb=10d6fe63ec82e50322a1fe08902fde7a0c1efa4e;hp=c18cfd785b269b24ca15421b06ad0edb85db121b;hpb=b989d7cfb4bd8de5c3e290b8df0519ad34d5dd0c;p=kivitendo-erp.git

diff --git a/SL/AM.pm b/SL/AM.pm
index c18cfd785..2cf6a43f1 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -45,6 +45,7 @@ use SL::DBUtils;
 use SL::DB::AuthUser;
 use SL::DB::Default;
 use SL::DB::Employee;
+use SL::DB::Chart;
 use SL::GenericTranslations;
 
 use strict;
@@ -58,7 +59,7 @@ sub get_account {
   my $dbh = $form->dbconnect($myconfig);
   my $query = qq{
     SELECT c.accno, c.description, c.charttype, c.category,
-      c.link, c.pos_bilanz, c.pos_eur, c.new_chart_id, c.valid_from,
+      c.link, c.pos_bilanz, c.pos_eur, c.pos_er, c.new_chart_id, c.valid_from,
       c.pos_bwa, datevautomatik,
       tk.taxkey_id, tk.pos_ustva, tk.tax_id,
       tk.tax_id || '--' || tk.taxkey_id AS tax, tk.startdate
@@ -300,6 +301,7 @@ sub save_account {
                   pos_bwa   = ?,
                   pos_bilanz = ?,
                   pos_eur = ?,
+                  pos_er = ?,
                   new_chart_id = ?,
                   valid_from = ?,
                   datevautomatik = ?
@@ -314,6 +316,7 @@ sub save_account {
                   conv_i($form->{pos_bwa}),
                   conv_i($form->{pos_bilanz}),
                   conv_i($form->{pos_eur}),
+                  conv_i($form->{pos_er}),
                   conv_i($form->{new_chart_id}),
                   conv_date($form->{valid_from}),
                   ($form->{datevautomatik} eq 'T') ? 'true':'false',
@@ -739,205 +742,6 @@ sub delete_language {
   $main::lxdebug->leave_sub();
 }
 
-
-sub buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-  # TODO: extract information about income/expense accounts from new table taxzone_chart
-  my $query = qq|SELECT id, description,
-                 inventory_accno_id,
-                 (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno
-                 FROM buchungsgruppen
-                 ORDER BY sortkey|;
-
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $form->{ALL} = [];
-  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
-    push @{ $form->{ALL} }, $ref;
-  }
-
-  $sth->finish;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub get_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-  my $query;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  if ($form->{id}) {
-    # TODO: extract information about income/expense accounts from new table taxzone_chart
-    $query =
-      qq|SELECT description, inventory_accno_id,
-         (SELECT accno FROM chart WHERE id = inventory_accno_id) AS inventory_accno
-         FROM buchungsgruppen
-         WHERE id = ?|;
-    my $sth = $dbh->prepare($query);
-    $sth->execute($form->{id}) || $form->dberror($query . " ($form->{id})");
-
-    my $ref = $sth->fetchrow_hashref("NAME_lc");
-
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
-
-    $sth->finish;
-
-    $query =
-      qq|SELECT count(id) = 0 AS orphaned
-         FROM parts
-         WHERE buchungsgruppen_id = ?|;
-    ($form->{orphaned}) = selectrow_query($form, $dbh, $query, $form->{id});
-  }
-
-  $query = "SELECT inventory_accno_id, income_accno_id, expense_accno_id ".
-    "FROM defaults";
-  ($form->{"std_inventory_accno_id"}, $form->{"std_income_accno_id"},
-   $form->{"std_expense_accno_id"}) = selectrow_query($form, $dbh, $query);
-
-  my $module = "IC";
-  $query = qq|SELECT c.accno, c.description, c.link, c.id,
-              d.inventory_accno_id, d.income_accno_id, d.expense_accno_id
-              FROM chart c, defaults d
-              WHERE c.link LIKE '%$module%'
-              ORDER BY c.accno|;
-
-
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
-    foreach my $key (split(/:/, $ref->{link})) {
-      if (!$form->{"std_inventory_accno_id"} && ($key eq "IC")) {
-        $form->{"std_inventory_accno_id"} = $ref->{"id"};
-      }
-      if ($key =~ /$module/) {
-        if (   ($ref->{id} eq $ref->{inventory_accno_id})
-            || ($ref->{id} eq $ref->{income_accno_id})
-            || ($ref->{id} eq $ref->{expense_accno_id})) {
-          push @{ $form->{"${module}_links"}{$key} },
-            { accno       => $ref->{accno},
-              description => $ref->{description},
-              selected    => "selected",
-              id          => $ref->{id} };
-        } else {
-          push @{ $form->{"${module}_links"}{$key} },
-            { accno       => $ref->{accno},
-              description => $ref->{description},
-              selected    => "",
-              id          => $ref->{id} };
-        }
-      }
-    }
-  }
-  $sth->finish;
-
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my @values = ($form->{description}, $form->{inventory_accno_id},
-                $form->{income_accno_id_0}, $form->{expense_accno_id_0},
-                $form->{income_accno_id_1}, $form->{expense_accno_id_1},
-                $form->{income_accno_id_2}, $form->{expense_accno_id_2},
-                $form->{income_accno_id_3}, $form->{expense_accno_id_3});
-
-  my $query;
-
-  # id is the old record
-  if ($form->{id}) {
-    $query = qq|UPDATE buchungsgruppen SET
-                description = ?, inventory_accno_id = ?,
-                income_accno_id_0 = ?, expense_accno_id_0 = ?,
-                income_accno_id_1 = ?, expense_accno_id_1 = ?,
-                income_accno_id_2 = ?, expense_accno_id_2 = ?,
-                income_accno_id_3 = ?, expense_accno_id_3 = ?
-                WHERE id = ?|;
-    push(@values, $form->{id});
-  } else {
-    $query = qq|SELECT COALESCE(MAX(sortkey) + 1, 1) FROM buchungsgruppen|;
-    my ($sortkey) = $dbh->selectrow_array($query);
-    $form->dberror($query) if ($dbh->err);
-    push(@values, $sortkey);
-    $query = qq|INSERT INTO buchungsgruppen
-                (description, inventory_accno_id,
-                income_accno_id_0, expense_accno_id_0,
-                income_accno_id_1, expense_accno_id_1,
-                income_accno_id_2, expense_accno_id_2,
-                income_accno_id_3, expense_accno_id_3,
-                sortkey)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
-  }
-  do_query($form, $dbh, $query, @values);
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub delete_buchungsgruppe {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|DELETE FROM buchungsgruppen WHERE id = ?|;
-  do_query($form, $dbh, $query, $form->{id});
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub swap_sortkeys {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form, $table) = @_;
-
-  # connect to database
-  my $dbh = $form->get_standard_dbh($myconfig);
-
-  my $query =
-    qq|SELECT
-       (SELECT sortkey FROM $table WHERE id = ?) AS sortkey1,
-       (SELECT sortkey FROM $table WHERE id = ?) AS sortkey2|;
-  my @values   = ($form->{"id1"}, $form->{"id2"});
-  my @sortkeys = selectrow_query($form, $dbh, $query, @values);
-
-  $query  = qq|UPDATE $table SET sortkey = ? WHERE id = ?|;
-  my $sth = prepare_query($form, $dbh, $query);
-
-  do_statement($form, $sth, $query, $sortkeys[1], $form->{"id1"});
-  do_statement($form, $sth, $query, $sortkeys[0], $form->{"id2"});
-
-  $sth->finish();
-
-  $dbh->commit();
-
-  $main::lxdebug->leave_sub();
-}
-
 sub prepare_template_filename {
   $main::lxdebug->enter_sub();
 
@@ -1028,10 +832,10 @@ sub save_preferences {
 
   my ($self, $form) = @_;
 
-  my $employee = SL::DB::Manager::Employee->find_by(login => $form->{login});
+  my $employee = SL::DB::Manager::Employee->find_by(login => $::myconfig{login});
   $employee->update_attributes(name => $form->{name});
 
-  my $user = SL::DB::Manager::AuthUser->find_by(login => $form->{login});
+  my $user = SL::DB::Manager::AuthUser->find_by(login => $::myconfig{login});
   $user->update_attributes(
     config_values => {
       %{ $user->config_values },
@@ -1380,7 +1184,7 @@ sub sum_with_unit {
 
   $main::lxdebug->leave_sub();
 
-  return wantarray ? ($sum, $base_unit) : $sum;
+  return $sum;
 }
 
 sub add_unit {
@@ -1485,7 +1289,11 @@ sub taxes {
                    t.taxdescription,
                    round(t.rate * 100, 2) AS rate,
                    (SELECT accno FROM chart WHERE id = chart_id) AS taxnumber,
-                   (SELECT description FROM chart WHERE id = chart_id) AS account_description
+                   (SELECT description FROM chart WHERE id = chart_id) AS account_description,
+                   (SELECT accno FROM chart WHERE id = skonto_sales_chart_id) AS skonto_chart_accno,
+                   (SELECT description FROM chart WHERE id = skonto_sales_chart_id) AS skonto_chart_description,
+                   (SELECT accno FROM chart WHERE id = skonto_purchase_chart_id) AS skonto_chart_purchase_accno,
+                   (SELECT description FROM chart WHERE id = skonto_purchase_chart_id) AS skonto_chart_purchase_description
                  FROM tax t
                  ORDER BY taxkey, rate|;
 
@@ -1527,6 +1335,17 @@ sub get_tax_accounts {
     push @{ $form->{ACCOUNTS} }, $ref;
   }
 
+  $form->{AR_PAID} = SL::DB::Manager::Chart->get_all(where => [ link => { like => '%AR_paid%' } ], sort_by => 'accno ASC');
+  $form->{AP_PAID} = SL::DB::Manager::Chart->get_all(where => [ link => { like => '%AP_paid%' } ], sort_by => 'accno ASC');
+
+  $form->{skontochart_value_title_sub} = sub {
+    my $item = shift;
+    return [
+      $item->{id},
+      $item->{accno} .' '. $item->{description},
+    ];
+  };
+
   $sth->finish;
 
   $dbh->disconnect;
@@ -1549,7 +1368,9 @@ sub get_tax {
                    chart_id,
                    chart_categories,
                    (id IN (SELECT tax_id
-                           FROM acc_trans)) AS tax_already_used
+                           FROM acc_trans)) AS tax_already_used,
+                   skonto_sales_chart_id,
+                   skonto_purchase_chart_id
                  FROM tax
                  WHERE id = ? |;
 
@@ -1613,15 +1434,17 @@ sub save_tax {
   $chart_categories .= 'E' if $form->{expense};
   $chart_categories .= 'C' if $form->{costs};
 
-  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, conv_i($form->{chart_id}), conv_i($form->{chart_id}), $chart_categories);
+  my @values = ($form->{taxkey}, $form->{taxdescription}, $form->{rate}, conv_i($form->{chart_id}), conv_i($form->{chart_id}), conv_i($form->{skonto_sales_chart_id}), conv_i($form->{skonto_purchase_chart_id}), $chart_categories);
   if ($form->{id} ne "") {
     $query = qq|UPDATE tax SET
-                  taxkey         = ?,
-                  taxdescription = ?,
-                  rate           = ?,
-                  chart_id       = ?,
-                  taxnumber      = (SELECT accno FROM chart WHERE id= ? ),
-                  chart_categories = ?
+                  taxkey                   = ?,
+                  taxdescription           = ?,
+                  rate                     = ?,
+                  chart_id                 = ?,
+                  taxnumber                = (SELECT accno FROM chart WHERE id = ? ),
+                  skonto_sales_chart_id    = ?,
+                  skonto_purchase_chart_id = ?,
+                  chart_categories         = ?
                 WHERE id = ?|;
 
   } else {
@@ -1633,10 +1456,12 @@ sub save_tax {
                   rate,
                   chart_id,
                   taxnumber,
+                  skonto_sales_chart_id,
+                  skonto_purchase_chart_id,
                   chart_categories,
                   id
                 )
-                VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ?, ?)|;
+                VALUES (?, ?, ?, ?, (SELECT accno FROM chart WHERE id = ?), ?, ?,  ?, ?)|;
   }
   push(@values, $form->{id});
   do_query($form, $dbh, $query, @values);