X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FInvoice.pm;h=121f7659c1f04681d3ae026cb68fc7259fe6248c;hb=7d5e8b70dc7ae6a3feddf40aa6f2cfe24ce15384;hp=e4c24263ea9dce4e3e1bd7e22aba8e96fd68678c;hpb=0eb90109aca630ea37769d64d948f2f79327a7e6;p=kivitendo-erp.git

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index e4c24263e..121f7659c 100644
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -131,7 +131,7 @@ sub closed {
 sub _clone_orderitem_delivery_order_item_cvar {
   my ($cvar) = @_;
 
-  my $cloned = Rose::DB::Object::Helpers::clone_and_reset($_);
+  my $cloned = $_->clone_and_reset;
   $cloned->sub_module('invoice');
 
   return $cloned;
@@ -162,9 +162,10 @@ sub new_from {
   }
 
   my $terms = $source->can('payment_id') ? $source->payment_terms : undef;
+  $terms = $source->customer->payment_terms if !defined $terms && $source->customer;
 
   my %args = ( map({ ( $_ => $source->$_ ) } qw(customer_id taxincluded shippingpoint shipvia notes intnotes salesman_id cusordnumber ordnumber department_id
-                                                cp_id language_id taxzone_id globalproject_id transaction_description currency_id delivery_term_id payment_id), @columns),
+                                                cp_id language_id taxzone_id globalproject_id transaction_description currency_id delivery_term_id), @columns),
                transdate   => DateTime->today_local,
                gldate      => DateTime->today_local,
                duedate     => $terms ? $terms->calc_date(reference_date => DateTime->today_local) : DateTime->today_local,
@@ -175,6 +176,8 @@ sub new_from {
                employee_id => (SL::DB::Manager::Employee->current || SL::DB::Employee->new(id => $source->employee_id))->id,
             );
 
+  $args{payment_id} = ( $terms ? $terms->id : $source->payment_id);
+
   if ($source->type =~ /_order$/) {
     $args{deliverydate} = $source->reqdate;
     $args{orddate}      = $source->transdate;
@@ -237,9 +240,14 @@ sub post {
 
   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',
-                                                limit   => 1)->[0];
+    my $chart;
+    if ($::instance_conf->get_ar_chart_id) {
+      $chart = SL::DB::Manager::Chart->find_by(id => $::instance_conf->get_ar_chart_id);
+    } else {
+      $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;
   }
@@ -257,6 +265,8 @@ sub post {
     $self->_post_add_acctrans({ $params{ar_id} => $self->amount * -1 });
 
     $self->_post_update_allocated($data{allocated});
+
+    $self->_post_book_rounding($data{rounding});
   };
 
   if ($self->db->in_transaction) {
@@ -293,6 +303,26 @@ sub _post_add_acctrans {
   }
 }
 
+sub _post_book_rounding {
+  my ($self, $rounding) = @_;
+
+  my $tax_id = SL::DB::Manager::Tax->find_by(taxkey => 0)->id;
+  my $rnd_accno = $rounding == 0 ? 0
+                : $rounding > 0  ? SL::DB::Default->get->rndgain_accno_id
+                :                  SL::DB::Default->get->rndloss_accno_id
+  ;
+  if ($rnd_accno != 0) {
+    SL::DB::AccTransaction->new(trans_id   => $self->id,
+                                chart_id   => $rnd_accno,
+                                amount     => $rounding,
+                                tax_id     => $tax_id,
+                                taxkey     => 0,
+                                project_id => $self->globalproject_id,
+                                transdate  => $self->transdate,
+                                chart_link => $rnd_accno)->save;
+  }
+}
+
 sub add_ar_amount_row {
   my ($self, %params ) = @_;
 
@@ -300,7 +330,7 @@ sub add_ar_amount_row {
   die "not an ar invoice" if $self->invoice and not $self->customer_id;
 
   die "add_ar_amount_row needs a chart object as chart param" unless $params{chart} && $params{chart}->isa('SL::DB::Chart');
-  die unless $params{chart}->link =~ /AR_amount/;
+  die "chart must be an AR_amount chart" unless $params{chart}->link =~ /AR_amount/;
 
   my $acc_trans = [];
 
@@ -670,6 +700,11 @@ active.
 
 See L<SL::DB::Object::basic_info>.
 
+=item C<closed>
+
+Returns 1 or 0, depending on whether the invoice is closed or not. Currently
+invoices that are overpaid also count as closed.
+
 =item C<recalculate_amounts %params>
 
 Calculate and set amount and netamount from acc_trans objects by summing up the
@@ -706,7 +741,7 @@ Mandatory params are
 =back
 
 Currently the amount of the invoice object is used for the acc_trans amount.
-Use C<recalculate_amounts> before calling this mehtod if amount it isn't known
+Use C<recalculate_amounts> before calling this method if amount isn't known
 yet or you didn't set it manually.
 
 =item C<add_ar_amount_row %params>