X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/73df5fb5a78b7fc8576c9b7e3da47e10fc551c85..22150c521fb5784c8c67c0eeaed8984c47859afe:/SL/DB/Invoice.pm?ds=sidebyside

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index b93956a67..44f13abfd 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -12,6 +12,7 @@ use SL::DB::MetaSetup::Invoice;
 use SL::DB::Manager::Invoice;
 use SL::DB::Helper::LinkedRecords;
 use SL::DB::Helper::PriceTaxCalculator;
+use SL::DB::Helper::TransNumberGenerator;
 use SL::DB::Employee;
 
 __PACKAGE__->meta->add_relationship(
@@ -90,6 +91,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,
             );
 
@@ -108,7 +110,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);
@@ -119,23 +122,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});
+  };
+
+  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;
+  }
 
-    die;
-  });
+  return $self;
 }
 
 sub _post_add_acctrans {
@@ -147,7 +159,7 @@ sub _post_add_acctrans {
                           chart_id   => $chart_id,
                           amount     => $spec->{amount},
                           taxkey     => $spec->{taxkey},
-                          project_id => $self->project_id,
+                          project_id => $self->globalproject_id,
                           transdate  => $self->transdate)->save;
   }
 }
@@ -184,7 +196,7 @@ 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 ]);
   }
 }