X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=e9c04ed92134e08ba73a536bc653cec64f5789e1;hb=78600d89c89dbdbb0ff0ef31e04feacedb1b5589;hp=96c140cd546719276e0265e2e6b31afe92a758d5;hpb=b9dbc9e3d4f8821d9fd324b52dafb81b699a776e;p=kivitendo-erp.git

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 96c140cd5..e9c04ed92 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -13,6 +13,7 @@ use SL::DB::Manager::Invoice;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::PriceTaxCalculator;
 use SL::DB::Helper::TransNumberGenerator;
+use SL::DB::AccTransaction;
 use SL::DB::Employee;
 
 __PACKAGE__->meta->add_relationship(
@@ -91,6 +92,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 +111,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,23 +123,32 @@ sub new_from {
 sub post {
   my ($self, %params) = @_;
 
-  $self->db->do_transaction(sub {
-    1;                          # dummy instruction for Emacs ;)
+  croak("Missing parameter 'ar_id'") unless $params{ar_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});
     $self->_post_add_acctrans($data{amounts});
     $self->_post_add_acctrans($data{taxes});
 
+    $self->_post_add_acctrans({ $params{ar_id} => $self->amount * -1 });
+
     $self->_post_update_allocated($data{allocated});
+  };
 
-    die;
-  });
+  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]));
+    return undef;
+  }
+
+  return $self;
 }
 
 sub _post_add_acctrans {
@@ -144,12 +156,12 @@ sub _post_add_acctrans {
 
   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;
+    SL::DB::AccTransaction->new(trans_id   => $self->id,
+                                chart_id   => $chart_id,
+                                amount     => $spec->{amount},
+                                taxkey     => $spec->{taxkey},
+                                project_id => $self->globalproject_id,
+                                transdate  => $self->transdate)->save;
   }
 }
 
@@ -185,10 +197,95 @@ 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
 1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+SL::DB::Invoice: Rose model for invoices (table "ar")
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item C<new_from $source>
+
+Creates a new C<SL::DB::Invoice> 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<transdate> field from an order will be
+copied into the invoice's C<orddate> field.
+
+Amounts, prices and taxes are not
+calculated. L<SL::DB::Helper::PriceTaxCalculator::calculate_prices_and_taxes>
+can be used for this.
+
+The object returned is not saved.
+
+=item C<post %params>
+
+Posts the invoice. Required parameters are:
+
+=over 2
+
+=item * C<ar_id>
+
+The ID of the accounds receivable chart the invoices amounts are
+posted to.
+
+=back
+
+This function implements several steps:
+
+=over 2
+
+=item 1. It calculates all prices, amounts and taxes by calling
+L<SL::DB::Helper::PriceTaxCalculator::calculate_prices_and_taxes>.
+
+=item 2. A new and unique invoice number is created.
+
+=item 3. All amounts for costs of goods sold are recorded in
+C<acc_trans>.
+
+=item 4. All amounts for parts, services and assemblies are recorded
+in C<acc_trans> 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<acc_trans>.
+
+=item 6. Items in C<invoice> 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
+(C<$::eur>).
+
+=item 7. The invoice and its items are saved.
+
+=back
+
+Returns C<$self> on success and C<undef> 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<basic_info $field>
+
+See L<SL::DB::Object::basic_info>.
+
+=back
+
+=head1 AUTHOR
+
+Moritz Bunkus E<lt>m.bunkus@linet-services.deE<gt>
+
+=cut