projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PDF Helper Erweiterungen: bothsided , out_path
[kivitendo-erp.git]
/
SL
/
Controller
/
Order.pm
diff --git
a/SL/Controller/Order.pm
b/SL/Controller/Order.pm
index
766cd6e
..
5562b1e
100644
(file)
--- 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_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;
$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'),
my @all_objects = $webdav->get_all_objects;
@{ $self->{template_args}->{WEBDAV} } = map { { name => $_->filename,
type => t8('File'),
- link => File::Spec->cat
dir($webdav_path, $_->filename
),
+ link => File::Spec->cat
file($_->full_filedescriptor
),
} } @all_objects;
}
} } @all_objects;
}
@@
-1288,8
+1290,6
@@
java script functions
=item * periodic invoices
=item * periodic invoices
-=item * more details on second row (marge, ...)
-
=item * language / part translations
=item * access rights
=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 *
=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 *
=item *