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

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index e9c04ed92..c66584135 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -10,10 +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(
@@ -30,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;
@@ -65,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)');
@@ -123,7 +151,13 @@ sub new_from {
 sub post {
   my ($self, %params) = @_;
 
-  croak("Missing parameter 'ar_id'") unless $params{ar_id};
+  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;
@@ -144,7 +178,7 @@ sub post {
   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]));
+    $::lxdebug->message(LXDebug->WARN(), "convert_to_invoice failed: " . join("\n", (split(/\n/, $self->db->error))[0..2]));
     return undef;
   }
 
@@ -202,6 +236,22 @@ sub _post_update_allocated {
   }
 }
 
+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__
@@ -241,7 +291,8 @@ Posts the invoice. Required parameters are:
 =item * C<ar_id>
 
 The ID of the accounds receivable chart the invoices amounts are
-posted to.
+posted to. If it is not set then the first chart configured for
+accounts receivables is used.
 
 =back
 
@@ -266,8 +317,7 @@ 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>).
+kivitendo is not configured to use Einnahmenüberschussrechnungen.
 
 =item 7. The invoice and its items are saved.