From 529e6feb7d1ceb388822957e9efd1b919edd5e97 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 19 Jun 2014 16:53:12 +0200 Subject: [PATCH] SL::DB::Part,Helper::PriceTaxCalculator: agressiveres Caching MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Damit wird für ziemlich jeden Objekttyp nur noch ein einziges Query abgesetzt. --- SL/DB/Helper/PriceTaxCalculator.pm | 33 ++++++++++++++++++------------ SL/DB/Part.pm | 6 +++--- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm index 673bb248a..026322d2c 100644 --- a/SL/DB/Helper/PriceTaxCalculator.pm +++ b/SL/DB/Helper/PriceTaxCalculator.pm @@ -11,9 +11,16 @@ use List::Util qw(sum min); sub calculate_prices_and_taxes { my ($self, %params) = @_; + require SL::DB::Chart; + require SL::DB::Currency; + require SL::DB::Default; + require SL::DB::InvoiceItem; + require SL::DB::Part; require SL::DB::PriceFactor; require SL::DB::Unit; + SL::DB::Part->load_cached(map { $_->parts_id } @{ $self->items }); + my %units_by_name = map { ( $_->name => $_ ) } @{ SL::DB::Manager::Unit->get_all }; my %price_factors_by_id = map { ( $_->id => $_ ) } @{ SL::DB::Manager::PriceFactor->get_all }; @@ -54,9 +61,8 @@ sub calculate_prices_and_taxes { sub _get_exchangerate { my ($self, $data, %params) = @_; - require SL::DB::Default; - my $currency = $self->currency_id ? $self->currency->name || '' : ''; + my $currency = $self->currency_id ? SL::DB::Currency->load_cached($self->currency_id)->name || '' : ''; if ($currency ne SL::DB::Default->get_default_currency) { $data->{exchangerate} = $::form->check_exchangerate(\%::myconfig, $currency, $self->transdate, $data->{is_sales} ? 'buy' : 'sell'); $data->{exchangerate} ||= $params{exchangerate}; @@ -67,10 +73,11 @@ sub _get_exchangerate { sub _calculate_item { my ($self, $item, $idx, $data, %params) = @_; - my $part_unit = $data->{units_by_name}->{ $item->part->unit }; - my $item_unit = $data->{units_by_name}->{ $item->unit }; + my $part = SL::DB::Part->load_cached($item->parts_id); + my $part_unit = $data->{units_by_name}->{ $part->unit }; + my $item_unit = $data->{units_by_name}->{ $item->unit }; - croak("Undefined unit " . $item->part->unit) if !$part_unit; + croak("Undefined unit " . $part->unit) if !$part_unit; croak("Undefined unit " . $item->unit) if !$item_unit; $item->base_qty($item_unit->convert_to($item->qty, $part_unit)); @@ -88,7 +95,7 @@ sub _calculate_item { my $sellprice = _round($item->sellprice - $discount, $num_dec); $item->price_factor( ! $item->price_factor_obj ? 1 : ($item->price_factor_obj->factor || 1)); - $item->marge_price_factor(! $item->part->price_factor ? 1 : ($item->part->price_factor->factor || 1)); + $item->marge_price_factor(! $part->price_factor ? 1 : ($part->price_factor->factor || 1)); my $linetotal = _round($sellprice * $item->qty / $item->price_factor, 2) * $data->{exchangerate}; $linetotal = _round($linetotal, 2); @@ -99,7 +106,7 @@ sub _calculate_item { $item->marge_percent(0); } else { - my $lastcost = ! ($item->lastcost * 1) ? ($item->part->lastcost || 0) : $item->lastcost; + my $lastcost = ! ($item->lastcost * 1) ? ($part->lastcost || 0) : $item->lastcost; my $linetotal_cost = _round($lastcost * $item->qty / $item->marge_price_factor, 2); $item->marge_total( $linetotal - $linetotal_cost); @@ -109,7 +116,7 @@ sub _calculate_item { $data->{lastcost_total} += $linetotal_cost; } - my $taxkey = $item->part->get_taxkey(date => $self->transdate, is_sales => $data->{is_sales}, taxzone => $self->taxzone_id); + my $taxkey = $part->get_taxkey(date => $self->transdate, is_sales => $data->{is_sales}, taxzone => $self->taxzone_id); my $tax_rate = $taxkey->tax->rate; my $tax_amount = undef; @@ -130,17 +137,17 @@ sub _calculate_item { $self->netamount($self->netamount + $sellprice * $item->qty / $item->price_factor); - my $chart = $item->part->get_chart(type => $data->{is_sales} ? 'income' : 'expense', taxzone => $self->taxzone_id); + my $chart = $part->get_chart(type => $data->{is_sales} ? 'income' : 'expense', taxzone => $self->taxzone_id); $data->{amounts}->{ $chart->id } ||= { taxkey => $taxkey->taxkey_id, tax_id => $taxkey->tax_id, amount => 0 }; $data->{amounts}->{ $chart->id }->{amount} += $linetotal; $data->{amounts}->{ $chart->id }->{amount} -= $tax_amount if $self->taxincluded; push @{ $data->{assembly_items} }, []; - if ($item->part->is_assembly) { - _calculate_assembly_item($self, $data, $item->part, $item->base_qty, $item->unit_obj->convert_to(1, $item->part->unit_obj)); - } elsif ($item->part->is_part) { + if ($part->is_assembly) { + _calculate_assembly_item($self, $data, $part, $item->base_qty, $item_unit->convert_to(1, $part_unit)); + } elsif ($part->is_part) { if ($data->{is_invoice}) { - $item->allocated(_calculate_part_item($self, $data, $item->part, $item->base_qty, $item->unit_obj->convert_to(1, $item->part->unit_obj))); + $item->allocated(_calculate_part_item($self, $data, $part, $item->base_qty, $item_unit->convert_to(1, $part_unit))); } } diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm index 1380c4d2b..f5a0cd2cc 100644 --- a/SL/DB/Part.pm +++ b/SL/DB/Part.pm @@ -153,7 +153,6 @@ sub get_taxkey { if (!exists $cache->{$date}) { $cache->{$date} = $self->get_chart(type => $is_sales ? 'income' : 'expense', taxzone => $taxzone) - ->load ->get_active_taxkey($date); } @@ -172,12 +171,13 @@ sub get_chart { $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}"); if ($chart_id) { - my $chart = $all_charts->{$chart_id} // SL::DB::Chart->new(id => $chart_id)->load; + my $chart = $all_charts->{$chart_id} // SL::DB::Chart->load_cached($chart_id)->load; $all_charts->{$chart_id} = $chart; $charts->{$taxzone}->{$type} = $chart; } -- 2.20.1