Die Buchungsgruppen sortierbar gemacht.

diff --git a/SL/AM.pm b/SL/AM.pm
index 0cac83f02b908f5961ce4ba22a7bb403d0f3586f..b3874bdf5eb56b73ae60248921af9e6ece1f87ce 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1017,7 +1017,7 @@ sub buchungsgruppe {
                  expense_accno_id_3,
                  (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3
                  FROM buchungsgruppen
                  expense_accno_id_3,
                  (SELECT accno FROM chart WHERE id = expense_accno_id_3) AS expense_accno_3
                  FROM buchungsgruppen

-                 ORDER BY id|;
+                 ORDER BY sortkey|;

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


@@ -1141,6 +1141,8 @@ sub save_buchungsgruppe {
                 $form->{income_accno_id_2}, $form->{expense_accno_id_2},
                 $form->{income_accno_id_3}, $form->{expense_accno_id_3});
 
                 $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
   # id is the old record
   if ($form->{id}) {
     $query = qq|UPDATE buchungsgruppen SET


@@ -1152,13 +1154,18 @@ sub save_buchungsgruppe {
                 WHERE id = ?|;
     push(@values, $form->{id});
   } else {
                 WHERE id = ?|;
     push(@values, $form->{id});
   } else {

+    $query = qq|SELECT MAX(sortkey) + 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,
     $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)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+                income_accno_id_3, expense_accno_id_3,
+                sortkey)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;

   }
   do_query($form, $dbh, $query, @values);
 
   }
   do_query($form, $dbh, $query, @values);
 


