View | Details | Raw Unified | Return to bug 38457
Collapse All | Expand All

(-)a/Koha/Account/DebitType.pm (-1 / +1 lines)
Lines 22-28 use Modern::Perl; Link Here
22
use Koha::Database;
22
use Koha::Database;
23
use Koha::Exceptions;
23
use Koha::Exceptions;
24
24
25
use base qw(Koha::Object Koha::Object::Limit::Library);
25
use base qw(Koha::Object::Mixin::AdditionalFields Koha::Object Koha::Object::Limit::Library);
26
26
27
=head1 NAME
27
=head1 NAME
28
28
(-)a/Koha/Account/DebitTypes.pm (-1 / +1 lines)
Lines 22-28 use Modern::Perl; Link Here
22
use Koha::Database;
22
use Koha::Database;
23
use Koha::Account::DebitType;
23
use Koha::Account::DebitType;
24
24
25
use base qw(Koha::Objects Koha::Objects::Limit::Library);
25
use base qw(Koha::Objects::Mixin::AdditionalFields Koha::Objects Koha::Objects::Limit::Library);
26
26
27
=head1 NAME
27
=head1 NAME
28
28
(-)a/admin/debit_types.pl (-2 / +12 lines)
Lines 27-32 use C4::Output qw( output_html_with_http_headers ); Link Here
27
27
28
use Koha::Account::DebitType;
28
use Koha::Account::DebitType;
29
use Koha::Account::DebitTypes;
29
use Koha::Account::DebitTypes;
30
use Koha::AdditionalFields;
30
31
31
my $input = CGI->new;
32
my $input = CGI->new;
32
my $code  = $input->param('code');
33
my $code  = $input->param('code');
Lines 66-74 if ( $op eq 'add_form' ) { Link Here
66
            };
67
            };
67
    }
68
    }
68
69
70
    my @additional_fields       = Koha::AdditionalFields->search( { tablename => 'account_debit_types' } )->as_list;
71
    my @additional_field_values = $debit_type ? $debit_type->get_additional_field_values_for_template : ();
72
69
    $template->param(
73
    $template->param(
70
        debit_type    => $debit_type,
74
        debit_type              => $debit_type,
71
        branches_loop => \@branches_loop
75
        branches_loop           => \@branches_loop,
76
        additional_fields       => \@additional_fields,
77
        additional_field_values => @additional_field_values,
72
    );
78
    );
73
} elsif ( $op eq 'cud-add_validate' ) {
79
} elsif ( $op eq 'cud-add_validate' ) {
74
    my $description         = $input->param('description');
80
    my $description         = $input->param('description');
Lines 90-95 if ( $op eq 'add_form' ) { Link Here
90
    try {
96
    try {
91
        $debit_type->store;
97
        $debit_type->store;
92
        $debit_type->replace_library_limits( \@branches );
98
        $debit_type->replace_library_limits( \@branches );
99
100
        my @additional_fields = $debit_type->prepare_cgi_additional_field_values( $input, 'account_debit_types' );
101
        $debit_type->set_additional_fields( \@additional_fields );
102
93
        push @messages, { type => 'message', code => 'success_on_saving' };
103
        push @messages, { type => 'message', code => 'success_on_saving' };
94
    } catch {
104
    } catch {
95
        push @messages, { type => 'error', code => 'error_on_saving' };
105
        push @messages, { type => 'error', code => 'error_on_saving' };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt (-3 / +8 lines)
Lines 147-157 Link Here
147
                        [% WRAPPER table_option value="erm_packages" %]Packages[% END %]
147
                        [% WRAPPER table_option value="erm_packages" %]Packages[% END %]
148
                    </ul>
148
                    </ul>
149
                [% END %]
149
                [% END %]
150
                [% IF CAN_user_updatecharges_remaining_permissions %]
150
                [% IF CAN_user_updatecharges_remaining_permissions || CAN_user_parameters_manage_accounts %]
151
                    <h2>Patrons</h2>
151
                    <h2>Patrons</h2>
152
                    <ul>
152
                    <ul>
153
                        [% WRAPPER table_option value="accountlines:credit" %]Account lines (credit)[% END %]
153
                        [% IF CAN_user_updatecharges_remaining_permissions %]
154
                        [% WRAPPER table_option value="accountlines:debit" %]Account lines (debit)[% END %]
154
                            [% WRAPPER table_option value="accountlines:credit" %]Account lines (credit)[% END %]
155
                            [% WRAPPER table_option value="accountlines:debit" %]Account lines (debit)[% END %]
156
                        [% END %]
157
                        [% IF ( CAN_user_parameters_manage_accounts ) %]
158
                            [% WRAPPER table_option value="account_debit_types" %]Account debit types[% END %]
159
                        [% END %]
155
                    </ul>
160
                    </ul>
156
                [% END %]
161
                [% END %]
157
                [% IF CAN_user_serials_edit_subscription %]
162
                [% IF CAN_user_serials_edit_subscription %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt (-2 / +4 lines)
Lines 146-152 Link Here
146
                    </li>
146
                    </li>
147
                </ol>
147
                </ol>
148
            </fieldset>
148
            </fieldset>
149
149
            [% IF additional_fields.size %]
150
                [% INCLUDE 'additional-fields-entry.inc' available=additional_fields values=additional_field_values wrap_fieldset=1 %]
151
            [% END %]
150
            <fieldset class="action">
152
            <fieldset class="action">
151
                <button id="save_debit_type" class="btn btn-primary">Save</button>
153
                <button id="save_debit_type" class="btn btn-primary">Save</button>
152
                <a class="cancel" href="/cgi-bin/koha/admin/debit_types.pl">Cancel</a>
154
                <a class="cancel" href="/cgi-bin/koha/admin/debit_types.pl">Cancel</a>
Lines 252-257 Link Here
252
254
253
[% MACRO jsinclude BLOCK %]
255
[% MACRO jsinclude BLOCK %]
254
    [% Asset.js("js/admin-menu.js") | $raw %]
256
    [% Asset.js("js/admin-menu.js") | $raw %]
257
    [% Asset.js("js/additional-fields-entry.js") | $raw %]
255
    [% INCLUDE 'datatables.inc' %]
258
    [% INCLUDE 'datatables.inc' %]
256
    <script>
259
    <script>
257
        $(document).ready(function () {
260
        $(document).ready(function () {
258
- 

Return to bug 38457