X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=db75257d3c8c19cfb2ca5007ae0726a7d5e953f0;hb=b36f0864f0304deb66f4215c52b68351f90b2309;hp=e5b7060c945ff0dae15a8e0ee734ccfb925eeac0;hpb=caa69d7ec21a31ad49539d224e2213bd8b871554;p=kivitendo-erp.git diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index e5b7060c9..db75257d3 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -144,6 +144,7 @@ sub report { $::form->{title} = $title{$::form->{report}}; $::request->{layout}->add_javascripts('autocomplete_customer.js'); + $::request->{layout}->add_javascripts('autocomplete_project.js'); $::form->{fromdate} = DateTime->today->truncate(to => 'year')->to_kivitendo; $::form->{todate} = DateTime->today->truncate(to => 'year')->add(years => 1)->add(days => -1)->to_kivitendo; @@ -467,6 +468,18 @@ sub generate_projects { my $project = $form->{project_id} ? SL::DB::Project->new(id => $form->{project_id})->load : undef; $form->{projectnumber} = $project ? $project->projectnumber : ''; + # make sure todate and fromdate always have a value, even if the date fields + # were left empty or the inputs weren't valid dates/couldn't be parsed + + $project = SL::DB::Project->new() unless $project; # dummy object for dbh + unless ($::locale->parse_date_to_object($::form->{fromdate})) { + ($form->{fromdate}) = $project->db->dbh->selectrow_array('select min(transdate) from acc_trans'); + }; + + unless ($::locale->parse_date_to_object($::form->{todate})) { + ($form->{todate}) = $project->db->dbh->selectrow_array('select max(transdate) from acc_trans'); + }; + $form->{nextsub} = "generate_projects"; $form->{title} = $locale->text('Project Transactions'); RP->trial_balance(\%myconfig, \%$form); @@ -915,7 +928,7 @@ sub list_accounts { sub generate_ar_aging { $main::lxdebug->enter_sub(); - $main::auth->assert('general_ledger'); + $main::auth->assert('general_ledger | ar_transactions'); my $form = $main::form; my %myconfig = %main::myconfig; @@ -938,7 +951,7 @@ sub generate_ar_aging { sub generate_ap_aging { $main::lxdebug->enter_sub(); - $main::auth->assert('general_ledger'); + $main::auth->assert('general_ledger | ap_transactions'); my $form = $main::form; my %myconfig = %main::myconfig;