X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=b164c03512671bd2ba6f850df091120acd6e6150;hb=5c5c1eef2ef26aa166f612d0718770488809b74b;hp=0138efc024a3f423e907967747a27554ec2c9223;hpb=357d134d265637fb37ed2cd47da2ce3ef44d015a;p=kivitendo-erp.git

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 0138efc02..b164c0351 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -28,36 +28,6 @@ __PACKAGE__->meta->add_relationship(
       with_objects => [ 'part' ]
     }
   },
-  payment_term => {
-    type       => 'one to one',
-    class      => 'SL::DB::PaymentTerm',
-    column_map => { payment_id => 'id' },
-  },
-  contact      => {
-    type       => 'one to one',
-    class      => 'SL::DB::Contact',
-    column_map => { cp_id => 'cp_id' },
-  },
-  shipto       => {
-    type       => 'one to one',
-    class      => 'SL::DB::Shipto',
-    column_map => { shipto_id => 'shipto_id' },
-  },
-  department   => {
-    type       => 'one to one',
-    class      => 'SL::DB::Department',
-    column_map => { department_id => 'id' },
-  },
-  language     => {
-    type       => 'one to one',
-    class      => 'SL::DB::Language',
-    column_map => { language_id => 'id' },
-  },
-  employee     => {
-    type       => 'one to one',
-    class      => 'SL::DB::Employee',
-    column_map => { employee_id => 'id' },
-  },
 );
 
 __PACKAGE__->meta->initialize;
@@ -66,6 +36,12 @@ __PACKAGE__->meta->initialize;
 
 sub items { goto &invoiceitems; }
 
+sub is_sales {
+  # For compatibility with Order, DeliveryOrder
+  croak 'not an accessor' if @_ > 1;
+  return 1;
+}
+
 # it is assumed, that ordnumbers are unique here.
 sub first_order_by_ordnumber {
   my $self = shift;
@@ -188,14 +164,11 @@ sub post {
 sub _post_add_acctrans {
   my ($self, $entries) = @_;
 
-  my $default_tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id;
-
   while (my ($chart_id, $spec) = each %{ $entries }) {
-    $spec = { taxkey => 0, tax_id => $default_tax_id, amount => $spec } unless ref $spec;
+    $spec = { taxkey => 0, amount => $spec } unless ref $spec;
     SL::DB::AccTransaction->new(trans_id   => $self->id,
                                 chart_id   => $chart_id,
                                 amount     => $spec->{amount},
-                                tax_id     => $spec->{tax_id},
                                 taxkey     => $spec->{taxkey},
                                 project_id => $self->globalproject_id,
                                 transdate  => $self->transdate)->save;