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

(-)a/admin/marc_order_accounts.pl (+1 lines)
Lines 44-49 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
44
        template_name => "admin/marc_order_accounts.tt",
44
        template_name => "admin/marc_order_accounts.tt",
45
        query         => $input,
45
        query         => $input,
46
        type          => "intranet",
46
        type          => "intranet",
47
        flagsrequired => { acquisition => 'marc_order_manage' },
47
    }
48
    }
48
);
49
);
49
50
(-)a/installer/data/mysql/atomicupdate/bug_34355-add_marc_order_accounts.pl (+8 lines)
Lines 43-47 return { Link Here
43
            }
43
            }
44
        );
44
        );
45
45
46
        $dbh->do(
47
            q{
48
                INSERT IGNORE INTO permissions (module_bit, code, description) values (11, 'marc_order_manage', 'Manage MARC ordering');
49
                }
50
        );
51
52
53
46
    },
54
    },
47
};
55
};
(-)a/installer/data/mysql/mandatory/userpermissions.sql (+1 lines)
Lines 86-91 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
86
   (11, 'budget_add_del', 'Add and delete funds (but can''t modify funds)'),
86
   (11, 'budget_add_del', 'Add and delete funds (but can''t modify funds)'),
87
   (11, 'budget_manage_all', 'Manage all funds'),
87
   (11, 'budget_manage_all', 'Manage all funds'),
88
   (11, 'edi_manage', 'Manage EDIFACT transmissions'),
88
   (11, 'edi_manage', 'Manage EDIFACT transmissions'),
89
   (11, 'marc_order_manage', 'Manage MARC ordering'),
89
   (11, 'reopen_closed_invoices', 'Reopen closed invoices'),
90
   (11, 'reopen_closed_invoices', 'Reopen closed invoices'),
90
   (11, 'edit_invoices', 'Edit invoices'),
91
   (11, 'edit_invoices', 'Edit invoices'),
91
   (11, 'delete_invoices', 'Delete invoices'),
92
   (11, 'delete_invoices', 'Delete invoices'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (-2 / +2 lines)
Lines 24-30 Link Here
24
                [% END %]
24
                [% END %]
25
            </ul>
25
            </ul>
26
        [% END %]
26
        [% END %]
27
        [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %]
27
        [% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
28
            <h5>Administration</h5>
28
            <h5>Administration</h5>
29
            <ul>
29
            <ul>
30
                [% IF ( CAN_user_acquisition_period_manage ) %]
30
                [% IF ( CAN_user_acquisition_period_manage ) %]
Lines 40-46 Link Here
40
                    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
40
                    <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
41
                    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
41
                    <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
42
                [% END %]
42
                [% END %]
43
                [% IF Koha.Preference('MarcOrderingAutomation') %]
43
                [% IF Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage %]
44
                    <li><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></li>
44
                    <li><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></li>
45
                [% END %]
45
                [% END %]
46
                [% IF CAN_user_acquisition_edit_invoices && CAN_user_parameters_manage_additional_fields %]
46
                [% IF CAN_user_acquisition_edit_invoices && CAN_user_parameters_manage_additional_fields %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-3 / +3 lines)
Lines 125-131 Link Here
125
        </ul>
125
        </ul>
126
    [% END %]
126
    [% END %]
127
127
128
    [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %]
128
    [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
129
        <h5>Acquisition parameters</h5>
129
        <h5>Acquisition parameters</h5>
130
        <ul>
130
        <ul>
131
            [% IF ( CAN_user_acquisition_currencies_manage ) %]
131
            [% IF ( CAN_user_acquisition_currencies_manage ) %]
Lines 141-148 Link Here
141
                <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
141
                <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
142
                <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
142
                <li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
143
            [% END %]
143
            [% END %]
144
            [% IF Koha.Preference('MarcOrderingAutomation') %]
144
            [% IF ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
145
                <li><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></li>
145
                <li><a href="/cgi-bin/koha/admin/edi_accounts.pl">MARC ordering accounts</a></li>
146
            [% END %]
146
            [% END %]
147
        </ul>
147
        </ul>
148
    [% END %]
148
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+5 lines)
Lines 827-832 Link Here
827
            Manage EDIFACT transmissions
827
            Manage EDIFACT transmissions
828
        </span>
828
        </span>
829
        <span class="permissioncode">([% name | html %])</span>
829
        <span class="permissioncode">([% name | html %])</span>
830
    [%- CASE 'marc_order_manage' -%]
831
        <span class="sub_permission marc_order_manage_subpermission">
832
            Manage MARC ordering
833
        </span>
834
        <span class="permissioncode">([% name | html %])</span>
830
    [%- CASE 'reopen_closed_invoices' -%]
835
    [%- CASE 'reopen_closed_invoices' -%]
831
        <span class="sub_permission reopen_closed_invoices_subpermission">
836
        <span class="sub_permission reopen_closed_invoices_subpermission">
832
            Reopen closed invoices
837
            Reopen closed invoices
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-1 / +1 lines)
Lines 246-252 Link Here
246
                        <dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>
246
                        <dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>
247
                        <dd>Manage library EDI EANs</dd>
247
                        <dd>Manage library EDI EANs</dd>
248
                    [% END %]
248
                    [% END %]
249
                    [% IF Koha.Preference('MarcOrderingAutomation') %]
249
                    [% IF ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
250
                        <dt><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></dt>
250
                        <dt><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></dt>
251
                        <dd>Manage vendor accounts for automated order line creation from marc records</dd>
251
                        <dd>Manage vendor accounts for automated order line creation from marc records</dd>
252
                    [% END %]
252
                    [% END %]
(-)a/t/Koha/Auth/Permissions.t (-1 / +1 lines)
Lines 115-120 subtest 'superlibrarian tests' => sub { Link Here
115
        'CAN_user_acquisition_group_manage'                         => 1,
115
        'CAN_user_acquisition_group_manage'                         => 1,
116
        'CAN_user_acquisition_issue_manage'                         => 1,
116
        'CAN_user_acquisition_issue_manage'                         => 1,
117
        'CAN_user_acquisition_merge_invoices'                       => 1,
117
        'CAN_user_acquisition_merge_invoices'                       => 1,
118
        'CAN_user_acquisition_marc_order_manage'                    => 1,
118
        'CAN_user_acquisition_order_manage_all'                     => 1,
119
        'CAN_user_acquisition_order_manage_all'                     => 1,
119
        'CAN_user_acquisition_order_manage'                         => 1,
120
        'CAN_user_acquisition_order_manage'                         => 1,
120
        'CAN_user_acquisition_order_receive'                        => 1,
121
        'CAN_user_acquisition_order_receive'                        => 1,
121
- 

Return to bug 34355