X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=502654ba262168fed42635a5b0581f6052757150;hb=2aecf487d4afd29f13007b927fec624c2f45d3ce;hp=861c92ae4f7d3dc81738894836815cc5ecd0735a;hpb=9e58ceae3d60fe8986a2aefb8065467b16fa18de;p=kivitendo-erp.git diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 861c92ae4..502654ba2 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 => { @@ -33,14 +32,44 @@ __PACKAGE__->meta->add_relationship( class => 'SL::DB::Invoice', column_map => { id => 'storno_id' }, }, + sepa_export_items => { + type => 'one to many', + class => 'SL::DB::SepaExportItem', + column_map => { id => 'ar_id' }, + manager_args => { with_objects => [ 'sepa_export' ] } + }, + 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; @@ -84,20 +113,49 @@ 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_terms->terms_netto : 0; + require SL::DB::Employee; + + my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms + : $source->customer_id ? $source ->customer->payment_terms + : undef; + + my (@columns, @item_columns, $item_parent_id_column, $item_parent_column); + + if (ref($source) eq 'SL::DB::Order') { + @columns = qw(quonumber payment_id delivery_customer_id delivery_vendor_id); + @item_columns = qw(subtotal); + + $item_parent_id_column = 'trans_id'; + $item_parent_column = 'order'; + + } else { + @columns = qw(donumber); - 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)), + $item_parent_id_column = 'delivery_order_id'; + $item_parent_column = 'delivery_order'; + } + + 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), + duedate => DateTime->today_local->add(days => ($terms ? $terms->terms_netto * 1 : 1)), + payment_id => $terms ? $terms->id : undef, invoice => 1, type => 'invoice', storno => 0, @@ -112,17 +170,32 @@ sub new_from { $args{quodate} = $source->transdate; } - my $invoice = $class->new(%args, %params); + my $invoice = $class->new(%args); + $invoice->assign_attributes(%{ $params{attributes} }) if $params{attributes}; + my $items = delete($params{items}) || $source->items_sorted; + my %item_parents; my @items = map { - my $source_item = $_; + my $source_item = $_; + my $source_item_id = $_->$item_parent_id_column; + my @custom_variables = map { _clone_orderitem_delivery_order_item_cvar($_) } @{ $source_item->custom_variables }; + + $item_parents{$source_item_id} ||= $source_item->$item_parent_column; + my $item_parent = $item_parents{$source_item_id}; + 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 transdate cusordnumber unit + base_qty longdescription lastcost price_factor_id), @item_columns), + deliverydate => $source_item->reqdate, + fxsellprice => $source_item->sellprice, + custom_variables => \@custom_variables, + ordnumber => ref($item_parent) eq 'SL::DB::Order' ? $item_parent->ordnumber : $source_item->ordnumber, + donumber => ref($item_parent) eq 'SL::DB::DeliveryOrder' ? $item_parent->donumber : $source_item->can('donumber') ? $source_item->donumber : '', + ); + + } @{ $items }; + + @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty}; $invoice->invoiceitems(\@items); @@ -132,6 +205,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', @@ -144,7 +218,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}); @@ -172,6 +245,8 @@ sub _post_add_acctrans { 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, tax_id => $default_tax_id, amount => $spec } unless ref $spec; $chart_link = SL::DB::Manager::Chart->find_by(id => $chart_id)->{'link'}; @@ -241,6 +316,19 @@ sub displayable_state { return $self->closed ? $::locale->text('closed') : $::locale->text('open'); } +sub date { + goto &transdate; +} + +sub transactions { + my ($self) = @_; + + return unless $self->id; + + require SL::DB::AccTransaction; + SL::DB::Manager::AccTransaction->get_all(query => [ trans_id => $self->id ]); +} + 1; __END__ @@ -255,7 +343,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 @@ -265,6 +353,29 @@ 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 + +If trueish then items with a quantity of 0 are skipped. + +=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.