X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=5562b1ea85a4fa7209d2e57c2273dcf2921d2bef;hb=a9c191deed45bf13c5a6983ad0409fd7cb0e86d3;hp=766cd6ea4879db173dd16be809b0f9a493d36b26;hpb=f2461e14168f6ac5433915b6a0309ddb4884499f;p=kivitendo-erp.git

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 766cd6ea4..5562b1ea8 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1047,7 +1047,9 @@ sub _pre_render {
   $self->{all_projects}        = SL::DB::Manager::Project->get_all(where => [ or => [ id => $self->order->globalproject_id,
                                                                                       active => 1 ] ],
                                                                    sort_by => 'projectnumber');
-  $self->{all_payment_terms}   = SL::DB::Manager::PaymentTerm->get_all_sorted();
+  $self->{all_payment_terms}   = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->order->payment_id,
+                                                                                                 obsolete => 0 ] ]);
+
   $self->{all_delivery_terms}  = SL::DB::Manager::DeliveryTerm->get_all_sorted();
 
   $self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
@@ -1081,7 +1083,7 @@ sub _pre_render {
     my @all_objects = $webdav->get_all_objects;
     @{ $self->{template_args}->{WEBDAV} } = map { { name => $_->filename,
                                                     type => t8('File'),
-                                                    link => File::Spec->catdir($webdav_path, $_->filename),
+                                                    link => File::Spec->catfile($_->full_filedescriptor),
                                                 } } @all_objects;
   }
 
@@ -1288,8 +1290,6 @@ java script functions
 
 =item * periodic invoices
 
-=item * more details on second row (marge, ...)
-
 =item * language / part translations
 
 =item * access rights
@@ -1317,16 +1317,7 @@ Customer discount is not displayed as a valid discount in price source popup
 
 =item *
 
-No indication that double click expands second row, no exand all button
-
-=item *
-
-Implementation of second row with a tbody for every item is not supported by
-our css.
-
-=item *
-
-As a consequence row striping does not currently work
+No indication that <shift>-up/down expands/collapses second row.
 
 =item *