X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fca.pl;h=b45c36d6401834e45f214e600fa55c988214b76e;hb=81d7a3d732eac0e68a4edc8306e48532e9deb637;hp=b0bd5e878867aeadf74caff815528e68dd1701a8;hpb=09f6472492fd33fbca181838c48b4c83136172b1;p=kivitendo-erp.git

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index b0bd5e878..b45c36d64 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -107,6 +107,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 +164,7 @@ sub list {
 | if $form->{selectdepartment};
   $accrual = ($eur) ? ""        : "checked";
   $cash    = ($eur) ? "checked" : "";
- 
+
   $name_1    = "fromdate";
   $id_1      = "fromdate";
   $value_1   = "$form->{fromdate}";
@@ -352,7 +353,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>
@@ -492,7 +493,8 @@ sub list_transactions {
 
   CA->all_transactions(\%myconfig, \%$form);
 
-
+  $form->{saldo_old} += $form->{beginning_balance};
+  $form->{saldo_new} += $form->{beginning_balance};
   my $saldo_old = format_debit_credit($form->{saldo_old});
   my $eb_string = format_debit_credit($form->{beginning_balance});
   $form->{balance} = $form->{saldo_old};
@@ -525,6 +527,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'), },
@@ -637,7 +645,7 @@ sub list_transactions {
       $ca->{description} .= " \n " . $ca->{memo};
     }
 
-    
+
 
     foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) {
       if ($ca->{gegenkonto} eq "") {
@@ -654,18 +662,7 @@ sub list_transactions {
       };
     }
 
-    my $sh = "";
-    if ($form->{balance} < 0) {
-      $sh = " S";
-      $ml = -1;
-    } elsif ($form->{balance} > 0) {
-      $sh = " H";
-      $ml = 1;
-    }
-    my $data = $form->format_amount(\%myconfig, ($form->{balance} * $ml), 2);
-    $data .= $sh;
-
-    $row->{balance}->{data}        = $data;
+    $row->{balance}->{data}        = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR');
 
     if ($ca->{index} ne $previous_index) {
 #       $report->add_data($row_set) if ($row_set);
@@ -698,18 +695,8 @@ sub list_transactions {
 
   my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, 'listtotal');
 
-  my $sh = "";
-  if ($form->{balance} < 0) {
-    $sh = " S";
-    $ml = -1;
-  } elsif ($form->{balance} > 0) {
-    $sh = " H";
-    $ml = 1;
-  }
-  my $data = $form->format_amount(\%myconfig, ($form->{balance} * $ml), 2);
-  $data .= $sh;
 
-  $row->{balance}->{data}        = $data;
+  $row->{balance}->{data}        = $form->format_amount(\%myconfig, $form->{balance}, 2, 'DRCR');
 
   $report->add_data($row);