X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=72844b4dbc0c25380160855d85d715a5f7bfec22;hb=efb9a24f2252104ab4af5c25334119d7c5c70a8c;hp=14c11fa7d6b5c48e6d606d80be41ff497f4294f5;hpb=e0ad5757c7f9551f808b55c114ff8892f09689f4;p=kivitendo-erp.git diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 14c11fa7d..72844b4db 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -7,6 +7,7 @@ use strict; use Carp; use List::Util qw(first); +use List::MoreUtils qw(pairwise); use SL::DB::MetaSetup::Invoice; use SL::DB::Manager::Invoice; @@ -15,9 +16,7 @@ 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; +use SL::DB::CustomVariable; __PACKAGE__->meta->add_relationship( invoiceitems => { @@ -28,44 +27,49 @@ __PACKAGE__->meta->add_relationship( with_objects => [ 'part' ] } }, - payment_term => { - type => 'one to one', - class => 'SL::DB::PaymentTerm', - column_map => { payment_id => 'id' }, + storno_invoices => { + type => 'one to many', + class => 'SL::DB::Invoice', + column_map => { id => 'storno_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' }, + sepa_export_items => { + type => 'one to many', + class => 'SL::DB::SepaExportItem', + column_map => { id => 'ar_id' }, + manager_args => { with_objects => [ 'sepa_export' ] } }, ); __PACKAGE__->meta->initialize; +__PACKAGE__->before_save('_before_save_set_invnumber'); + +# hooks + +sub _before_save_set_invnumber { + my ($self) = @_; + + $self->create_trans_number if !$self->invnumber; + + return 1; +} + # methods sub items { goto &invoiceitems; } +sub items_sorted { + my ($self) = @_; + + return [ sort {$a->id <=> $b->id } @{ $self->items } ]; +} + +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; @@ -109,11 +113,13 @@ sub new_from { croak("Unsupported source object type '" . ref($source) . "'") unless ref($source) =~ m/^ SL::DB:: (?: Order | DeliveryOrder ) $/x; croak("Cannot create invoices for purchase records") unless $source->customer_id; - my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_term->terms_netto : 0; + require SL::DB::Employee; + + my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0; - my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes curr salesman_id cusordnumber ordnumber quonumber + my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber quonumber department_id cp_id language_id payment_id delivery_customer_id delivery_vendor_id taxzone_id shipto_id - globalproject_id transaction_description)), + globalproject_id transaction_description currency_id delivery_term_id)), transdate => DateTime->today_local, gldate => DateTime->today_local, duedate => DateTime->today_local->add(days => $terms * 1), @@ -141,7 +147,15 @@ sub new_from { base_qty subtotal longdescription lastcost price_factor_id)), deliverydate => $source_item->reqdate, fxsellprice => $source_item->sellprice,); - } @{ $source->items }; + } @{ $source->items_sorted }; + + my $i = 0; + foreach my $item (@items) { + my $source_cvars = $source->items_sorted->[$i]->cvars_by_config; + my $target_cvars = $item->cvars_by_config; + pairwise { $a->value($b->value) } @{ $target_cvars }, @{ $source_cvars }; + $i++; + } $invoice->invoiceitems(\@items); @@ -151,6 +165,7 @@ sub new_from { sub post { my ($self, %params) = @_; + require SL::DB::Chart; if (!$params{ar_id}) { my $chart = SL::DB::Manager::Chart->get_all(query => [ SL::DB::Manager::Chart->link_filter('AR') ], sort_by => 'id ASC', @@ -163,7 +178,6 @@ sub post { my %data = $self->calculate_prices_and_taxes; $self->_post_create_assemblyitem_entries($data{assembly_items}); - $self->create_trans_number; $self->save; $self->_post_add_acctrans($data{amounts_cogs}); @@ -188,14 +202,24 @@ sub post { sub _post_add_acctrans { my ($self, $entries) = @_; + my $default_tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id; + my $chart_link; + + require SL::DB::AccTransaction; + require SL::DB::Chart; while (my ($chart_id, $spec) = each %{ $entries }) { - $spec = { taxkey => 0, amount => $spec } unless ref $spec; + $spec = { taxkey => 0, tax_id => $default_tax_id, amount => $spec } unless ref $spec; + $chart_link = SL::DB::Manager::Chart->find_by(id => $chart_id)->{'link'}; + $chart_link ||= ''; + 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; + transdate => $self->transdate, + chart_link => $chart_link)->save; } } @@ -236,6 +260,26 @@ 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'); +} + +sub date { + goto &transdate; +} + 1; __END__ @@ -301,8 +345,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 -(see config/lx_office.conf, section "system", variable "eur"). +kivitendo is not configured to use Einnahmenüberschussrechnungen. =item 7. The invoice and its items are saved.