Kreditorenbuchungen: Zahlungsbedingungen laden/speichern

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 2fe8041c9f5b3fedfa8dc00469878f48b6948e9e..8e9e4cae18f64bf14a908e52286428a360debdc1 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -48,6 +48,7 @@ use SL::DB::Chart;
 use SL::DB::Currency;
 use SL::DB::Default;
 use SL::DB::Order;
 use SL::DB::Currency;
 use SL::DB::Default;
 use SL::DB::Order;

+use SL::DB::PaymentTerm;

 use SL::DB::PurchaseInvoice;
 use SL::DB::RecordTemplate;
 use SL::DB::Tax;
 use SL::DB::PurchaseInvoice;
 use SL::DB::RecordTemplate;
 use SL::DB::Tax;


@@ -252,7 +253,12 @@ sub add {
   $form->{transdate} = $form->{initial_transdate};
 
   if ($form->{vendor_id}) {
   $form->{transdate} = $form->{initial_transdate};
 
   if ($form->{vendor_id}) {

-    my $last_used_ap_chart = SL::DB::Vendor->load_cached($form->{vendor_id})->last_used_ap_chart;
+    my $vendor = SL::DB::Vendor->load_cached($form->{vendor_id});
+
+    # set initial payment terms
+    $form->{payment_id} = $vendor->payment_id;
+
+    my $last_used_ap_chart = $vendor->last_used_ap_chart;

     $form->{"AP_amount_chart_id_1"} = $last_used_ap_chart->id if $last_used_ap_chart;
   }
 
     $form->{"AP_amount_chart_id_1"} = $last_used_ap_chart->id if $last_used_ap_chart;
   }
 


@@ -556,6 +562,7 @@ sub form_header {
   print $form->parse_html_template('ap/form_header', {
     today => DateTime->today,
     currencies => SL::DB::Manager::Currency->get_all_sorted,
   print $form->parse_html_template('ap/form_header', {
     today => DateTime->today,
     currencies => SL::DB::Manager::Currency->get_all_sorted,

+    payment_terms => SL::DB::Manager::PaymentTerm->get_all_sorted(query => [ or => [ obsolete => 0, id => $::form->{payment_id}*1 ]]),

   });
 
   $main::lxdebug->leave_sub();
   });
 
   $main::lxdebug->leave_sub();


@@ -656,8 +663,14 @@ sub update {
 
   if (($form->{previous_vendor_id} || $form->{vendor_id}) != $form->{vendor_id}) {
     IR->get_vendor(\%::myconfig, $form);
 
   if (($form->{previous_vendor_id} || $form->{vendor_id}) != $form->{vendor_id}) {
     IR->get_vendor(\%::myconfig, $form);

+
+    my $vendor = SL::DB::Vendor->load_cached($form->{vendor_id});
+
+    # reset payment to new vendor
+    $form->{payment_id} = $vendor->payment_id;
+

     if (($form->{rowcount} == 1) && ($form->{amount_1} == 0)) {
     if (($form->{rowcount} == 1) && ($form->{amount_1} == 0)) {

-      my $last_used_ap_chart = SL::DB::Vendor->load_cached($form->{vendor_id})->last_used_ap_chart;
+      my $last_used_ap_chart = $vendor->last_used_ap_chart;

       $form->{"AP_amount_chart_id_1"} = $last_used_ap_chart->id if $last_used_ap_chart;
     }
   }
       $form->{"AP_amount_chart_id_1"} = $last_used_ap_chart->id if $last_used_ap_chart;
     }
   }

diff --git a/templates/webpages/ap/form_header.html b/templates/webpages/ap/form_header.html
index a332733af64082bf00655ba4740610612fcefe89..1c5a51d94033b5fbcbc275321505cb84a32214d1 100644 (file)
--- a/templates/webpages/ap/form_header.html
+++ b/templates/webpages/ap/form_header.html
@@ -242,6 +242,7 @@
           <tr>
            <th align="left">[% 'Notes' | $T8 %]</th>
            <th align="left">[% 'Internal Notes' | $T8 %]</th>
           <tr>
            <th align="left">[% 'Notes' | $T8 %]</th>
            <th align="left">[% 'Internal Notes' | $T8 %]</th>

+           <th align="left">[% 'Payment Terms' | $T8 %]</th>

           </tr>
           <tr valign="top">
            <td>
           </tr>
           <tr valign="top">
            <td>


@@ -250,6 +251,9 @@
            <td>
             [% L.textarea_tag("intnotes", intnotes, wrap="soft", rows=textarea_rows, cols=50, readonly=readonly) %]
            </td>
            <td>
             [% L.textarea_tag("intnotes", intnotes, wrap="soft", rows=textarea_rows, cols=50, readonly=readonly) %]
            </td>

+           <td>
+             [% L.select_tag('payment_id', payment_terms, default=payment_id, title_key='description', with_empty=1, style="width: 250px") %]
+           </td>

           <tr>
         </table>
     </td>
           <tr>
         </table>
     </td>