X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=987ab72a7634ea824ba4986e078c9c90eb91d681;hb=53aad992851d0e653fe5d3f291d72ebe5b5ac1e5;hp=758f91a61b230170a62cc0a892cafd6d1611f811;hpb=a99b261f6a4a4b1988ce2e0ad4c27ed579378cb9;p=kivitendo-erp.git diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 758f91a61..987ab72a7 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -8,6 +8,8 @@ use strict; use Carp; use List::Util qw(first); +use Rose::DB::Object::Helpers (); + use SL::DB::MetaSetup::Invoice; use SL::DB::Manager::Invoice; use SL::DB::Helper::FlattenToForm; @@ -15,9 +17,6 @@ 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( invoiceitems => { @@ -28,44 +27,55 @@ __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' }, + storno_invoices => { + type => 'one to many', + class => 'SL::DB::Invoice', + column_map => { id => 'storno_id' }, }, - language => { - type => 'one to one', - class => 'SL::DB::Language', - column_map => { language_id => 'id' }, + sepa_export_items => { + type => 'one to many', + class => 'SL::DB::SepaExportItem', + column_map => { id => 'ar_id' }, + manager_args => { with_objects => [ 'sepa_export' ] } }, - employee => { - type => 'one to one', - class => 'SL::DB::Employee', - column_map => { employee_id => 'id' }, + custom_shipto => { + type => 'one to one', + class => 'SL::DB::Shipto', + column_map => { id => 'trans_id' }, + query_args => [ module => 'AR' ], }, ); __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; @@ -93,7 +103,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)'); @@ -103,17 +113,36 @@ sub closed { return $self->paid >= $self->amount; } +sub _clone_orderitem_delivery_order_item_cvar { + my ($cvar) = @_; + + my $cloned = Rose::DB::Object::Helpers::clone_and_reset($_); + $cloned->sub_module('invoice'); + + return $cloned; +} + sub new_from { my ($class, $source, %params) = @_; 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 (@columns, @item_columns); - my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes curr 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)), + if (ref($source) eq 'SL::DB::Order') { + @columns = qw(quonumber payment_id delivery_customer_id delivery_vendor_id); + @item_columns = qw(subtotal); + + } else { + @columns = qw(donumber); + } + + my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber department_id + cp_id language_id taxzone_id shipto_id globalproject_id transaction_description currency_id delivery_term_id), @columns), transdate => DateTime->today_local, gldate => DateTime->today_local, duedate => DateTime->today_local->add(days => $terms * 1), @@ -131,17 +160,22 @@ sub new_from { $args{quodate} = $source->transdate; } - my $invoice = $class->new(%args, %params); + my $invoice = $class->new(%args, %{ $params{attributes} || {} }); + my $items = delete($params{items}) || $source->items_sorted; my @items = map { - my $source_item = $_; + my $source_item = $_; + my @custom_variables = map { _clone_orderitem_delivery_order_item_cvar($_) } @{ $source_item->custom_variables }; + SL::DB::InvoiceItem->new(map({ ( $_ => $source_item->$_ ) } - qw(parts_id description qty sellprice discount project_id - serialnumber pricegroup_id ordnumber transdate cusordnumber unit - base_qty subtotal longdescription lastcost price_factor_id)), - deliverydate => $source_item->reqdate, - fxsellprice => $source_item->sellprice,); - } @{ $source->items }; + qw(parts_id description qty sellprice discount project_id serialnumber pricegroup_id ordnumber transdate cusordnumber unit + base_qty longdescription lastcost price_factor_id), @item_columns), + deliverydate => $source_item->reqdate, + fxsellprice => $source_item->sellprice, + custom_variables => \@custom_variables, + ); + + } @{ $items }; $invoice->invoiceitems(\@items); @@ -151,6 +185,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 +198,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}); @@ -178,7 +212,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; } @@ -188,14 +222,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 +280,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__ @@ -250,7 +314,7 @@ SL::DB::Invoice: Rose model for invoices (table "ar") =over 4 -=item C +=item C Creates a new C instance and copies as much information from C<$source> as possible. At the moment only sales @@ -260,6 +324,25 @@ The conversion copies order items into invoice items. Dates are copied as appropriate, e.g. the C field from an order will be copied into the invoice's C field. +C<%params> can include the following options: + +=over 2 + +=item C + +An optional array reference of RDBO instances for the items to use. If +missing then the method C will be called on +C<$source>. This option can be used to override the sorting, to +exclude certain positions or to add additional ones. + +=item C + +An optional hash reference. If it exists then it is passed to C +allowing the caller to set certain attributes for the new delivery +order. + +=back + Amounts, prices and taxes are not calculated. L can be used for this. @@ -301,8 +384,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.