Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / bin / mozilla / gl.pl
diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl

index a4f2d1d..a46cad0 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -217,16 +217,11 @@ sub search {
    $::form->all_departments(\%::myconfig);
    $::form->get_lists(
      projects  => { key => "ALL_PROJECTS", all => 1 },
-    employees => "ALL_EMPLOYEES",
    );
-
-  my $onload = "focus()"
-             . qq|;setupDateFormat('|. $::myconfig{dateformat} . qq|', '| . $::locale->text("Falsches Datumsformat!") . qq|')|
-             . qq|;setupPoints('|. $::myconfig{numberformat} .   qq|', '| . $::locale->text("wrongformat") . qq|')|;
+  $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
  
    $::form->header;
    print $::form->parse_html_template('gl/search', {
-    onload => $onload,
      department_label => sub { ("$_[0]{description}--$_[0]{id}")x2 },
      employee_label => sub { "$_[0]{id}--$_[0]{name}" },
    });
@@ -466,7 +461,7 @@ sub generate_report {
  
      my $row_set = [ $row ];
  
-    if (($form->{l_subtotal} eq 'Y')
+    if ( ($form->{l_subtotal} eq 'Y' && !$form->{report_generator_csv_options_for_import} )
          && (($idx == (scalar @{ $form->{GL} } - 1))
              || ($ref->{ $form->{sort} } ne $form->{GL}->[$idx + 1]->{ $form->{sort} }))) {
        push @{ $row_set }, create_subtotal_row(\%subtotals, \@columns, \%column_alignment, [ qw(debit credit) ], 'listsubtotal');
@@ -477,8 +472,6 @@ sub generate_report {
      $idx++;
    }
  
-  $report->add_separator();
-
    # = 0 for balanced ledger
    my $balanced_ledger = $totals{debit} + $totals{debit_tax} - $totals{credit} - $totals{credit_tax};
  
@@ -497,7 +490,10 @@ sub generate_report {
  
    $row->{balance}->{data}        = $data;
  
-  $report->add_data($row);
+  if ( !$form->{report_generator_csv_options_for_import} ) {
+    $report->add_separator();
+    $report->add_data($row);
+  }
  
    my $raw_bottom_info_text;
  
@@ -878,10 +874,10 @@ sub form_header {
      s/option>\Q$::form->{department}\E/option selected>$::form->{department}/;
  
    if ($init) {
-    $::form->{fokus} = "gl.reference";
+    $::request->{layout}->focus("#reference");
      $::form->{taxincluded} = "1";
    } else {
-    $::form->{fokus} = qq|gl.accno_$::form->{rowcount}|;
+    $::request->{layout}->focus("#accno_$::form->{rowcount}");
    }
  
    $::form->{previous_id}     ||= "--";
@@ -927,8 +923,6 @@ sub delete {
    $form->header;
  
    print qq|
-<body>
-
  <form method=post action=gl.pl>
  |;