ActionBar: Verwendung bei UStVA

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 50108bd..94ea3d8 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -44,6 +44,7 @@ use SL::DB::Default;
 use SL::RP;
 use SL::USTVA;
 use SL::User;
+use SL::Locale::String qw(t8);
 1;
 
 # this is for our long dates
@@ -94,6 +95,8 @@ sub report {
 
   my $department = '';
   my $hide = '';
+
+  setup_ustva_report_action_bar();
   $form->header;
 
   # Einlesen der Finanzamtdaten
@@ -101,12 +104,6 @@ sub report {
   $ustva->get_config();
   $ustva->get_finanzamt();
 
-  my $geierlein_enabled = 0;
-  my $geierlein_path = $::lx_office_conf{paths}{geierlein_path};
-
-  if ( $geierlein_path && length($geierlein_path) > 0 ) {$geierlein_enabled=1;}
-
-#  $::lxdebug->message(LXDebug->DEBUG2,"geierlein_enabled=".$geierlein_enabled." path=".$geierlein_path);
   # Hier Einlesen der user-config
   # steuernummer entfernt für prerelease
   my @a = qw(
@@ -238,16 +235,12 @@ sub report {
     checkbox_kz_29   => $checkbox_kz_29,
     checkbox_kz_26   => $checkbox_kz_26,
     tax_office_banks => \@tax_office_banks_ref,
-    geierlein_enabled => $geierlein_enabled,
-    geierlein_path   => $geierlein_path,
     select_options   => &show_options,
 
   };
 
   print($form->parse_html_template('ustva/report', $template_ref));
 
-
-
   $::lxdebug->leave_sub();
 }
 
@@ -1054,3 +1047,21 @@ sub back {
   call_sub($::form->{"lastsub"});
   $::lxdebug->leave_sub();
 }
+
+sub setup_ustva_report_action_bar {
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      action => [
+        t8('Show'),
+        submit    => [ '#form_do', { action => 'generate_ustva' } ],
+        accesskey => 'enter',
+      ],
+      action => [
+        t8('Geierlein'),
+        call     => [ 'sendGeierlein' ],
+        disabled => !length($::lx_office_conf{paths}{geierlein_path} // '') ? t8('The Geierlein path has not been set in the configuration.') : undef,
+        tooltip  => t8('Transfer data to Geierlein ELSTER application'),
+      ],
+    );
+  }
+}

diff --git a/locale/de/all b/locale/de/all
index fe65edf..9144288 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1395,6 +1395,7 @@ $self->{texts} = {
   'GL transactions changeable'  => 'Änderbarkeit von Dialogbuchungen',
   'GLN'                         => 'GLN',
   'Gegenkonto'                  => 'Gegenkonto',
+  'Geierlein'                   => 'Geierlein',
   'Gender'                      => 'Geschlecht',
   'General Ledger'              => 'Finanzbuchhaltung',
   'General Ledger Corrections'  => 'Korrekturen im Hauptbuch',
@@ -2864,6 +2865,7 @@ $self->{texts} = {
   'The Bins in Inventory were only a information text field.' => 'Die Lagerplätze unter Stammdaten/Waren sind nur ein informatives Textfeld.',
   'The Bins in master data were only a information text field.' => 'Die Lagerplätze unter Stammdaten/Waren sind nur ein informatives Textfeld.',
   'The GL transaction #1 has been deleted.' => 'Die Dialogbuchung #1 wurde gelöscht.',
+  'The Geierlein path has not been set in the configuration.' => 'Der Geierlein-Pfad wurde in der Konfigurationsdatei nicht gesetzt.',
   'The IBAN \'#1\' is not valid as IBANs in #2 must be exactly #3 characters long.' => 'Die IBAN \'#1\' ist ungültig, da IBANs in #2 genau #3 Zeichen lang sein müssen.',
   'The IBAN is missing.'        => 'Die IBAN fehlt.',
   'The ID #1 is not a valid database ID.' => 'Die ID #1 ist keine gültige Datenbank-ID.',
@@ -3270,7 +3272,6 @@ $self->{texts} = {
   'To (email)'                  => 'An',
   'To (time)'                   => 'Bis',
   'To Date'                     => 'Bis',
-  'To Geierlein'                => 'In Geierlein ELSTER Anwendung übernehmen',
   'To continue please change the taxkey 0 to another value.' => 'Um fortzufahren, ändern Sie bitte den Steuerschlüssel 0 auf einen anderen Wert.',
   'To user login'               => 'Zum Benutzerlogin',
   'Toggle marker'               => 'Markierung umschalten',
@@ -3311,6 +3312,7 @@ $self->{texts} = {
   'Transfer'                    => 'Umlagern',
   'Transfer Quantity'           => 'Umlagermenge',
   'Transfer To Stock'           => 'Lagereingang',
+  'Transfer data to Geierlein ELSTER application' => 'Daten in Geierlein ELSTER-Anwendung übernehmen',
   'Transfer from warehouse'     => 'Quelllager',
   'Transfer in'                 => 'Einlagern',
   'Transfer in via default'     => 'Einlagern über Standard-Lagerplatz',

diff --git a/templates/webpages/ustva/report.html b/templates/webpages/ustva/report.html
index dacbebc..f4fa965 100644 (file)
--- a/templates/webpages/ustva/report.html
+++ b/templates/webpages/ustva/report.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
-[% USE HTML %]
+[% USE HTML %][%- USE L -%]
 <h1>[% HTML.escape(title) %]</h1>
 
  <form method="post" id="form_do" action="[% HTML.escape(script) %]">
@@ -170,24 +170,9 @@
   <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
   <input type="hidden" name="account_method" value="[% HTML.escape(account_method) %]">
   <input type="hidden" name="fa_bufa_nr" value="[% HTML.escape(fa_bufa_nr) %]">
-  <table width="100%">
-  <tr>
-   <td align="left">
-     <input type=hidden name=nextsub value=generate_ustva>
-     <input type=hidden name=format  value=html>
-     <input type=submit class=submit name=action value="[% 'Show' | $T8 %]">
-   </td>
-[%- IF geierlein_enabled %]
-   <td align="left">
-     <input type=button class=submit onclick="return sendGeierlein();" value="[% 'To Geierlein' | $T8 %]">
-   </td>
-[%- END %]
-   <td align="right">
-   </td>
-  </tr>
-  </table>
+  [% L.hidden_tag("format", "html") %]
 </form>
-[%- IF geierlein_enabled && geierlein_path %]
+[%- IF LXCONFIG.paths.geierlein_path %]
 <script type='text/javascript'>
 function sendGeierlein () {
  kivi.submit_ajax_form('controller.pl?action=ODGeierlein/send', $('#form_do'));