X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=54da8fa7ff00f84a9d7990b43c3f59336761c20f;hb=bebca3b60f8c019b9acbc436da7437d67dc19e67;hp=a2b8d1aa3b9fdcfe06da4a28c116ab5f38acf7a8;hpb=325c539c21187087e5540646c3c4e9cabd52ee84;p=kivitendo-erp.git diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index a2b8d1aa3..54da8fa7f 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -1,21 +1,22 @@ -# This file has been auto-generated only because it didn't exist. -# Feel free to modify it at will; it will not be overwritten automatically. - package SL::DB::Invoice; use strict; use Carp; use List::Util qw(first); -use List::MoreUtils qw(pairwise); +use Rose::DB::Object::Helpers (); use SL::DB::MetaSetup::Invoice; use SL::DB::Manager::Invoice; +use SL::DB::Helper::Payment qw(:ALL); +use SL::DB::Helper::AttrHTML; +use SL::DB::Helper::AttrSorted; 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::Locale::String qw(t8); use SL::DB::CustomVariable; __PACKAGE__->meta->add_relationship( @@ -38,16 +39,34 @@ __PACKAGE__->meta->add_relationship( column_map => { id => 'ar_id' }, manager_args => { with_objects => [ 'sepa_export' ] } }, + sepa_exports => { + type => 'many to many', + map_class => 'SL::DB::SepaExportItem', + map_from => 'ar', + map_to => 'sepa_export', + }, custom_shipto => { type => 'one to one', class => 'SL::DB::Shipto', column_map => { id => 'trans_id' }, query_args => [ module => 'AR' ], }, + transactions => { + type => 'one to many', + class => 'SL::DB::AccTransaction', + column_map => { id => 'trans_id' }, + manager_args => { + with_objects => [ 'chart' ], + sort_by => 'acc_trans_id ASC', + }, + }, ); __PACKAGE__->meta->initialize; +__PACKAGE__->attr_html('notes'); +__PACKAGE__->attr_sorted('items'); + __PACKAGE__->before_save('_before_save_set_invnumber'); # hooks @@ -63,12 +82,8 @@ sub _before_save_set_invnumber { # methods sub items { goto &invoiceitems; } - -sub items_sorted { - my ($self) = @_; - - return [ sort {$a->id <=> $b->id } @{ $self->items } ]; -} +sub add_items { goto &add_invoiceitems; } +sub record_number { goto &invnumber; }; sub is_sales { # For compatibility with Order, DeliveryOrder @@ -113,6 +128,15 @@ 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) = @_; @@ -121,14 +145,29 @@ sub new_from { require SL::DB::Employee; - my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0; + my (@columns, @item_columns, $item_parent_id_column, $item_parent_column); - 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 currency_id delivery_term_id)), + if (ref($source) eq 'SL::DB::Order') { + @columns = qw(quonumber delivery_customer_id delivery_vendor_id); + @item_columns = qw(subtotal); + + $item_parent_id_column = 'trans_id'; + $item_parent_column = 'order'; + + } else { + @columns = qw(donumber); + + $item_parent_id_column = 'delivery_order_id'; + $item_parent_column = 'delivery_order'; + } + + my $terms = $source->can('payment_id') ? $source->payment_terms : undef; + + 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 payment_id), @columns), transdate => DateTime->today_local, gldate => DateTime->today_local, - duedate => DateTime->today_local->add(days => $terms * 1), + duedate => $terms ? $terms->calc_date(reference_date => DateTime->today_local) : DateTime->today_local, invoice => 1, type => 'invoice', storno => 0, @@ -143,25 +182,37 @@ 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 = $_; - 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_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++; - } + 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}; + my $current_invoice_item = + SL::DB::InvoiceItem->new(map({ ( $_ => $source_item->$_ ) } + qw(parts_id description qty sellprice discount project_id serialnumber pricegroup_id transdate cusordnumber unit + base_qty longdescription lastcost price_factor_id active_discount_source active_price_source), @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 : '', + ); + + $current_invoice_item->{"converted_from_orderitems_id"} = $_->{id} if ref($item_parent) eq 'SL::DB::Order'; + $current_invoice_item->{"converted_from_delivery_order_items_id"} = $_->{id} if ref($item_parent) eq 'SL::DB::DeliveryOrder'; + $current_invoice_item; + } @{ $items }; + + @items = grep { $params{item_filter}->($_) } @items if $params{item_filter}; + @items = grep { $_->qty * 1 } @items if $params{skip_items_zero_qty}; + @items = grep { $_->qty >=0 } @items if $params{skip_items_negative_qty}; $invoice->invoiceitems(\@items); @@ -282,10 +333,52 @@ sub displayable_state { return $self->closed ? $::locale->text('closed') : $::locale->text('open'); } +sub displayable_type { + my ($self) = @_; + + return t8('AR Transaction') if $self->invoice_type eq 'ar_transaction'; + return t8('Credit Note') if $self->invoice_type eq 'credit_note'; + return t8('Invoice') . "(" . t8('Storno') . ")" if $self->invoice_type eq 'invoice_storno'; + return t8('Credit Note') . "(" . t8('Storno') . ")" if $self->invoice_type eq 'credit_note_storno'; + return t8('Invoice'); +} + +sub displayable_name { + join ' ', grep $_, map $_[0]->$_, qw(displayable_type record_number); +}; + +sub abbreviation { + my ($self) = @_; + + return t8('AR Transaction (abbreviation)') if $self->invoice_type eq 'ar_transaction'; + return t8('Credit note (one letter abbreviation)') if $self->invoice_type eq 'credit_note'; + return t8('Invoice (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")" if $self->invoice_type eq 'invoice_storno'; + return t8('Credit note (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")" if $self->invoice_type eq 'credit_note_storno'; + return t8('Invoice (one letter abbreviation)'); +} + sub date { goto &transdate; } +sub reqdate { + goto &duedate; +} + +sub customervendor { + goto &customer; +} + +sub link { + my ($self) = @_; + + my $html; + $html = SL::Presenter->get->sales_invoice($self, display => 'inline') if $self->invoice; + $html = SL::Presenter->get->ar_transaction($self, display => 'inline') if !$self->invoice; + + return $html; +} + 1; __END__ @@ -300,7 +393,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 @@ -310,6 +403,45 @@ 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 negative quantity are skipped. Items with +a quantity of 0 are not affected by this option. + +=item C + +If trueish then items with a quantity of 0 are skipped. + +=item C + +An optional code reference that is called for each item with the item +as its sole parameter. Items for which the code reference returns a +falsish value will be 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 invoice. +For example to set a different transdate (default is the current date), +call the method like this: + + my %params; + $params{attributes}{transdate} = '28.08.2015'; + $invoice = SL::DB::Invoice->new_from($self, %params)->post || die; + +=back + Amounts, prices and taxes are not calculated. L can be used for this. @@ -368,6 +500,16 @@ See L. =back +=head1 TODO + As explained in the new_from example, it is possible to set transdate to a new value. + From a user / programm point of view transdate is more than holy and there should be + some validity checker available for controller code. At least the same logic like in + Form.pm from ar.pl should be available: + # see old stuff ar.pl post + #$form->error($locale->text('Cannot post transaction above the maximum future booking date!')) + # if ($form->date_max_future($transdate, \%myconfig)); + #$form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig)); + =head1 AUTHOR Moritz Bunkus Em.bunkus@linet-services.deE