X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=14c11fa7d6b5c48e6d606d80be41ff497f4294f5;hb=1c103b3a9a96a045a221760af82bc99093b3076c;hp=25393c6bce8b52681f72a7ef12f0e3820988d9fd;hpb=cc54185d1da8a3103668607c0c902b8314e3bfc4;p=kivitendo-erp.git diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 25393c6bc..14c11fa7d 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -53,6 +53,11 @@ __PACKAGE__->meta->add_relationship( 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; @@ -88,7 +93,7 @@ sub taxamount { my $self = shift; die 'not a setter method' if @_; - return $self->amount - $self->netamount; + return ($self->amount || 0) - ($self->netamount || 0); } __PACKAGE__->meta->make_attr_helpers(taxamount => 'numeric(15,5)'); @@ -173,7 +178,7 @@ sub post { if ($self->db->in_transaction) { $worker->(); } elsif (!$self->db->do_transaction($worker)) { - $::lxdebug->message(0, "convert_to_invoice failed: " . join("\n", (split(/\n/, $self->db->error))[0..2])); + $::lxdebug->message(LXDebug->WARN(), "convert_to_invoice failed: " . join("\n", (split(/\n/, $self->db->error))[0..2])); return undef; } @@ -297,7 +302,7 @@ and recorded in C. =item 6. Items in C are updated according to their allocation status (regarding for costs of goold sold). Will only be done if Lx-Office is not configured to use Einnahmenüberschussrechnungen -(C<$::eur>). +(see config/lx_office.conf, section "system", variable "eur"). =item 7. The invoice and its items are saved.