From c6bdd35aede8fce70487fc024191295ef4edd3da Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 14 Jun 2007 11:25:55 +0000 Subject: [PATCH] =?utf8?q?Reportgenerator:=20Die=20Funktionen=20in=20repor?= =?utf8?q?t=5Fgenerator.pl=20umbenannt=20und=20den=20Mechanismus=20ge?= =?utf8?q?=C3=A4ndert,=20wie=20sie=20aus=20den=20von=20ReportGenerator=20e?= =?utf8?q?rzeugten=20HTML-Seiten=20heraus=20aufgerufen=20werden=20k=C3=B6n?= =?utf8?q?nen.=20Zus=C3=A4tzlich=20einen=20'Zur=C3=BCck'-Button=20auf=20je?= =?utf8?q?der=20der=20beiden=20Exportoptionenwebseiten=20eingebaut,=20mit?= =?utf8?q?=20denen=20man=20zur=20HTML-Liste=20zur=C3=BCckgelangt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bin/mozilla/report_generator.pl | 27 +++++++++++++++++-- locale/de/all | 1 + locale/de/ap | 9 ++++--- locale/de/ar | 9 ++++--- locale/de/dn | 9 ++++--- locale/de/oe | 9 ++++--- .../csv_export_options_de.html | 19 +++++++++++-- .../csv_export_options_master.html | 19 +++++++++++-- .../report_generator/html_report_de.html | 18 ++++++++++--- .../report_generator/html_report_master.html | 18 ++++++++++--- .../pdf_export_options_de.html | 19 +++++++++++-- .../pdf_export_options_master.html | 19 +++++++++++-- 12 files changed, 144 insertions(+), 32 deletions(-) diff --git a/bin/mozilla/report_generator.pl b/bin/mozilla/report_generator.pl index 6c766789b..db65eb0db 100644 --- a/bin/mozilla/report_generator.pl +++ b/bin/mozilla/report_generator.pl @@ -14,7 +14,7 @@ use SL::Common; use SL::MoreCommon; use SL::ReportGenerator; -sub export_as_pdf { +sub report_generator_export_as_pdf { $lxdebug->enter_sub(); if ($form->{report_generator_pdf_options_set}) { @@ -35,7 +35,7 @@ sub export_as_pdf { $lxdebug->leave_sub(); } -sub export_as_csv { +sub report_generator_export_as_csv { $lxdebug->enter_sub(); if ($form->{report_generator_csv_options_set}) { @@ -54,6 +54,14 @@ sub export_as_csv { $lxdebug->leave_sub(); } +sub report_generator_back { + $lxdebug->enter_sub(); + + report_generator_do('HTML'); + + $lxdebug->leave_sub(); +} + sub report_generator_do { $lxdebug->enter_sub(); @@ -77,4 +85,19 @@ sub report_generator_do { $lxdebug->leave_sub(); } +sub report_generator_dispatcher { + $lxdebug->enter_sub(); + + my $nextsub = $form->{report_generator_dispatch_to}; + if (!$nextsub) { + $form->error($locale->text('report_generator_dispatch_to is not defined.')); + } + + delete $form->{report_generator_dispatch_to}; + + call_sub($nextsub); + + $lxdebug->leave_sub(); +} + 1; diff --git a/locale/de/all b/locale/de/all index a3d249feb..6a9ac26eb 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1318,6 +1318,7 @@ aktualisieren wollen?', 'purchase_order_list' => 'lieferantenauftragsliste', 'quarter' => 'Vierteljährliche (quartalsweise) Abgabe', 'quotation_list' => 'angebotsliste', + 'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.', 'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.', 'request_quotation' => 'Angebotsanforderung', 'reset' => 'zurücksetzen', diff --git a/locale/de/ap b/locale/de/ap index dbefb9989..671d9c5e9 100644 --- a/locale/de/ap +++ b/locale/de/ap @@ -190,6 +190,7 @@ $self->{texts} = { 'pick_list' => 'Entnahmeliste', 'proforma' => 'Proforma', 'purchase_order' => 'Auftrag', + 'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.', 'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.', 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', @@ -224,8 +225,6 @@ $self->{subs} = { 'draft_action_dispatcher' => 'draft_action_dispatcher', 'edit' => 'edit', 'employee_selection_internal' => 'employee_selection_internal', - 'export_as_csv' => 'export_as_csv', - 'export_as_pdf' => 'export_as_pdf', 'form_footer' => 'form_footer', 'form_header' => 'form_header', 'format_dates' => 'format_dates', @@ -243,7 +242,11 @@ $self->{subs} = { 'project_selection_internal' => 'project_selection_internal', 'reformat_numbers' => 'reformat_numbers', 'remove_draft' => 'remove_draft', + 'report_generator_back' => 'report_generator_back', + 'report_generator_dispatcher' => 'report_generator_dispatcher', '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', 'sales_invoice' => 'sales_invoice', 'save_draft' => 'save_draft', 'search' => 'search', @@ -268,8 +271,6 @@ $self->{subs} = { 'löschen' => 'delete', 'entwürfe_löschen' => 'delete_drafts', 'kreditorenbuchung_bearbeiten' => 'edit_accounts_payables_transaction', - 'als_csv_exportieren' => 'export_as_csv', - 'als_pdf_exportieren' => 'export_as_pdf', 'buchen' => 'post', 'zahlung_buchen' => 'post_payment', 'entwurf_speichern' => 'save_draft', diff --git a/locale/de/ar b/locale/de/ar index 14dbe4574..6d0d1fd62 100644 --- a/locale/de/ar +++ b/locale/de/ar @@ -195,6 +195,7 @@ $self->{texts} = { 'pick_list' => 'Entnahmeliste', 'proforma' => 'Proforma', 'purchase_order' => 'Auftrag', + 'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.', 'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.', 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', @@ -232,8 +233,6 @@ $self->{subs} = { 'draft_action_dispatcher' => 'draft_action_dispatcher', 'edit' => 'edit', 'employee_selection_internal' => 'employee_selection_internal', - 'export_as_csv' => 'export_as_csv', - 'export_as_pdf' => 'export_as_pdf', 'form_footer' => 'form_footer', 'form_header' => 'form_header', 'format_dates' => 'format_dates', @@ -251,7 +250,11 @@ $self->{subs} = { 'project_selection_internal' => 'project_selection_internal', 'reformat_numbers' => 'reformat_numbers', 'remove_draft' => 'remove_draft', + 'report_generator_back' => 'report_generator_back', + 'report_generator_dispatcher' => 'report_generator_dispatcher', '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', 'sales_invoice' => 'sales_invoice', 'save_draft' => 'save_draft', 'search' => 'search', @@ -275,8 +278,6 @@ $self->{subs} = { 'weiter' => 'continue', 'löschen' => 'delete', 'entwürfe_löschen' => 'delete_drafts', - 'als_csv_exportieren' => 'export_as_csv', - 'als_pdf_exportieren' => 'export_as_pdf', 'buchen' => 'post', 'zahlung_buchen' => 'post_payment', 'rechnung' => 'sales_invoice', diff --git a/locale/de/dn b/locale/de/dn index d324f3f65..bc988cafe 100644 --- a/locale/de/dn +++ b/locale/de/dn @@ -206,6 +206,7 @@ $self->{texts} = { 'pick_list' => 'Entnahmeliste', 'proforma' => 'Proforma', 'purchase_order' => 'Auftrag', + 'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.', 'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.', 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', @@ -239,8 +240,6 @@ $self->{subs} = { 'edit_config' => 'edit_config', 'edit_e_mail' => 'edit_e_mail', 'employee_selection_internal' => 'employee_selection_internal', - 'export_as_csv' => 'export_as_csv', - 'export_as_pdf' => 'export_as_pdf', 'format_dates' => 'format_dates', 'gl_transaction' => 'gl_transaction', 'invoicetotal' => 'invoicetotal', @@ -262,7 +261,11 @@ $self->{subs} = { 'quotation' => 'quotation', 'reformat_numbers' => 'reformat_numbers', 'relink_accounts' => 'relink_accounts', + 'report_generator_back' => 'report_generator_back', + 'report_generator_dispatcher' => 'report_generator_dispatcher', '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', 'request_for_quotation' => 'request_for_quotation', 'sales_invoice' => 'sales_invoice', 'save' => 'save', @@ -290,8 +293,6 @@ $self->{subs} = { 'vendor_invoice' => 'vendor_invoice', 'vendor_selection' => 'vendor_selection', 'weiter' => 'continue', - 'als_csv_exportieren' => 'export_as_csv', - 'als_pdf_exportieren' => 'export_as_pdf', 'drucken' => 'print', 'speichern' => 'save', }; diff --git a/locale/de/oe b/locale/de/oe index 349dee837..26fbe4839 100644 --- a/locale/de/oe +++ b/locale/de/oe @@ -271,6 +271,7 @@ $self->{texts} = { 'purchase_order' => 'Auftrag', 'purchase_order_list' => 'lieferantenauftragsliste', 'quotation_list' => 'angebotsliste', + 'report_generator_dispatch_to is not defined.' => 'report_generator_dispatch_to ist nicht definiert.', 'report_generator_nextsub is not defined.' => 'report_generator_nextsub ist nicht definiert.', 'request_quotation' => 'Angebotsanforderung', 'rfq_list' => 'anfragenliste', @@ -317,8 +318,6 @@ $self->{subs} = { 'edit' => 'edit', 'edit_e_mail' => 'edit_e_mail', 'employee_selection_internal' => 'employee_selection_internal', - 'export_as_csv' => 'export_as_csv', - 'export_as_pdf' => 'export_as_pdf', 'form_footer' => 'form_footer', 'form_header' => 'form_header', 'format_dates' => 'format_dates', @@ -347,7 +346,11 @@ $self->{subs} = { 'quotation' => 'quotation', 'reformat_numbers' => 'reformat_numbers', 'relink_accounts' => 'relink_accounts', + 'report_generator_back' => 'report_generator_back', + 'report_generator_dispatcher' => 'report_generator_dispatcher', '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', 'request_for_quotation' => 'request_for_quotation', 'sales_invoice' => 'sales_invoice', 'sales_order' => 'sales_order', @@ -380,8 +383,6 @@ $self->{subs} = { 'weiter' => 'continue', 'löschen' => 'delete', 'email' => 'e_mail', - 'als_csv_exportieren' => 'export_as_csv', - 'als_pdf_exportieren' => 'export_as_pdf', 'rechnung' => 'invoice', 'nein' => 'no', 'auftrag' => 'order', diff --git a/templates/webpages/report_generator/csv_export_options_de.html b/templates/webpages/report_generator/csv_export_options_de.html index d76bb032c..24ff285ab 100644 --- a/templates/webpages/report_generator/csv_export_options_de.html +++ b/templates/webpages/report_generator/csv_export_options_de.html @@ -1,13 +1,25 @@ + +
-
+ + + @@ -63,7 +75,10 @@
-

+

+ + +

diff --git a/templates/webpages/report_generator/csv_export_options_master.html b/templates/webpages/report_generator/csv_export_options_master.html index 927ef6f3b..2db96d489 100644 --- a/templates/webpages/report_generator/csv_export_options_master.html +++ b/templates/webpages/report_generator/csv_export_options_master.html @@ -1,13 +1,25 @@ + +
-
+ + + @@ -63,7 +75,10 @@
-

+

+ + +

diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html index 99eae373a..302acedd4 100644 --- a/templates/webpages/report_generator/html_report_de.html +++ b/templates/webpages/report_generator/html_report_de.html @@ -1,5 +1,15 @@ + +
@@ -46,7 +56,7 @@ -
+ @@ -55,11 +65,13 @@ + +

Listenexport
- - + +

diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html index 8be73afa2..57876d2d8 100644 --- a/templates/webpages/report_generator/html_report_master.html +++ b/templates/webpages/report_generator/html_report_master.html @@ -1,5 +1,15 @@ + +
@@ -46,7 +56,7 @@ -
+ @@ -55,11 +65,13 @@ + +

List export
- - + +

diff --git a/templates/webpages/report_generator/pdf_export_options_de.html b/templates/webpages/report_generator/pdf_export_options_de.html index de8e33fda..6c30322a8 100644 --- a/templates/webpages/report_generator/pdf_export_options_de.html +++ b/templates/webpages/report_generator/pdf_export_options_de.html @@ -1,13 +1,25 @@ + +
-
+ + + @@ -66,7 +78,10 @@
-

+

+ + +

diff --git a/templates/webpages/report_generator/pdf_export_options_master.html b/templates/webpages/report_generator/pdf_export_options_master.html index 75bfc5671..066e4d76a 100644 --- a/templates/webpages/report_generator/pdf_export_options_master.html +++ b/templates/webpages/report_generator/pdf_export_options_master.html @@ -1,13 +1,25 @@ + +
-
+ + + @@ -66,7 +78,10 @@
-

+

+ + +

-- 2.20.1