projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CVars: Kein Manager-Arg "config.module" verwenden
[kivitendo-erp.git]
/
SL
/
DB
/
Helper
/
PriceTaxCalculator.pm
diff --git
a/SL/DB/Helper/PriceTaxCalculator.pm
b/SL/DB/Helper/PriceTaxCalculator.pm
index
d84d0fe
..
a8e1548
100644
(file)
--- a/
SL/DB/Helper/PriceTaxCalculator.pm
+++ b/
SL/DB/Helper/PriceTaxCalculator.pm
@@
-167,7
+167,7
@@
sub _calculate_amounts {
sub _calculate_assembly_item {
my ($self, $data, $part, $total_qty, $base_factor) = @_;
sub _calculate_assembly_item {
my ($self, $data, $part, $total_qty, $base_factor) = @_;
- return 0 if $::
lx_office_conf{system}->{eur}
|| !$data->{is_invoice};
+ return 0 if $::
instance_conf->get_inventory_system eq 'periodic'
|| !$data->{is_invoice};
foreach my $assembly_entry (@{ $part->assemblies }) {
push @{ $data->{assembly_items}->[-1] }, { part => $assembly_entry->part,
foreach my $assembly_entry (@{ $part->assemblies }) {
push @{ $data->{assembly_items}->[-1] }, { part => $assembly_entry->part,
@@
-188,7
+188,7
@@
sub _calculate_part_item {
_dbg("cpsi tq " . $total_qty);
_dbg("cpsi tq " . $total_qty);
- return 0 if $::
lx_office_conf{system}->{eur}
|| !$data->{is_invoice} || !$total_qty;
+ return 0 if $::
instance_conf->get_inventory_system eq 'periodic'
|| !$data->{is_invoice} || !$total_qty;
my ($entry);
$base_factor ||= 1;
my ($entry);
$base_factor ||= 1;