Die Zahlungskonditionen sortierbar gemacht.

[mfinanz.git] / SL / AM.pm

diff --git a/SL/AM.pm b/SL/AM.pm
index b3874bdf5eb56b73ae60248921af9e6ece1f87ce..77a5955d229adaee0fcbf53ae481c1b8fa7b5586 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1190,22 +1190,24 @@ sub delete_buchungsgruppe {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

-sub swap_buchungsgruppen {
+sub swap_sortkeys {

   $main::lxdebug->enter_sub();
 
   $main::lxdebug->enter_sub();
 

-  my ($self, $myconfig, $form) = @_;
+  my ($self, $myconfig, $form, $table) = @_;

 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   my $query =
     qq|SELECT
 
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   my $query =
     qq|SELECT

-       (SELECT sortkey FROM buchungsgruppen WHERE id = ?) AS sortkey1,
-       (SELECT sortkey FROM buchungsgruppen WHERE id = ?) AS sortkey2|;
+       (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);
   my @values = ($form->{"id1"}, $form->{"id2"});
   my @sortkeys = selectrow_query($form, $dbh, $query, @values);

+  $main::lxdebug->dump(0, "v", \@values);
+  $main::lxdebug->dump(0, "s", \@sortkeys);

 
 

-  $query = qq|UPDATE buchungsgruppen SET sortkey = ? WHERE id = ?|;
+  $query = qq|UPDATE $table SET sortkey = ? WHERE id = ?|;

   my $sth = $dbh->prepare($query);
   $sth->execute($sortkeys[1], $form->{"id1"}) ||
     $form->dberror($query . " ($sortkeys[1], $form->{id1})");
   my $sth = $dbh->prepare($query);
   $sth->execute($sortkeys[1], $form->{"id1"}) ||
     $form->dberror($query . " ($sortkeys[1], $form->{id1})");


@@ -1328,15 +1330,13 @@ sub payment {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  my $query = qq|SELECT *
-                 FROM payment_terms
-                ORDER BY id|;
+  my $query = qq|SELECT * FROM payment_terms ORDER BY sortkey|;

 
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
 
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 

+  $form->{ALL} = [];

   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {

-    $ref->{percent_skonto} = $form->format_amount($myconfig,($ref->{percent_skonto} * 100));

     push @{ $form->{ALL} }, $ref;
   }
 
     push @{ $form->{ALL} }, $ref;
   }
 


@@ -1354,16 +1354,11 @@ sub get_payment {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  my $query =
-    qq|SELECT *
-                 FROM payment_terms
-                WHERE id = $form->{id}|;
+  my $query = qq|SELECT * FROM payment_terms WHERE id = ?|;

   my $sth = $dbh->prepare($query);
   my $sth = $dbh->prepare($query);

-  $sth->execute || $form->dberror($query);
+  $sth->execute($form->{"id"}) || $form->dberror($query . " ($form->{id})");

 
   my $ref = $sth->fetchrow_hashref(NAME_lc);
 
   my $ref = $sth->fetchrow_hashref(NAME_lc);

-  $ref->{percent_skonto} = $form->format_amount($myconfig,($ref->{percent_skonto} * 100));
-

   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;
   map { $form->{$_} = $ref->{$_} } keys %$ref;
 
   $sth->finish;


@@ -1381,32 +1376,31 @@ sub save_payment {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  $form->{description} =~ s/\'/\'\'/g;
-  $form->{description_long} =~ s/\'/\'\'/g;
-  $percentskonto = $form->parse_amount($myconfig, $form->{percent_skonto}) /100;
-  $form->{ranking} *= 1;
-  $form->{terms_netto} *= 1;
-  $form->{terms_skonto} *= 1;
-  $form->{percent_skonto} *= 1;
-
-
+  my @values = ($form->{description}, $form->{description_long},
+                $form->{ranking} * 1,
+                $form->{terms_netto} * 1, $form->{terms_skonto} * 1,
+                $form->{percent_skonto} * 1);

 
 

+  my $query;

   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE payment_terms SET
   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE payment_terms SET

-               description = '$form->{description}',
-                ranking = $form->{ranking},
-               description_long = '$form->{description_long}',
-               terms_netto = $form->{terms_netto},
-                terms_skonto = $form->{terms_skonto},
-                percent_skonto = $percentskonto
-               WHERE id = $form->{id}|;
+                description = ?, description_long = ?,
+                ranking = ?,
+                terms_netto = ?, terms_skonto = ?,
+                percent_skonto = ?
+                WHERE id = ?|;
+    push(@values, $form->{"id"});

   } else {
   } else {

+    $query = qq|SELECT MAX(sortkey) + 1 FROM payment_terms|;
+    my ($sortkey) = selectrow_query($form, $dbh, $query);

     $query = qq|INSERT INTO payment_terms
     $query = qq|INSERT INTO payment_terms

-                (description, ranking, description_long, terms_netto, terms_skonto, percent_skonto)
-                VALUES ('$form->{description}', $form->{ranking}, '$form->{description_long}', $form->{terms_netto}, $form->{terms_skonto}, $percentskonto)|;
+                (description, description_long, ranking,
+                 terms_netto, terms_skonto, percent_skonto, sortkey)
+                VALUES (?, ?, ?, ?, ?, ?, ?)|;
+    push(@values, $sortkey);

   }
   }

-  $dbh->do($query) || $form->dberror($query);
+  do_query($form, $dbh, $query, @values);

 
   $dbh->disconnect;
 
 
   $dbh->disconnect;
 


@@ -1421,9 +1415,8 @@ sub delete_payment {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 

-  $query = qq|DELETE FROM payment_terms
-             WHERE id = $form->{id}|;
-  $dbh->do($query) || $form->dberror($query);
+  my $query = qq|DELETE FROM payment_terms WHERE id = ?|;
+  do_query($form, $dbh, $query, $form->{"id"});

 
   $dbh->disconnect;
 
 
   $dbh->disconnect;