X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=bf1270ece208814a21cfb725197fdf166841e424;hb=81d7a3d732eac0e68a4edc8306e48532e9deb637;hp=94410658633faa041218f5c00f87c424b3a44a6b;hpb=ff6680968acf5d7219b8f4b9bde85ad38ad17665;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 944106586..bf1270ece 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}; @@ -1256,7 +1256,7 @@ sub generate_trial_balance { # get for each account initial balance, debits and credits - RP->trial_balance(\%myconfig, \%$form); + RP->trial_balance(\%myconfig, \%$form, 'beginning_balances' => 1); $form->{rowcount} = scalar @{ $form->{TB} }; @@ -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', @@ -1351,6 +1360,7 @@ sub generate_trial_balance { $row->{$ordnumber}->{link} = $edit_url . "&id=" . E($oe->{id}) . "&callback=${callback}"; + $row->{accno}->{link} = build_std_url('script=ca.pl', 'action=list_transactions', 'accno=' . E($accno->{accno}), 'description=' . E($accno->{description}), 'fromdate=' . E($form->{fromdate}), 'todate=' . E($form->{todate}), 'method=' . E($form->{method})); my $row_set = [ $row ]; @@ -2308,7 +2318,7 @@ sub list_payments { $report->set_columns(%column_defs); $report->set_column_order(@columns); - $report->set_export_options('list_payments', @hidden_variables); + $report->set_export_options('list_payments', @hidden_variables, qw(sort sortdir)); $report->set_sort_indicator($form->{sort}, $form->{sortdir});