Verkauf/Rechnungen/Massenerstellung: keine Zahlungsbedingungen
authorMartin Helmling mh@waldpark.octosoft.eu <martin.helmling@octosoft.eu>
Tue, 19 Apr 2016 11:11:13 +0000 (13:11 +0200)
committerMartin Helmling mh@waldpark.octosoft.eu <martin.helmling@octosoft.eu>
Tue, 19 Apr 2016 11:11:13 +0000 (13:11 +0200)
Falls im Lieferschein keine Zahlungsbedingungen gesetzt sind, (normalerweise nicht)
wird die des Kunden für die Rechnung eingesetzt

SL/DB/Invoice.pm

index 84349e1..847a8fa 100644 (file)
@@ -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;