X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/78600d89c89dbdbb0ff0ef31e04feacedb1b5589..8b7b7b3f6252786b38bb6c9357fc00a08750b8db:/SL/DB/Invoice.pm diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index e9c04ed92..b3adee734 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -10,10 +10,13 @@ use List::Util qw(first); use SL::DB::MetaSetup::Invoice; use SL::DB::Manager::Invoice; +use SL::DB::Helper::FlattenToForm; use SL::DB::Helper::LinkedRecords; use SL::DB::Helper::PriceTaxCalculator; +use SL::DB::Helper::PriceUpdater; use SL::DB::Helper::TransNumberGenerator; use SL::DB::AccTransaction; +use SL::DB::Chart; use SL::DB::Employee; __PACKAGE__->meta->add_relationship( @@ -22,21 +25,17 @@ __PACKAGE__->meta->add_relationship( class => 'SL::DB::InvoiceItem', column_map => { id => 'trans_id' }, manager_args => { - with_objects => [ 'part' ] + with_objects => [ 'parts' ] } }, - payment_term => { - type => 'one to one', - class => 'SL::DB::PaymentTerm', - column_map => { payment_id => 'id' }, - }, ); __PACKAGE__->meta->initialize; # methods -sub items { goto &invoiceitems; } +sub items { goto &invoiceitems; } +sub payment_term { goto &payment; } # it is assumed, that ordnumbers are unique here. sub first_order_by_ordnumber { @@ -65,7 +64,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)'); @@ -123,7 +122,13 @@ sub new_from { sub post { my ($self, %params) = @_; - croak("Missing parameter 'ar_id'") unless $params{ar_id}; + if (!$params{ar_id}) { + my $chart = SL::DB::Manager::Chart->get_all(query => [ SL::DB::Manager::Chart->link_filter('AR') ], + sort_by => 'id ASC', + limit => 1)->[0]; + croak("No AR chart found and no parameter `ar_id' given") unless $chart; + $params{ar_id} = $chart->id; + } my $worker = sub { my %data = $self->calculate_prices_and_taxes; @@ -144,7 +149,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; } @@ -202,6 +207,22 @@ sub _post_update_allocated { } } +sub invoice_type { + my ($self) = @_; + + return 'ar_transaction' if !$self->invoice; + return 'credit_note' if $self->type eq 'credit_note' && $self->amount < 0 && !$self->storno; + return 'invoice_storno' if $self->type ne 'credit_note' && $self->amount < 0 && $self->storno; + return 'credit_note_storno' if $self->type eq 'credit_note' && $self->amount > 0 && $self->storno; + return 'invoice'; +} + +sub displayable_state { + my $self = shift; + + return $self->closed ? $::locale->text('closed') : $::locale->text('open'); +} + 1; __END__ @@ -241,7 +262,8 @@ Posts the invoice. Required parameters are: =item * C The ID of the accounds receivable chart the invoices amounts are -posted to. +posted to. If it is not set then the first chart configured for +accounts receivables is used. =back @@ -266,8 +288,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>). +kivitendo is not configured to use Einnahmenüberschussrechnungen. =item 7. The invoice and its items are saved.