X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=41148c8e8363589f371f4067c3c2d71a0e573fcc;hb=35b8018a80c96a075a1107dbef9eefbb9e0f59b8;hp=f6abae908e936845361605fe12941f3b9b92e1df;hpb=ad5a6910a9b76e1f42b24832f92010ee2c903012;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index f6abae908..41148c8e8 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -908,7 +908,7 @@ sub get_project { $form->{projectnumber_1} = $form->{projectnumber}; delete $form->{sort}; - &check_project; + check_project('generate_projects'); # if there is one only, assign id $form->{project_id} = $form->{project_id_1}; @@ -1280,7 +1280,7 @@ sub generate_trial_balance { my $href = build_std_url('action=generate_trial_balance', grep { $form->{$_} } @hidden_variables); my %column_defs = ( - 'accno' => { 'text' => $locale->text('Account Number'), }, + 'accno' => { 'text' => $locale->text('Account'), }, 'description' => { 'text' => $locale->text('Description'), }, 'last_transaction' => { 'text' => $locale->text('Last Transaction'), }, 'soll_eb' => { 'text' => $locale->text('Debit Starting Balance'), }, @@ -1308,9 +1308,18 @@ sub generate_trial_balance { $form->{template_fromto} = $locale->date(\%myconfig, $form->{fromdate}, 0) . "  -  " . $locale->date(\%myconfig, $form->{todate}, 0); + + $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}); + + $form->{template_to} = $locale->date(\%myconfig, $form->{todate}, 0); $report->set_options('output_format' => 'HTML', + 'top_info_text' => join("\n", @options), 'title' => $form->{title}, 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), 'html_template' => 'rp/html_report_susa', @@ -1336,9 +1345,8 @@ sub generate_trial_balance { $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); + map { $accno->{$_} = $accno->{$_} == 0 ? '' : $form->format_amount(\%myconfig, $accno->{$_}, 2) } + qw(soll_eb haben_eb soll haben soll_kumuliert haben_kumuliert soll_saldo haben_saldo); my $row = { };