code verbesserungen für balance_sheet, form->current_date kommt nun ohne myconfig...

diff --git a/SL/Form.pm b/SL/Form.pm
index 71538515474d9b80f7cd6fa9e55b6463d6bd9c27..f32802ca0dee059702f3551af22e9cbb1c4f9997 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2966,7 +2966,9 @@ sub lastname_used {
 sub current_date {
   $main::lxdebug->enter_sub();
 
 sub current_date {
   $main::lxdebug->enter_sub();
 

-  my ($self, $myconfig, $thisdate, $days) = @_;
+  my $self              = shift;
+  my $myconfig          = shift  || \%::myconfig;
+  my ($thisdate, $days) = @_;

 
   my $dbh = $self->get_standard_dbh($myconfig);
   my $query;
 
   my $dbh = $self->get_standard_dbh($myconfig);
   my $query;

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 45bbb4d0b070924a4429d86a4ea2d2a98031e564..f618c5b69226570dab2c760f5fdc6bcc74271205 100644 (file)
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1112,46 +1112,40 @@ sub generate_income_statement {
 }
 
 sub generate_balance_sheet {
 }
 
 sub generate_balance_sheet {

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

 
 

-  $form->{decimalplaces} = $form->{decimalplaces} * 1 || 2;
-  $form->{padding} = "  ";
-  $form->{bold}    = "<b>";
-  $form->{endbold} = "</b>";
-  $form->{br}      = "<br>";
+  $::form->{decimalplaces} = $::form->{decimalplaces} * 1 || 2;
+  $::form->{padding}       = "&nbsp;&nbsp;";
+  $::form->{bold}          = "<b>";
+  $::form->{endbold}       = "</b>";
+  $::form->{br}            = "<br>";

 
 

-  my $data = RP->balance_sheet(\%myconfig, \%$form);
+  my $data = RP->balance_sheet(\%::myconfig, $::form);

 
 

-  $form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate};
-  $form->{period} = $locale->date(\%myconfig, $form->current_date(\%myconfig), 1);
+  $::form->{asofdate} ||= $::form->current_date;
+  $::form->{period}     = $::locale->date(\%::myconfig, $::form->current_date, 1);

 
 

-  ($form->{department}) = split /--/, $form->{department};
+  ($::form->{department}) = split /--/, $::form->{department};

 
   # define Current Earnings account
 
   # define Current Earnings account

-  my $padding = ($form->{l_heading}) ? $form->{padding} : "";
-  push(@{ $form->{equity_account} }, $padding . $locale->text('Current Earnings'));
+  my $padding = $::form->{l_heading} ? $::form->{padding} : "";
+  push @{ $::form->{equity_account} }, $padding . $::locale->text('Current Earnings');

 
 

-  $form->{this_period} = $locale->date(\%myconfig, $form->{asofdate}, 0);
-  $form->{last_period} = $locale->date(\%myconfig, $form->{compareasofdate}, 0);
+  $::form->{this_period} = $::locale->date(\%::myconfig, $::form->{asofdate}, 0);
+  $::form->{last_period} = $::locale->date(\%::myconfig, $::form->{compareasofdate}, 0);

 
 

-  $form->{IN} = "balance_sheet.html";
+#  $::form->{IN} = "balance_sheet.html";

 
   # setup company variables for the form
 
   # setup company variables for the form

-  map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr));
+  map { $::form->{$_} = $::myconfig{$_} } qw(company address businessnumber nativecurr);

 
 

-  $form->{templates} = $myconfig{templates};
+  $::form->{templates} = $::myconfig{templates};

 
 

-  $form->header();
-  print $form->parse_html_template('rp/balance_sheet', $data);
-#  $form->parse_template();
+  $::form->header;
+  print $::form->parse_html_template('rp/balance_sheet', $data);

 
 

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

 }
 
 sub generate_projects {
 }
 
 sub generate_projects {


@@ -2715,7 +2709,7 @@ sub generate_bwa {
     }
   } else {
     # die konvertierungen nur dann durchführen, wenn auch daten gesetzt sind.
     }
   } else {
     # die konvertierungen nur dann durchführen, wenn auch daten gesetzt sind.

-    # ansonsten ist die prüfung in RP.pm 
+    # ansonsten ist die prüfung in RP.pm

     # if (defined ($form->{fromdate|todate}=='..'))
     # immer wahr
     if ($form->{fromdate}){
     # if (defined ($form->{fromdate|todate}=='..'))
     # immer wahr
     if ($form->{fromdate}){