projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:kivitendo/kivitendo-erp
[kivitendo-erp.git]
/
SL
/
DB
/
Part.pm
diff --git
a/SL/DB/Part.pm
b/SL/DB/Part.pm
index
89630ec
..
2a74b74
100644
(file)
--- a/
SL/DB/Part.pm
+++ b/
SL/DB/Part.pm
@@
-4,6
+4,7
@@
use strict;
use Carp;
use List::MoreUtils qw(any);
use Carp;
use List::MoreUtils qw(any);
+use Rose::DB::Object::Helpers qw(as_tree);
use SL::DBUtils;
use SL::DB::MetaSetup::Part;
use SL::DBUtils;
use SL::DB::MetaSetup::Part;
@@
-143,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 $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)
$self->get_chart(type => $is_sales ? 'income' : 'expense', taxzone => $taxzone)
- ->load
->get_active_taxkey($date);
}
->get_active_taxkey($date);
}
- return $
tk_info->{$taxzone}->{$is_sales}
->{$date};
+ return $
cache
->{$date};
}
sub get_chart {
}
sub get_chart {
@@
-166,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;
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}) {
$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)
my $chart_id = ($type eq 'inventory') ? ($self->inventory_accno_id ? $bugru->inventory_accno_id : undef)
- : $bugru->call_sub("${type}_accno_id
_${taxzone}"
);
+ : $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};
}
return $charts->{$taxzone}->{$type};
@@
-201,7
+205,7
@@
sub get_simple_stock {
sub bin { require SL::DB::Bin; SL::DB::Manager::Bin ->find_by_or_create(id => $_[0]->{bin_id}) }
}
sub bin { require SL::DB::Bin; SL::DB::Manager::Bin ->find_by_or_create(id => $_[0]->{bin_id}) }
}
-sub
long_description
{
+sub
displayable_name
{
join ' ', grep $_, map $_[0]->$_, qw(partnumber description);
}
join ' ', grep $_, map $_[0]->$_, qw(partnumber description);
}
@@
-314,7
+318,7
@@
This function looks up the income (for trueish values of
C<$params{is_sales}>) or expense (for falsish values of
C<$params{is_sales}>) account for the current part. It uses the part's
associated buchungsgruppe and uses the fields belonging to the tax
C<$params{is_sales}>) or expense (for falsish values of
C<$params{is_sales}>) account for the current part. It uses the part's
associated buchungsgruppe and uses the fields belonging to the tax
-zone given by C<$params{taxzone}>
(range 0..3)
.
+zone given by C<$params{taxzone}>.
The information retrieved by the function is cached.
The information retrieved by the function is cached.
@@
-326,8
+330,7
@@
C<$params{type}> and tax zone C<$params{taxzone}>
the three key words C<income>, C<expense> and C<inventory>.
This function uses the part's associated buchungsgruppe and uses the
the three key words C<income>, C<expense> and C<inventory>.
This function uses the part's associated buchungsgruppe and uses the
-fields belonging to the tax zone given by C<$params{taxzone}> (range
-0..3).
+fields belonging to the tax zone given by C<$params{taxzone}>.
The information retrieved by the function is cached.
The information retrieved by the function is cached.