Auslagerung gemeinsamen Codes.

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index c3c4b07e40ae743ff491bb21e11476d0597b58c8..b4ccfe3c49748a033ab0aba5ee6003f614d1277e 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -409,9 +409,7 @@ sub orders {
 
   ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
 
-  $form->{sort}    ||= 'transdate';
-  $form->{sortdir}   = 1 unless (defined $form->{sortdir});
-  $form->{sortdir}   = $form->{sortdir} ? 1 : 0;
+  report_generator_set_default_sort('transdate', 1);
 
   DO->transactions();
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 5c1a9c2462e22c2b5077e4c8fff2a3accea25b9a..322706ac15a058258838fc9ec28d3c286b5f4838 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -888,9 +888,7 @@ sub orders {
 
   ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
 
-  $form->{sort}    ||= 'transdate';
-  $form->{sortdir}   = 1 unless (defined $form->{sortdir});
-  $form->{sortdir}   = $form->{sortdir} ? 1 : 0;
+  report_generator_set_default_sort('transdate', 1);
 
   OE->transactions(\%myconfig, \%$form);
 

diff --git a/bin/mozilla/reportgenerator.pl b/bin/mozilla/reportgenerator.pl
index 50f6eccad0d873c5e259a9d3346e21d1945451f6..5f5d4079bd27feb58b2e6e60797c34b1426162af 100644 (file)
--- a/bin/mozilla/reportgenerator.pl
+++ b/bin/mozilla/reportgenerator.pl
@@ -16,6 +16,20 @@ use SL::Common;
 use SL::MoreCommon;
 use SL::ReportGenerator;
 
+sub report_generator_set_default_sort {
+  $lxdebug->enter_sub();
+
+  my $default_sortorder   = shift;
+  my $default_sortdir     = shift;
+
+  $form->{sort}         ||= $default_sortorder;
+  $form->{sortdir}        = $default_sortdir unless (defined $form->{sortdir});
+  $form->{sortdir}        = $form->{sortdir} ? 1 : 0;
+
+  $lxdebug->leave_sub();
+}
+
+
 sub report_generator_export_as_pdf {
   $lxdebug->enter_sub();
 

diff --git a/locale/de/ap b/locale/de/ap
index b3268c3e8666763ba5aa491d82268d13ff59ee9a..575e48259a93bb4c21d6f2662061158d317aaefb 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -311,6 +311,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'retrieve_partunits'          => 'retrieve_partunits',
   'save_draft'                  => 'save_draft',
   'search'                      => 'search',

diff --git a/locale/de/ar b/locale/de/ar
index 9259d315c89e063d503a00d7c1bdda09d3e64886..6f48917212617729737a6a523364e98ca7271944 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -322,6 +322,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'retrieve_partunits'          => 'retrieve_partunits',
   'save_draft'                  => 'save_draft',
   'search'                      => 'search',

diff --git a/locale/de/ca b/locale/de/ca
index 462950484ab289c7873ebf17d18e3e826f1021b9..959acfea38f6308a0ad95d932fc469fcfeef4935 100644 (file)
--- a/locale/de/ca
+++ b/locale/de/ca
@@ -175,6 +175,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'weiter'                      => 'continue',
   'buchungsliste'               => 'list_transactions',
 };

diff --git a/locale/de/ct b/locale/de/ct
index cdd9e0377343a866132398fb3dc1442af1c85104..19126f0f1ded9b35d4dcbbcea3b151c808e4cf05 100644 (file)
--- a/locale/de/ct
+++ b/locale/de/ct
@@ -215,6 +215,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'retrieve_partunits'          => 'retrieve_partunits',
   'save'                        => 'save',
   'save_and_ap_transaction'     => 'save_and_ap_transaction',

diff --git a/locale/de/dn b/locale/de/dn
index fb35eac9d4c00d5a0cd1a2b15d9197b99680575d..98089a18e63f07b9414b00747ac19192f8d423ed 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -318,6 +318,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'save'                        => 'save',

diff --git a/locale/de/do b/locale/de/do
index 3e05f0add631fdc289e3707fa39f9ed33dc4d446..137c9ac3faacaae8c64817d8ff9eaa29b5ea1303 100644 (file)
--- a/locale/de/do
+++ b/locale/de/do
@@ -361,6 +361,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'save'                        => 'save',

diff --git a/locale/de/fu b/locale/de/fu
index c91b0bfbe2cbe4ca73fc9b1433a9fe8945555873..0c08e93407c5a00825b9eb7005b7c96790bd66b2 100644 (file)
--- a/locale/de/fu
+++ b/locale/de/fu
@@ -161,6 +161,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'save'                        => 'save',
   'save_access_rights'          => 'save_access_rights',
   'save_follow_up'              => 'save_follow_up',

diff --git a/locale/de/gl b/locale/de/gl
index ce11afc8f48969bf5e1042d9c3f3bf4d54e6a3df..f1e768732fb7699cf93891b303bf486f8e40e96b 100644 (file)
--- a/locale/de/gl
+++ b/locale/de/gl
@@ -284,6 +284,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'retrieve_partunits'          => 'retrieve_partunits',
   'search'                      => 'search',
   'select_part'                 => 'select_part',

diff --git a/locale/de/ic b/locale/de/ic
index bd2bd7c1db053fb8935b27d044de6747773cd4d3..30845d6e58615ed877756d04a05a17bb96bda116 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -386,6 +386,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'save'                        => 'save',

diff --git a/locale/de/login b/locale/de/login
index 4b4fcd2c8cee42e57b9a2f5c5109504824993546..380f8351cec7cd0acd21b7fae73f6b1b2d878a23 100644 (file)
--- a/locale/de/login
+++ b/locale/de/login
@@ -469,6 +469,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'sales_order'                 => 'sales_order',

diff --git a/locale/de/oe b/locale/de/oe
index da8a2988a113e3712f9d1c73901b8314a8876ad6..23553b914361ad47aedfc47630680fe40c1dbd60 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -426,6 +426,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'sales_order'                 => 'sales_order',

diff --git a/locale/de/projects b/locale/de/projects
index 3f1ede5c0f36a3eebc50d6bfba6046a26c946f84..82ab89db6f03634f56d748dfda769e1e7f0c734b 100644 (file)
--- a/locale/de/projects
+++ b/locale/de/projects
@@ -181,6 +181,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'retrieve_partunits'          => 'retrieve_partunits',
   'save'                        => 'save',
   'save_as_new'                 => 'save_as_new',

diff --git a/locale/de/reportgenerator b/locale/de/reportgenerator
index a4e7c3cebace7c8d90fae0441c2a554bffe09a74..18eac6645a883e3958853479c41b1b55b06ceb91 100644 (file)
--- a/locale/de/reportgenerator
+++ b/locale/de/reportgenerator
@@ -112,6 +112,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'weiter'                      => 'continue',
 };
 

diff --git a/locale/de/rp b/locale/de/rp
index 098f74924852f580992e701895c7aebb91d5338b..0338f2111028930200841d6e778865fe6d4700fc 100644 (file)
--- a/locale/de/rp
+++ b/locale/de/rp
@@ -307,6 +307,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'retrieve_partunits'          => 'retrieve_partunits',
   'select_all'                  => 'select_all',
   'select_name'                 => 'select_name',

diff --git a/locale/de/todo b/locale/de/todo
index 04e38cef357bbc98c410af7f6ac166306cc7cbe3..2b8ca2e25436f85a2154c8d654df36b064ea31cf 100644 (file)
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -458,6 +458,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'request_for_quotation'       => 'request_for_quotation',
   'retrieve_partunits'          => 'retrieve_partunits',
   'sales_order'                 => 'sales_order',

diff --git a/locale/de/wh b/locale/de/wh
index a305ae5daf15be70e2bb47b373373703c9c5cff1..5adb82f4d3b2e74f249405b5df770fcf9fe2eb09 100644 (file)
--- a/locale/de/wh
+++ b/locale/de/wh
@@ -228,6 +228,7 @@ $self->{subs} = {
   'report_generator_do'         => 'report_generator_do',
   'report_generator_export_as_csv' => 'report_generator_export_as_csv',
   'report_generator_export_as_pdf' => 'report_generator_export_as_pdf',
+  'report_generator_set_default_sort' => 'report_generator_set_default_sort',
   'retrieve_partunits'          => 'retrieve_partunits',
   'select_part'                 => 'select_part',
   'select_part_internal'        => 'select_part_internal',