X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FHelper%2FPriceTaxCalculator.pm;h=a8e15481db00918b85d234db9046838e7541e2c9;hb=e0ad5757c7f9551f808b55c114ff8892f09689f4;hp=29c78f62433e1b4cea45d5b7a7dd69333c9496b8;hpb=3d7898cf2bab46c72face3011460d093d8778b32;p=kivitendo-erp.git

diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index 29c78f624..a8e15481d 100644
--- a/SL/DB/Helper/PriceTaxCalculator.pm
+++ b/SL/DB/Helper/PriceTaxCalculator.pm
@@ -109,8 +109,12 @@ sub _calculate_item {
     $tax_amount = $linetotal * $tax_rate;
   }
 
-  $data->{taxes}->{ $taxkey->tax->chart_id } ||= 0;
-  $data->{taxes}->{ $taxkey->tax->chart_id }  += $tax_amount;
+  if ($taxkey->tax->chart_id) {
+    $data->{taxes}->{ $taxkey->tax->chart_id } ||= 0;
+    $data->{taxes}->{ $taxkey->tax->chart_id }  += $tax_amount;
+  } elsif ($tax_amount) {
+    die "tax_amount != 0 but no chart_id for taxkey " . $taxkey->id . " tax " . $taxkey->tax->id;
+  }
 
   $self->netamount($self->netamount + $sellprice * $item->qty / $item->price_factor);
 
@@ -163,7 +167,7 @@ sub _calculate_amounts {
 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,
@@ -184,7 +188,7 @@ sub _calculate_part_item {
 
   _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;
@@ -225,7 +229,7 @@ sub _num_decimal_places {
 }
 
 sub _dbg {
-  $::lxdebug->message(0, join(' ', @_));
+  # $::lxdebug->message(0, join(' ', @_));
 }
 
 1;