@@ -, +, @@
---
admin/debit_types.pl | 7 +--
.../prog/en/modules/admin/debit_types.tt | 55 ++++++++-----------
2 files changed, 25 insertions(+), 37 deletions(-)
--- a/admin/debit_types.pl
+++ a/admin/debit_types.pl
@@ -134,14 +134,9 @@ elsif ( $op eq 'delete_confirmed' ) {
}
if ( $op eq 'list' ) {
- my $defaults = Koha::Account::DebitType::defaults;
- my $system_types =
- Koha::Account::DebitTypes->search( { code => { 'in' => $defaults } } );
- my $debit_types = Koha::Account::DebitTypes->search(
- { code => { 'not_in' => $defaults } } );
+ my $debit_types = Koha::Account::DebitTypes->search();
$template->param(
debit_types => $debit_types,
- system_types => $system_types
);
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -152,10 +152,10 @@
Account debit types
- Custom types
[% IF debit_types.count %]
+ System |
Account type code |
Description |
Default amount |
@@ -166,6 +166,7 @@
[% FOREACH debit_type IN debit_types %]
+ [% debit_type.is_system | html %] |
[% debit_type.code | html %] |
[% debit_type.description | html %] |
[% debit_type.default_amount | $Price %] |
@@ -205,25 +206,6 @@
There are no account debit types defined. Create new debit type
[% END %]
- System types
-
-
- Account type code |
- Description |
- Default amount |
- Can be added manually |
-
-
- [% FOREACH system_type IN system_types %]
-
- [% system_type.code | html %] |
- [% system_type.description | html %] |
- [% system_type.default_amount | $Price %] |
- [% IF system_type.can_be_added_manually %]Yes[% ELSE %]No[% END %] |
-
- [% END %]
-
-
[% END %]
@@ -241,23 +223,34 @@
[% END %]
--