X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=731a060fd0ed837d87dbe80bf66a3c8116a00ce4;hb=eeb07c164e0c3398f14372308b404fb07e2102cf;hp=af3fcf32a5748440a4d7876dc31b51e36db3ea7e;hpb=861b9e383466f8490cb437e6abc1e1d3771e5a1b;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index af3fcf32a..731a060fd 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1194,11 +1194,6 @@ sub generate_balance_sheet {
$auth->assert('report');
- $form->{padding} = " ";
- $form->{bold} = "";
- $form->{endbold} = "";
- $form->{br} = "
";
-
RP->balance_sheet(\%myconfig, \%$form);
$form->{asofdate} = $form->current_date(\%myconfig) unless $form->{asofdate};
@@ -1216,14 +1211,103 @@ sub generate_balance_sheet {
$form->{last_period} =
$locale->date(\%myconfig, $form->{compareasofdate}, 0);
- $form->{IN} = "balance_sheet.html";
+ my $attachment_basename;
- # setup company variables for the form
- map { $form->{$_} = $myconfig{$_}; } (qw(company address businessnumber nativecurr));
+ my $report = SL::ReportGenerator->new(\%myconfig, $form);
- $form->{templates} = $myconfig{templates};
+ 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),
+ );
+ $report->set_options_from_form();
+ # $form->parse_html_template('report_generator/html_report_bilanz', $variables));
+ $form->{report_template} = 'report_generator/html_report_bilanz';
+ # 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();
- $form->parse_template;
$lxdebug->leave_sub();
}
@@ -1676,7 +1760,7 @@ sub create_aging_subtotal_row {
my $row = { map { $_ => { 'data' => '', 'class' => $class, 'align' => 'right' } } @{ $columns } };
foreach (@{ $periods }) {
- $row->{"c$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
+ $row->{"$_"}->{data} = $subtotals->{$_} != 0 ? $form->format_amount(\%myconfig, $subtotals->{$_}, 2) : '';
$subtotals->{$_} = 0;
}
@@ -1692,7 +1776,7 @@ sub aging {
my $report = SL::ReportGenerator->new(\%myconfig, $form);
- my @columns = qw(statement ct invnumber transdate duedate c0 c30 c60 c90);
+ my @columns = qw(statement ct invnumber transdate duedate amount open);
my %column_defs = (
'statement' => { 'text' => '', 'visible' => $form->{ct} eq 'customer' ? 'HTML' : 0, },
@@ -1700,14 +1784,12 @@ sub aging {
'invnumber' => { 'text' => $locale->text('Invoice'), },
'transdate' => { 'text' => $locale->text('Date'), },
'duedate' => { 'text' => $locale->text('Due'), },
- 'c0' => { 'text' => $locale->text('Current'), },
- 'c30' => { 'text' => '30', },
- 'c60' => { 'text' => '60', },
- 'c90' => { 'text' => '90', },
+ 'amount' => { 'text' => $locale->text('Amount'), },
+ 'open' => { 'text' => $locale->text('Open'), },
);
my %column_alignment = ('statement' => 'center',
- map { $_ => 'right' } qw(c0 c30 c60 c90));
+ map { $_ => 'right' } qw(open amount));
$report->set_options('std_column_visibility' => 1);
$report->set_columns(%column_defs);
@@ -1744,7 +1826,7 @@ sub aging {
my $previous_ctid = 0;
my $row_idx = 0;
- my @periods = qw(0 30 60 90);
+ my @periods = qw(open amount);
my %subtotals = map { $_ => 0 } @periods;
my %totals = map { $_ => 0 } @periods;
@@ -1754,9 +1836,9 @@ sub aging {
}
foreach my $key (@periods) {
- $subtotals{$key} += $ref->{"c${key}"};
- $totals{$key} += $ref->{"c${key}"};
- $ref->{"c${key}"} = $ref->{"c${key}"} != 0 ? $form->format_amount(\%myconfig, $ref->{"c${key}"}, 2) : '';
+ $subtotals{$key} += $ref->{"$key"};
+ $totals{$key} += $ref->{"$key"};
+ $ref->{"$key"} = $ref->{"$key"} != 0 ? $form->format_amount(\%myconfig, $ref->{"$key"}, 2) : '';
}
my $row = { };
@@ -1984,19 +2066,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}";
@@ -2075,8 +2144,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);