X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDB%2FInvoice.pm;h=0138efc024a3f423e907967747a27554ec2c9223;hb=357d134d265637fb37ed2cd47da2ce3ef44d015a;hp=482bb70d3eab1b58d30bc49f5944f0236b16f391;hpb=dd04aff20186eef2be5deb8766d3c086d93fd1a8;p=kivitendo-erp.git diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm index 482bb70d3..0138efc02 100644 --- a/SL/DB/Invoice.pm +++ b/SL/DB/Invoice.pm @@ -10,9 +10,13 @@ use List::Util qw(first); use SL::DB::MetaSetup::Invoice; use SL::DB::Manager::Invoice; +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::DB::AccTransaction; +use SL::DB::Chart; use SL::DB::Employee; __PACKAGE__->meta->add_relationship( @@ -29,6 +33,31 @@ __PACKAGE__->meta->add_relationship( 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' }, + }, + 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' }, + }, ); __PACKAGE__->meta->initialize; @@ -64,7 +93,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)'); @@ -91,6 +120,7 @@ sub new_from { invoice => 1, type => 'invoice', storno => 0, + paid => 0, employee_id => (SL::DB::Manager::Employee->current || SL::DB::Employee->new(id => $source->employee_id))->id, ); @@ -109,7 +139,8 @@ sub new_from { 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); + deliverydate => $source_item->reqdate, + fxsellprice => $source_item->sellprice,); } @{ $source->items }; $invoice->invoiceitems(\@items); @@ -120,15 +151,19 @@ sub new_from { sub post { my ($self, %params) = @_; - croak("Missing parameter 'ar_id'") unless $params{ar_id}; - - $self->db->do_transaction(sub { - 1; # dummy instruction for Emacs ;) + if (!$params{ar_id}) { + my $chart = SL::DB::Manager::Chart->get_all(query => [ SL::DB::Manager::Chart->link_filter('AR') ], + sort_by => 'id ASC', + limit => 1)->[0]; + croak("No AR chart found and no parameter `ar_id' given") unless $chart; + $params{ar_id} = $chart->id; + } + my $worker = sub { 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}); @@ -138,22 +173,32 @@ sub post { $self->_post_add_acctrans({ $params{ar_id} => $self->amount * -1 }); $self->_post_update_allocated($data{allocated}); + }; + + if ($self->db->in_transaction) { + $worker->(); + } elsif (!$self->db->do_transaction($worker)) { + $::lxdebug->message(LXDebug->WARN(), "convert_to_invoice failed: " . join("\n", (split(/\n/, $self->db->error))[0..2])); + return undef; + } - die; - }); + return $self; } sub _post_add_acctrans { my ($self, $entries) = @_; + my $default_tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id; + while (my ($chart_id, $spec) = each %{ $entries }) { - $spec = { taxkey => 0, amount => $spec } unless ref $spec; - SL::DB::AccTrans->new(trans_id => $self->id, - chart_id => $chart_id, - amount => $spec->{amount}, - taxkey => $spec->{taxkey}, - project_id => $self->project_id, - transdate => $self->transdate)->save; + $spec = { taxkey => 0, tax_id => $default_tax_id, amount => $spec } unless ref $spec; + 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; } } @@ -189,10 +234,111 @@ sub _post_update_allocated { my ($self, $allocated) = @_; while (my ($invoice_id, $diff) = each %{ $allocated }) { - SL::DB::Manager::InvoiceItem->update_all(set => { allocated => { sql => [ 'allocated + ?', $diff ] } }, + SL::DB::Manager::InvoiceItem->update_all(set => { allocated => { sql => "allocated + $diff" } }, where => [ id => $invoice_id ]); } } ->>>>>>> b6be290... Prototypisiertes Buchen von Rechnungen +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'); +} + 1; + +__END__ + +=pod + +=head1 NAME + +SL::DB::Invoice: Rose model for invoices (table "ar") + +=head1 FUNCTIONS + +=over 4 + +=item C + +Creates a new C instance and copies as much +information from C<$source> as possible. At the moment only sales +orders and sales quotations are supported as sources. + +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. + +Amounts, prices and taxes are not +calculated. L +can be used for this. + +The object returned is not saved. + +=item C + +Posts the invoice. Required parameters are: + +=over 2 + +=item * C + +The ID of the accounds receivable chart the invoices amounts are +posted to. If it is not set then the first chart configured for +accounts receivables is used. + +=back + +This function implements several steps: + +=over 2 + +=item 1. It calculates all prices, amounts and taxes by calling +L. + +=item 2. A new and unique invoice number is created. + +=item 3. All amounts for costs of goods sold are recorded in +C. + +=item 4. All amounts for parts, services and assemblies are recorded +in C with their respective charts. This is determined by +the part's buchungsgruppen. + +=item 5. The total amount is posted to the accounts receivable chart +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 +kivitendo is not configured to use Einnahmenüberschussrechnungen. + +=item 7. The invoice and its items are saved. + +=back + +Returns C<$self> on success and C on failure. The whole process +is run inside a transaction. If it fails then nothing is saved to or +changed in the database. A new transaction is only started if none is +active. + +=item C + +See L. + +=back + +=head1 AUTHOR + +Moritz Bunkus Em.bunkus@linet-services.deE + +=cut