X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FPart.pm;h=f5a0cd2ccce7e1115bfd252799258d71c88f1ba0;hb=3da73190b8f201bfb33e3b6d96bbc6330142e922;hp=ae2612b9d3e4a6feca4b495b177ee2abe00bef0e;hpb=766f5705ecb9cd56adfbffd94c871959bb64c6fd;p=kivitendo-erp.git diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm index ae2612b9d..f5a0cd2cc 100644 --- a/SL/DB/Part.pm +++ b/SL/DB/Part.pm @@ -144,21 +144,19 @@ sub get_taxkey { my $date = $params{date} || DateTime->today_local; my $is_sales = !!$params{is_sales}; my $taxzone = $params{ defined($params{taxzone}) ? 'taxzone' : 'taxzone_id' } * 1; + my $tk_info = $::request->cache('get_taxkey'); - $self->{__partpriv_taxkey_information} ||= { }; - my $tk_info = $self->{__partpriv_taxkey_information}; + $tk_info->{$self->id} //= {}; + $tk_info->{$self->id}->{$taxzone} //= { }; + my $cache = $tk_info->{$self->id}->{$taxzone}->{$is_sales} //= { }; - $tk_info->{$taxzone} ||= { }; - $tk_info->{$taxzone}->{$is_sales} ||= { }; - - if (!exists $tk_info->{$taxzone}->{$is_sales}->{$date}) { - $tk_info->{$taxzone}->{$is_sales}->{$date} = + if (!exists $cache->{$date}) { + $cache->{$date} = $self->get_chart(type => $is_sales ? 'income' : 'expense', taxzone => $taxzone) - ->load ->get_active_taxkey($date); } - return $tk_info->{$taxzone}->{$is_sales}->{$date}; + return $cache->{$date}; } sub get_chart { @@ -167,17 +165,22 @@ sub get_chart { my $type = (any { $_ eq $params{type} } qw(income expense inventory)) ? $params{type} : croak("Invalid 'type' parameter '$params{type}'"); my $taxzone = $params{ defined($params{taxzone}) ? 'taxzone' : 'taxzone_id' } * 1; - $self->{__partpriv_get_chart_id} ||= { }; - my $charts = $self->{__partpriv_get_chart_id}; + my $charts = $::request->cache('get_chart_id/by_part_id_and_taxzone')->{$self->id} //= {}; + my $all_charts = $::request->cache('get_chart_id/by_id'); $charts->{$taxzone} ||= { }; if (!exists $charts->{$taxzone}->{$type}) { - my $bugru = $self->buchungsgruppe; + require SL::DB::Buchungsgruppe; + my $bugru = SL::DB::Buchungsgruppe->load_cached($self->buchungsgruppen_id); my $chart_id = ($type eq 'inventory') ? ($self->inventory_accno_id ? $bugru->inventory_accno_id : undef) : $bugru->call_sub("${type}_accno_id_${taxzone}"); - $charts->{$taxzone}->{$type} = $chart_id ? SL::DB::Chart->new(id => $chart_id)->load : undef; + if ($chart_id) { + my $chart = $all_charts->{$chart_id} // SL::DB::Chart->load_cached($chart_id)->load; + $all_charts->{$chart_id} = $chart; + $charts->{$taxzone}->{$type} = $chart; + } } return $charts->{$taxzone}->{$type};