X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/6061749dc0ece2873ef61a0c14af1b8a9e46034a..d81f55cefa8921fe0fc245dda721df0766502ad4:/SL/DB/Invoice.pm diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 77d6769a8..78fa46f5b 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 => { @@ -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; @@ -90,11 +119,21 @@ 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 %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)), + my $terms = $source->can('payment_id') && $source->payment_id ? $source->payment_terms->terms_netto : 0; + my (@columns, @item_columns); + + 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), @@ -117,12 +156,19 @@ sub new_from { 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)), + 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,); - } @{ $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); @@ -132,6 +178,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 +191,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 +218,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 +289,10 @@ sub displayable_state { return $self->closed ? $::locale->text('closed') : $::locale->text('open'); } +sub date { + goto &transdate; +} + 1; __END__