@@ -1183,6 +1190,35 @@ sub delete_buchungsgruppe {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub swap_buchungsgruppen {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) = @_;
+
+  # 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|;
+  my @values = ($form->{"id1"}, $form->{"id2"});
+  my @sortkeys = selectrow_query($form, $dbh, $query, @values);
+
+  $query = qq|UPDATE buchungsgruppen SET sortkey = ? WHERE id = ?|;
+  my $sth = $dbh->prepare($query);
+  $sth->execute($sortkeys[1], $form->{"id1"}) ||
+    $form->dberror($query . " ($sortkeys[1], $form->{id1})");
+  $sth->execute($sortkeys[0], $form->{"id2"}) ||
+    $form->dberror($query . " ($sortkeys[0], $form->{id2})");
+  $sth->finish();
+
+  $dbh->commit();
+  $dbh->disconnect;
+
+  $main::lxdebug->leave_sub();
+}
+

 sub printer {
   $main::lxdebug->enter_sub();
 
 sub printer {
   $main::lxdebug->enter_sub();
 

diff --git a/SL/IC.pm b/SL/IC.pm
index 3141b805ee622e5aa68d97fdd953faf2566fe5f0..56bc2eeeb82ee13ec9c45845cd444cf18332110f 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -310,7 +310,8 @@ sub retrieve_buchungsgruppen {
 
   # get buchungsgruppen
   $query = qq|SELECT id, description
 
   # get buchungsgruppen
   $query = qq|SELECT id, description

-              FROM buchungsgruppen|;
+              FROM buchungsgruppen
+              ORDER BY sortkey|;

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

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 7084aa388b7c52c0f181b9546efc3ec768f8d0d3..ddfa954b0017d62d9f9bc882b9bdeae8158c3cfa 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -1782,14 +1782,26 @@ sub list_buchungsgruppe {
 
   $form->{title} = $locale->text('Buchungsgruppen');
 
 
   $form->{title} = $locale->text('Buchungsgruppen');
 

-  @column_index = qw(description inventory_accno income_accno_0 expense_accno_0 income_accno_1 expense_accno_1 income_accno_2 expense_accno_2 income_accno_3 expense_accno_3 );
-
+  @column_index = qw(up down description inventory_accno
+                     income_accno_0 expense_accno_0
+                     income_accno_1 expense_accno_1
+                     income_accno_2 expense_accno_2
+                     income_accno_3 expense_accno_3 );
+
+  $column_header{up} =
+      qq|<th class="listheading">|
+    . qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">|
+    . qq|</th>|;
+  $column_header{down} =
+      qq|<th class="listheading">|
+    . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
+    . qq|</th>|;

   $column_header{description} =
   $column_header{description} =

-      qq|<th class=listheading width=60%>|
+      qq|<th class="listheading" width="40%">|

     . $locale->text('Description')
     . qq|</th>|;
   $column_header{inventory_accno} =
     . $locale->text('Description')
     . qq|</th>|;
   $column_header{inventory_accno} =

-      qq|<th class=listheading width=10%>|
+      qq|<th class=listheading>|

     . $locale->text('Bestandskonto')
     . qq|</th>|;
   $column_header{income_accno_0} =
     . $locale->text('Bestandskonto')
     . qq|</th>|;
   $column_header{income_accno_0} =


@@ -1846,6 +1858,11 @@ sub list_buchungsgruppe {
         </tr>
 |;
 
         </tr>
 |;
 

+  my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|;
+  map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" }
+      qw(login password path));
+
+  my $row = 0;

   foreach $ref (@{ $form->{ALL} }) {
 
     $i++;
   foreach $ref (@{ $form->{ALL} }) {
 
     $i++;


@@ -1855,6 +1872,27 @@ sub list_buchungsgruppe {
         <tr valign=top class=listrow$i>
 |;
 
         <tr valign=top class=listrow$i>
 |;
 

+    if ($row) {
+      my $pref = $form->{ALL}->[$row - 1];
+      $column_data{up} =
+        qq|<td align="center" valign="center">| .
+        qq|<a href="${swap_link}id1=$ref->{id}&id2=$pref->{id}">| .
+        qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
+        qq|</a></td>|;
+    } else {
+      $column_data{up} = qq|<td>&nbsp;</td>|;
+    }
+
+    if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
+      $column_data{down} = qq|<td>&nbsp;</td>|;
+    } else {
+      my $nref = $form->{ALL}->[$row + 1];
+      $column_data{down} =
+        qq|<td align="center" valign="center">| .
+        qq|<a href="${swap_link}id1=$ref->{id}&id2=$nref->{id}">| .
+        qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
+        qq|</a></td>|;
+    }

 
     $column_data{description} =
       qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
 
     $column_data{description} =
       qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;


@@ -1877,6 +1915,8 @@ sub list_buchungsgruppe {
     print qq|
        </tr>
 |;
     print qq|
        </tr>
 |;

+
+    $row++;

   }
 
   print qq|
   }
 
   print qq|


@@ -2071,6 +2111,15 @@ sub delete_buchungsgruppe {
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }
 

+sub swap_buchungsgruppen {
+  $lxdebug->enter_sub();
+
+  AM->swap_buchungsgruppen(\%myconfig, $form);
+  list_buchungsgruppe();
+
+  $lxdebug->leave_sub();
+}
+

 
 sub add_printer {
   $lxdebug->enter_sub();
 
 sub add_printer {
   $lxdebug->enter_sub();

diff --git a/image/down.png b/image/down.png
new file mode 100755 (executable)
index 0000000..0ba4c05
Binary files /dev/null and b/image/down.png differ

diff --git a/image/up.png b/image/up.png
new file mode 100755 (executable)
index 0000000..e5586cd
Binary files /dev/null and b/image/up.png differ

diff --git a/locale/de/all b/locale/de/all
index 6e15be25b5f68cbec52bdd972ac8688a979cb617..a368ce8456fd948a9662c4a83ada34b13de20b92 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1158,6 +1158,7 @@ gestartet',
   'dimension units'             => 'Maßeinheiten',
   'does not exist'              => 'existiert nicht',
   'done'                        => 'erledigt',
   'dimension units'             => 'Maßeinheiten',
   'does not exist'              => 'existiert nicht',
   'done'                        => 'erledigt',

+  'down'                        => 'hoch',

   'eMail Send?'                 => 'eMail-Versand?',
   'eMail?'                      => 'eMail?',
   'ea'                          => 'St.',
   'eMail Send?'                 => 'eMail-Versand?',
   'eMail?'                      => 'eMail?',
   'ea'                          => 'St.',


@@ -1187,6 +1188,7 @@ gestartet',
   'successfully created!'       => 'wurde erfolgreich erstellt',
   'successfully deleted!'       => 'wurde erfolgreich gelöscht',
   'to (date)'                   => 'bis',
   'successfully created!'       => 'wurde erfolgreich erstellt',
   'successfully deleted!'       => 'wurde erfolgreich gelöscht',
   'to (date)'                   => 'bis',

+  'up'                          => 'runter',

   'use program settings'        => 'benutze Programmeinstellungen',
   'ustva'                       => 'UStVA',
   'website'                     => 'Webseite',
   'use program settings'        => 'benutze Programmeinstellungen',
   'ustva'                       => 'UStVA',
   'website'                     => 'Webseite',

diff --git a/locale/de/am b/locale/de/am
index ef6bf66a44237e8388160d6acc5affb14567b8f3..051d201bd0d3bca831dc8907b3857fa168124a5d 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -288,10 +288,12 @@ $self->{texts} = {
   'Year End'                    => 'Jahresende',
   'Yes'                         => 'Ja',
   'dimension units'             => 'Maßeinheiten',
   'Year End'                    => 'Jahresende',
   'Yes'                         => 'Ja',
   'dimension units'             => 'Maßeinheiten',

+  'down'                        => 'hoch',

   'equal Outputformat'          => 'wie Ausgabeformat',
   'lead deleted!'               => 'Kundenquelle gelöscht',
   'lead saved!'                 => 'Kundenquelle geichert',
   'service units'               => 'Dienstleistungseinheiten',
   'equal Outputformat'          => 'wie Ausgabeformat',
   'lead deleted!'               => 'Kundenquelle gelöscht',
   'lead saved!'                 => 'Kundenquelle geichert',
   'service units'               => 'Dienstleistungseinheiten',

+  'up'                          => 'runter',

   'use program settings'        => 'benutze Programmeinstellungen',
 };
 
   'use program settings'        => 'benutze Programmeinstellungen',
 };
 


@@ -398,6 +400,7 @@ $self->{subs} = {
   'set_longdescription'         => 'set_longdescription',
   'set_unit_languages'          => 'set_unit_languages',
   'sic_header'                  => 'sic_header',
   'set_longdescription'         => 'set_longdescription',
   'set_unit_languages'          => 'set_unit_languages',
   'sic_header'                  => 'sic_header',

+  'swap_buchungsgruppen'        => 'swap_buchungsgruppen',

   'vendor_selection'            => 'vendor_selection',
   'warehouse_header'            => 'warehouse_header',
   'erfassen'                    => 'add',
   'vendor_selection'            => 'vendor_selection',
   'warehouse_header'            => 'warehouse_header',
   'erfassen'                    => 'add',

diff --git a/sql/Pg-upgrade2/buchungsgruppen_sortkey.sql b/sql/Pg-upgrade2/buchungsgruppen_sortkey.sql
new file mode 100644 (file)
index 0000000..6405591
--- /dev/null
+++ b/sql/Pg-upgrade2/buchungsgruppen_sortkey.sql
@@ -0,0 +1,8 @@
+-- @tag: buchungsgruppen_sortkey
+-- @description: Neue Spalte für Sortierreihenfolge der Buchungsgruppen
+-- @depends: release_2_4_1
+ALTER TABLE buchungsgruppen ADD COLUMN sortkey integer;
+CREATE SEQUENCE tmp_counter;
+UPDATE buchungsgruppen SET sortkey = nextval('tmp_counter');
+DROP SEQUENCE tmp_counter;
+ALTER TABLE buchungsgruppen ALTER COLUMN sortkey SET NOT NULL;