Bugfixes zum Rechnungstemplate

[mfinanz.git] / bin / mozilla / ca.pl

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index b0bd5e878867aeadf74caff815528e68dd1701a8..66a6a6a3d241cffcef13a6fa9faf502680491ddb 100644 (file)
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -39,6 +39,8 @@ use SL::ReportGenerator;
 
 require "bin/mozilla/reportgenerator.pl";
 
 
 require "bin/mozilla/reportgenerator.pl";
 

+use strict;
+

 1;
 
 # end of main
 1;
 
 # end of main


@@ -72,12 +74,20 @@ require "bin/mozilla/reportgenerator.pl";
 # $locale->text('Dec')
 
 sub chart_of_accounts {
 # $locale->text('Dec')
 
 sub chart_of_accounts {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;

 
 

-  $auth->assert('report');
+  $main::auth->assert('report');

 
   $form->{title} = $locale->text('Chart of Accounts');
 
 
   $form->{title} = $locale->text('Chart of Accounts');
 

+  if ($main::eur) {
+    $form->{method} = "cash";
+  }
+

   CA->all_accounts(\%myconfig, \%$form);
 
   my @columns     = qw(accno description debit credit);
   CA->all_accounts(\%myconfig, \%$form);
 
   my @columns     = qw(accno description debit credit);


@@ -107,6 +117,7 @@ sub chart_of_accounts {
   my %totals = ('debit' => 0, 'credit' => 0);
 
   foreach my $ca (@{ $form->{CA} }) {
   my %totals = ('debit' => 0, 'credit' => 0);
 
   foreach my $ca (@{ $form->{CA} }) {

+    next unless defined $ca->{amount};

     my $row = { };
 
     foreach (qw(debit credit)) {
     my $row = { };
 
     foreach (qw(debit credit)) {


@@ -132,17 +143,21 @@ sub chart_of_accounts {
 
   $report->generate_with_headers();
 
 
   $report->generate_with_headers();
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub list {
 }
 
 sub list {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;

 
 

-  $auth->assert('report');
+  $main::auth->assert('report');

 
   $form->{title} = $locale->text('List Transactions');
   $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}";
 
   $form->{title} = $locale->text('List Transactions');
   $form->{title} .= " - " . $locale->text('Account') . " $form->{accno}";

-  $year = (localtime)[5] + 1900;
+  my $year = (localtime)[5] + 1900;

 
   # get departments
   $form->all_departments(\%myconfig);
 
   # get departments
   $form->all_departments(\%myconfig);


@@ -155,24 +170,25 @@ sub list {
     } (@{ $form->{all_departments} });
   }
 
     } (@{ $form->{all_departments} });
   }
 

-  $department = qq|
+  my $department = qq|

         <tr>
          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
        </tr>
 | if $form->{selectdepartment};
         <tr>
          <th align=right nowrap>| . $locale->text('Department') . qq|</th>
          <td colspan=3><select name=department>$form->{selectdepartment}</select></td>
        </tr>
 | if $form->{selectdepartment};

-  $accrual = ($eur) ? ""        : "checked";
-  $cash    = ($eur) ? "checked" : "";
- 
-  $name_1    = "fromdate";
-  $id_1      = "fromdate";
-  $value_1   = "$form->{fromdate}";
-  $trigger_1 = "trigger1";
-  $name_2    = "todate";
-  $id_2      = "todate";
-  $value_2   = "";
-  $trigger_2 = "trigger2";
+  my $accrual = ($main::eur) ? ""        : "checked";
+  my $cash    = ($main::eur) ? "checked" : "";

 
 

+  my $name_1    = "fromdate";
+  my $id_1      = "fromdate";
+  my $value_1   = "$form->{fromdate}";
+  my $trigger_1 = "trigger1";
+  my $name_2    = "todate";
+  my $id_2      = "todate";
+  my $value_2   = "";
+  my $trigger_2 = "trigger2";
+
+  my ($button1, $button1_2, $button2, $button2_2, $jsscript);

 
   # with JavaScript Calendar
   if ($form->{jsscript}) {
 
   # with JavaScript Calendar
   if ($form->{jsscript}) {


@@ -220,7 +236,7 @@ sub list {
   }
   $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->header;
   }
   $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->header;

-  $onload = qq|focus()|;
+  my $onload = qq|focus()|;

   $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
   $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
 
   $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
   $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
 


@@ -237,7 +253,7 @@ sub list {
 <input type=hidden name=accno value=$form->{accno}>
 <input type=hidden name=description value="$form->{description}">
 <input type=hidden name=sort value=transdate>
 <input type=hidden name=accno value=$form->{accno}>
 <input type=hidden name=description value="$form->{description}">
 <input type=hidden name=sort value=transdate>

-<input type=hidden name=eur value=$eur>
+<input type=hidden name=eur value=$main::eur>

 <input type=hidden name=accounttype value=$form->{accounttype}>
 
 <table border=0 width=100%>
 <input type=hidden name=accounttype value=$form->{accounttype}>
 
 <table border=0 width=100%>


@@ -258,6 +274,7 @@ sub list {
        </tr>
 |;
 
        </tr>
 |;
 

+    our $checked;

     print qq|
        <tr>
                <td align=right>
     print qq|
        <tr>
                <td align=right>


@@ -352,7 +369,7 @@ $checked></td>
          <tr>
             <td><input name="subtotal" class=checkbox type=checkbox value=1> | . $locale->text('Subtotal') . qq|</td>
          </tr>
          <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>
 $jsscript
   <tr><td colspan=5 ><hr size=3 noshade></td></tr>
 </table>


@@ -365,27 +382,35 @@ $jsscript
 </html>
 |;
 
 </html>
 |;
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub format_debit_credit {
 }
 
 sub format_debit_credit {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();

 
   my $dc = shift;
 
 
   my $dc = shift;
 

+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+

   my $formatted_dc  = $form->format_amount(\%myconfig, abs($dc), 2) . ' ';
   $formatted_dc    .= ($dc > 0) ? $locale->text('Credit (one letter abbreviation)') : $locale->text('Debit (one letter abbreviation)');
 
   my $formatted_dc  = $form->format_amount(\%myconfig, abs($dc), 2) . ' ';
   $formatted_dc    .= ($dc > 0) ? $locale->text('Credit (one letter abbreviation)') : $locale->text('Debit (one letter abbreviation)');
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 
   return $formatted_dc;
 }
 
 
 sub list_transactions {
 
   return $formatted_dc;
 }
 
 
 sub list_transactions {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;

 
 

-  $auth->assert('report');
+  $main::auth->assert('report');

 
   $form->{title} = $locale->text('Account') . " $form->{accno} - $form->{description}";
 
 
   $form->{title} = $locale->text('Account') . " $form->{accno} - $form->{description}";
 


@@ -433,7 +458,7 @@ sub list_transactions {
         $form->{fromdate} = "1.2.$form->{year}";
 
         #this works from 1901 to 2099, 1900 and 2100 fail.
         $form->{fromdate} = "1.2.$form->{year}";
 
         #this works from 1901 to 2099, 1900 and 2100 fail.

-        $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+        my $leap = ($form->{year} % 4 == 0) ? "29" : "28";

         $form->{todate} = "$leap.2.$form->{year}";
         last SWITCH;
       };
         $form->{todate} = "$leap.2.$form->{year}";
         last SWITCH;
       };


@@ -492,7 +517,8 @@ sub list_transactions {
 
   CA->all_transactions(\%myconfig, \%$form);
 
 
   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};
   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 +551,12 @@ sub list_transactions {
 
   push @options, $period;
 
 
   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'), },
   my @columns     = qw(transdate reference description gegenkonto debit credit ustkonto ustrate balance);
   my %column_defs = (
     'transdate'   => { 'text' => $locale->text('Date'), },


@@ -546,7 +578,7 @@ sub list_transactions {
 
   my %column_alignment = map { $_ => 'right' } qw(debit credit);
 
 
   my %column_alignment = map { $_ => 'right' } qw(debit credit);
 

-  @custom_headers = ();
+  my @custom_headers = ();

  # Zeile 1:
  push @custom_headers, [
    { 'text' => 'Letzte Buchung', },
  # Zeile 1:
  push @custom_headers, [
    { 'text' => 'Letzte Buchung', },


@@ -598,7 +630,7 @@ sub list_transactions {
 
   $report->set_sort_indicator($form->{sort}, 1);
 
 
   $report->set_sort_indicator($form->{sort}, 1);
 

-  $column_defs->{balance}->{visible} = 1;
+  $column_defs{balance}->{visible} = 1;

 
   my $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1;
 
 
   my $ml = ($form->{category} =~ /(A|E)/) ? -1 : 1;
 


@@ -637,7 +669,7 @@ sub list_transactions {
       $ca->{description} .= " \n " . $ca->{memo};
     }
 
       $ca->{description} .= " \n " . $ca->{memo};
     }
 

-    
+

 
     foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) {
       if ($ca->{gegenkonto} eq "") {
 
     foreach my $gegenkonto (@{ $ca->{GEGENKONTO} }) {
       if ($ca->{gegenkonto} eq "") {


@@ -654,18 +686,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);
 
     if ($ca->{index} ne $previous_index) {
 #       $report->add_data($row_set) if ($row_set);


@@ -698,24 +719,14 @@ sub list_transactions {
 
   my $row = create_subtotal_row(\%totals, \@columns, \%column_alignment, 'listtotal');
 
 
   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);
 
 
   $report->add_separator();
 
   $report->add_data($row);
 
 
   $report->add_separator();

-  my $row = {
+  $row = {

      'transdate' => {
        'data'    => "",
        'class' => 'listtotal',
      'transdate' => {
        'data'    => "",
        'class' => 'listtotal',


@@ -745,7 +756,7 @@ sub list_transactions {
 
   $report->add_data($row);
   my $saldo_new = format_debit_credit($form->{saldo_new});
 
   $report->add_data($row);
   my $saldo_new = format_debit_credit($form->{saldo_new});

-  my $row = {
+  $row = {

      'transdate' => {
        'data'    => "",
        'class' => 'listtotal',
      'transdate' => {
        'data'    => "",
        'class' => 'listtotal',


@@ -778,11 +789,14 @@ sub list_transactions {
 
   $report->generate_with_headers();
 
 
   $report->generate_with_headers();
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub create_subtotal_row {
 }
 
 sub create_subtotal_row {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;

 
   my ($totals, $columns, $column_alignment, $class) = @_;
 
 
   my ($totals, $columns, $column_alignment, $class) = @_;
 


@@ -792,7 +806,7 @@ sub create_subtotal_row {
 
   map { $totals->{$_} = 0 } qw(debit credit);
 
 
   map { $totals->{$_} = 0 } qw(debit credit);
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 
   return $row;
 }
 
   return $row;
 }