BankTransaction: Verlinkungen auf alten Vorlagencode upgedated.

[mfinanz.git] / SL / DB / Invoice.pm

diff --git a/SL/DB/Invoice.pm b/SL/DB/Invoice.pm
index 0ef5b6602e4a2f4ab533cdf58d897c6e03b9a720..3f337f10345f1eb4aec1c794bbf2b9898450fbee 100644 (file)
--- a/SL/DB/Invoice.pm
+++ b/SL/DB/Invoice.pm
@@ -240,21 +240,20 @@ 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;
   }
 
   my $worker = sub {
     my %data = $self->calculate_prices_and_taxes;
-    my $grossamount = $self->amount;
-    $self->amount($::form->round_amount($grossamount, 2, 1));
-    my $rounding = $::form->round_amount(
-      $self->amount - $grossamount,
-      2
-    );
 
     $self->_post_create_assemblyitem_entries($data{assembly_items});
     $self->save;
@@ -262,11 +261,12 @@ sub post {
     $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});
 
-    $self->_post_book_rounding($rounding);
+    $self->_post_book_rounding($data{rounding});
   };
 
   if ($self->db->in_transaction) {
@@ -330,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 = [];