X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=0558ae6ba5e4249bcd0aed57f62f6b5430fb1a9e;hb=17409513173051b5401dccf5a7ef56678ea8a041;hp=c6070fbd1d8a5a45de22e845d662ab5d7cce203d;hpb=4654d9931a51aaa867c425c1fc63618337df67e9;p=kivitendo-erp.git

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index c6070fbd1..0558ae6ba 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -78,6 +78,10 @@ sub chart_of_accounts {
 
   $form->{title} = $locale->text('Chart of Accounts');
 
+  if ($eur) {
+    $form->{method} = "cash";
+  }
+
   CA->all_accounts(\%myconfig, \%$form);
 
   my @columns     = qw(accno description debit credit);
@@ -107,6 +111,7 @@ sub chart_of_accounts {
   my %totals = ('debit' => 0, 'credit' => 0);
 
   foreach my $ca (@{ $form->{CA} }) {
+    next unless defined $ca->{amount};
     my $row = { };
 
     foreach (qw(debit credit)) {
@@ -163,7 +168,7 @@ sub list {
 | if $form->{selectdepartment};
   $accrual = ($eur) ? ""        : "checked";
   $cash    = ($eur) ? "checked" : "";
- 
+
   $name_1    = "fromdate";
   $id_1      = "fromdate";
   $value_1   = "$form->{fromdate}";
@@ -352,7 +357,7 @@ $checked></td>
          <tr>
             <td><input name="subtotal" class=checkbox type=checkbox value=1> | . $locale->text('Subtotal') . qq|</td>
          </tr>
-                                    
+
 $jsscript
   <tr><td colspan=5 ><hr size=3 noshade></td></tr>
 </table>
@@ -526,6 +531,12 @@ sub list_transactions {
 
   push @options, $period;
 
+  $form->{print_date} = $locale->text('Create Date') . " " . $locale->date(\%myconfig, $form->current_date(\%myconfig), 0);
+  push (@options, $form->{print_date});
+
+  $form->{company} = $locale->text('Company') . " " . $myconfig{company};
+  push (@options, $form->{company});
+
   my @columns     = qw(transdate reference description gegenkonto debit credit ustkonto ustrate balance);
   my %column_defs = (
     'transdate'   => { 'text' => $locale->text('Date'), },
@@ -638,7 +649,7 @@ sub list_transactions {
       $ca->{description} .= " \n " . $ca->{memo};
     }
 
-    
+
 
     foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) {
       if ($ca->{gegenkonto} eq "") {