X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/8c7e44938a661e035f62840e1e177353240ace5d..03ea97647e3fbdea4323f4f2136bdfa87cb15c1b:/bin/mozilla/rp.pl
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 88283d0d0..8004e920a 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -91,6 +91,8 @@ require "bin/mozilla/reportgenerator.pl";
# $locale->text('Non-taxable Sales')
# $locale->text('Non-taxable Purchases')
+# $form->parse_html_template('rp/html_report_susa')
+
my $rp_access_map = {
'projects' => 'report',
'ar_aging' => 'general_ledger',
@@ -586,36 +588,122 @@ $jsscript
if ($form->{report} eq "trial_balance") {
print qq|
+
-
-
- | | . $locale->text('Include in Report') . qq| |
- |
- . $locale->text('Heading') . qq|
- |
- . $locale->text('Subtotal') . qq|
- |
- . $locale->text('All Accounts') . qq| |
+ | . $locale->text('Year') . qq| |
+ |
+
+|;
+
+ print qq|
+
+ |
+ | . $locale->text('Yearly') . qq| |
+ | . $locale->text('Quarterly') . qq| |
+ | . $locale->text('Monthly') . qq| |
+
+ | |
+ 1. |
+ . $locale->text('Quarter') . qq| |
+|;
+ $checked = "checked";
+ print qq|
+ |
+ . $locale->text('January') . qq| |
+|;
+ $checked = "";
+ print qq|
+ |
+ . $locale->text('May') . qq| |
+ |
+ . $locale->text('September') . qq| |
+
+
+ | |
+ 2. |
+ . $locale->text('Quarter') . qq| |
+ |
+ . $locale->text('February') . qq| |
+ |
+ . $locale->text('June') . qq| |
+ |
+ . $locale->text('October') . qq| |
+
+
+ | |
+ 3. |
+ . $locale->text('Quarter') . qq| |
+ |
+ . $locale->text('March') . qq| |
+ |
+ . $locale->text('July') . qq| |
+ |
+ . $locale->text('November') . qq| |
+
+
+
+ | |
+ 4. |
+ . $locale->text('Quarter') . qq| |
+ |
+ . $locale->text('April') . qq| |
+ |
+ . $locale->text('August') . qq| |
+ |
+ . $locale->text('December') . qq| |
+
+
+
+
|
+
+
+ | |
+ . $locale->text('Free report period') . qq| |
+ | . $locale->text('From') . qq|
+ $button1
+ $button1_2
+ | . $locale->text('Bis') . qq|
+ $button2
+ $button2_2
+ |
+
+
+
|
+
+
+ | | . $locale->text('Method') . qq| |
+ |
+ . $locale->text('Accrual') . qq|
+ |
+ . $locale->text('EUR') . qq| |
+
+
+ | |
+ . $locale->text('All Accounts')
+ . qq| |
+ |
+
+
+ | |
+ . $locale->text('Decimalplaces')
+ . qq| |
+ |
+
+
$jsscript
|;
}
@@ -1168,14 +1256,242 @@ sub generate_trial_balance {
$auth->assert('report');
+ if ($form->{reporttype} eq "custom") {
+
+ #forgotten the year --> thisyear
+ if ($form->{year} !~ m/^\d\d\d\d$/) {
+ $locale->date(\%myconfig, $form->current_date(\%myconfig), 0) =~
+ /(\d\d\d\d)/;
+ $form->{year} = $1;
+ }
+
+ #yearly report
+ if ($form->{duetyp} eq "13") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ }
+
+ #Quater reports
+ if ($form->{duetyp} eq "A") {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.3.$form->{year}";
+ }
+ if ($form->{duetyp} eq "B") {
+ $form->{fromdate} = "1.4.$form->{year}";
+ $form->{todate} = "30.6.$form->{year}";
+ }
+ if ($form->{duetyp} eq "C") {
+ $form->{fromdate} = "1.7.$form->{year}";
+ $form->{todate} = "30.9.$form->{year}";
+ }
+ if ($form->{duetyp} eq "D") {
+ $form->{fromdate} = "1.10.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ }
+
+ #Monthly reports
+ SWITCH: {
+ $form->{duetyp} eq "1" && do {
+ $form->{fromdate} = "1.1.$form->{year}";
+ $form->{todate} = "31.1.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "2" && do {
+ $form->{fromdate} = "1.2.$form->{year}";
+
+ #this works from 1901 to 2099, 1900 and 2100 fail.
+ $leap = ($form->{year} % 4 == 0) ? "29" : "28";
+ $form->{todate} = "$leap.2.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "3" && do {
+ $form->{fromdate} = "1.3.$form->{year}";
+ $form->{todate} = "31.3.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "4" && do {
+ $form->{fromdate} = "1.4.$form->{year}";
+ $form->{todate} = "30.4.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "5" && do {
+ $form->{fromdate} = "1.5.$form->{year}";
+ $form->{todate} = "31.5.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "6" && do {
+ $form->{fromdate} = "1.6.$form->{year}";
+ $form->{todate} = "30.6.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "7" && do {
+ $form->{fromdate} = "1.7.$form->{year}";
+ $form->{todate} = "31.7.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "8" && do {
+ $form->{fromdate} = "1.8.$form->{year}";
+ $form->{todate} = "31.8.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "9" && do {
+ $form->{fromdate} = "1.9.$form->{year}";
+ $form->{todate} = "30.9.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "10" && do {
+ $form->{fromdate} = "1.10.$form->{year}";
+ $form->{todate} = "31.10.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "11" && do {
+ $form->{fromdate} = "1.11.$form->{year}";
+ $form->{todate} = "30.11.$form->{year}";
+ last SWITCH;
+ };
+ $form->{duetyp} eq "12" && do {
+ $form->{fromdate} = "1.12.$form->{year}";
+ $form->{todate} = "31.12.$form->{year}";
+ last SWITCH;
+ };
+ }
+ }
+
+
# get for each account initial balance, debits and credits
RP->trial_balance(\%myconfig, \%$form);
- $form->{nextsub} = "generate_trial_balance";
- $form->{title} = $locale->text('Trial Balance');
- list_accounts('generate_trial_balance');
+
+ $form->{rowcount} = scalar @{ $form->{TB} };
+
+ my @columns = (
+ "accno", "description",
+ "last_transaction", "soll_eb",
+ "haben_eb",
+ "soll", "haben",
+ "soll_kumuliert", "haben_kumuliert",
+ "soll_saldo", "haben_saldo"
+ );
+
+
+ my $attachment_basename;
+
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
+
+ my @hidden_variables = ();
+ push @hidden_variables, qw(fromdate todate year cash );
+
+ my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
+
+ my %column_defs = (
+ 'accno' => { 'text' => $locale->text('Account Number'), },
+ 'description' => { 'text' => $locale->text('Description'), },
+ 'last_transaction' => { 'text' => $locale->text('Last Transaction'), },
+ 'soll_eb' => { 'text' => $locale->text('Debit Starting Balance'), },
+ 'haben_eb' => { 'text' => $locale->text('Credit Starting Balance'), },
+ 'soll' => { 'text' => $locale->text('Debit'), },
+ 'haben' => { 'text' => $locale->text('Credit'), },
+ 'soll_kumuliert' => { 'text' => $locale->text('Sum Debit'), },
+ 'haben_kumuliert' => { 'text' => $locale->text('Sum Credit'), },
+ 'soll_saldo' => { 'text' => $locale->text('Saldo Debit'), },
+ 'haben_saldo' => { 'text' => $locale->text('Saldo Credit'), }
+ );
+
+
+
+ my %column_alignment = map { $_ => 'right' } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ map { $column_defs{$_}->{visible} = 1 } @columns;
+
+ $report->set_columns(%column_defs);
+ $report->set_column_order(@columns);
+
+ $report->set_export_options('trial_balance', @hidden_variables);
+
+ $report->set_sort_indicator($form->{sort}, 1);
+
+ my @options;
+
+
+ $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . " - " . $locale->date(\%myconfig, $form->{todate}, 0);
+ $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0);
+
+ $report->set_options('output_format' => 'HTML',
+ 'title' => $form->{title},
+ 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
+ 'html_template' => 'rp/html_report_susa',
+ 'pdf_template' => 'rp/html_report_susa',
+ );
+ $report->set_options_from_form();
+
+ # add sort and escape callback, this one we use for the add sub
+ $form->{callback} = $href .= "&sort=$form->{sort}";
+
+ # escape callback for href
+ $callback = $form->escape($href);
+
+ my @subtotal_columns = qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ my %totals = map { $_ => 0 } @subtotal_columns;
+
+ my $edit_url = build_std_url('action=edit', 'type', 'vc');
+
+ foreach $accno (@{ $form->{TB} }) {
+
+ $accno->{soll} = $accno->{debit};
+ $accno->{haben} = $accno->{credit};
+ map { $totals{$_} += $accno->{$_} } @subtotal_columns;
+
+ map { $accno->{$_} = $form->format_amount(\%myconfig, $accno->{$_}, 2) } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ map { $accno->{$_} = ($accno->{$_} == 0) ? '' : $accno->{$_} } qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo);
+
+ my $row = { };
+
+ foreach my $column (@columns) {
+ $row->{$column} = {
+ 'data' => $accno->{$column},
+ 'align' => $column_alignment{$column},
+ };
+ }
+
+
+ $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}";
+
+ my $row_set = [ $row ];
+
+
+ $report->add_data($row_set);
+
+ $idx++;
+ }
+
+ $report->add_separator();
+
+ $report->add_data(create_subtotal_row(\%totals, \@columns, \%column_alignment, \@subtotal_columns, 'listtotal'));
+
+ $report->generate_with_headers();
$lxdebug->leave_sub();
+
+}
+
+sub create_subtotal_row {
+ $lxdebug->enter_sub();
+
+ my ($totals, $columns, $column_alignment, $subtotal_columns, $class) = @_;
+
+ my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => $column_alignment->{$_}, } } @{ $columns } };
+
+ map { $row->{$_}->{data} = $form->format_amount(\%myconfig, $totals->{$_}, 2) } @{ $subtotal_columns };
+
+ $row->{tax}->{data} = $form->format_amount(\%myconfig, $totals->{amount} - $totals->{netamount}, 2);
+
+ map { $totals->{$_} = 0 } @{ $subtotal_columns };
+
+ $lxdebug->leave_sub();
+
+ return $row;
}
sub create_list_accounts_subtotal_row {
@@ -1668,19 +1984,6 @@ sub print_form {
$auth->assert('general_ledger');
- my %replacements =
- (
- "ä" => "ae", "ö" => "oe", "ü" => "ue",
- "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
- "ß" => "ss",
- " " => "_"
- );
-
- foreach my $key (keys %replacements) {
- my $new_key = SL::Iconv::convert("ISO-8859-15", $dbcharset, $key);
- $replacements{$new_key} = $replacements{$key} if $new_key ne $key;
- }
-
$form->{statementdate} = $locale->date(\%myconfig, $form->{todate}, 1);
$form->{templates} = "$myconfig{templates}";
@@ -1759,8 +2062,8 @@ sub print_form {
$form->format_amount(\%myconfig, $form->{"${_}total"}, 2)
} (c0, c30, c60, c90, "");
- $form->{attachment_filename} = $locale->text("Statement") . "_$form->{todate}.$attachment_suffix";
- map({ $form->{attachment_filename} =~ s/$_/$replacements{$_}/g; } keys(%replacements));
+ $form->{attachment_filename} = $locale->quote_special_chars('filenames', $locale->text("Statement") . "_$form->{todate}.$attachment_suffix");
+ $form->{attachment_filename} =~ s/\s+/_/g;
$form->parse_template(\%myconfig, $userspath);
|