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

(-)a/installer/data/mysql/de-DE/mandatory/userpermissions.sql (+2 lines)
Lines 11-16 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
11
   ( 9, 'edit_catalogue', 'Katalogdaten bearbeiten (Titel- und Exemplardaten ändern)'),
11
   ( 9, 'edit_catalogue', 'Katalogdaten bearbeiten (Titel- und Exemplardaten ändern)'),
12
   ( 9, 'fast_cataloging', 'Schnellaufnahmen anlegen'),
12
   ( 9, 'fast_cataloging', 'Schnellaufnahmen anlegen'),
13
   ( 9, 'edit_items', 'Exemplare bearbeiten'),
13
   ( 9, 'edit_items', 'Exemplare bearbeiten'),
14
   (10, 'writeoff', 'Write off charges'),
15
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
14
   (11, 'vendors_manage', 'Lieferanten verwalten'),
16
   (11, 'vendors_manage', 'Lieferanten verwalten'),
15
   (11, 'contracts_manage', 'Vereinbarungen verwalten'),
17
   (11, 'contracts_manage', 'Vereinbarungen verwalten'),
16
   (11, 'period_manage', 'Etats verwalten'),
18
   (11, 'period_manage', 'Etats verwalten'),
(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (+2 lines)
Lines 11-16 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
11
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
11
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
12
   ( 9, 'fast_cataloging', 'Fast cataloging'),
12
   ( 9, 'fast_cataloging', 'Fast cataloging'),
13
   ( 9, 'edit_items', 'Edit Items'),
13
   ( 9, 'edit_items', 'Edit Items'),
14
   (10, 'writeoff', 'Write off charges'),
15
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
14
   (11, 'vendors_manage', 'Manage vendors'),
16
   (11, 'vendors_manage', 'Manage vendors'),
15
   (11, 'contracts_manage', 'Manage contracts'),
17
   (11, 'contracts_manage', 'Manage contracts'),
16
   (11, 'period_manage', 'Manage periods'),
18
   (11, 'period_manage', 'Manage periods'),
(-)a/installer/data/mysql/es-ES/mandatory/userpermissions.sql (+2 lines)
Lines 11-16 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
11
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
11
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
12
   ( 9, 'fast_cataloging', 'Fast cataloging'),
12
   ( 9, 'fast_cataloging', 'Fast cataloging'),
13
   ( 9, 'edit_items', 'Edit Items'),
13
   ( 9, 'edit_items', 'Edit Items'),
14
   (10, 'writeoff', 'Write off charges'),
15
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
14
   (11, 'vendors_manage', 'Manage vendors'),
16
   (11, 'vendors_manage', 'Manage vendors'),
15
   (11, 'contracts_manage', 'Manage contracts'),
17
   (11, 'contracts_manage', 'Manage contracts'),
16
   (11, 'period_manage', 'Manage periods'),
18
   (11, 'period_manage', 'Manage periods'),
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql (+2 lines)
Lines 11-16 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
11
   ( 9, 'edit_catalogue', 'Ajouter et modifier des notices au catalogue'),
11
   ( 9, 'edit_catalogue', 'Ajouter et modifier des notices au catalogue'),
12
   ( 9, 'fast_cataloging', 'Catalogage rapide'),
12
   ( 9, 'fast_cataloging', 'Catalogage rapide'),
13
   ( 9, 'edit_items', 'Modifier des exemplaires'),
13
   ( 9, 'edit_items', 'Modifier des exemplaires'),
14
   (10, 'writeoff', 'Write off charges'),
15
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
14
   (13, 'edit_news', 'Ecrire des nouvelles pour l''OPAC et l''interface professionnelle'),
16
   (13, 'edit_news', 'Ecrire des nouvelles pour l''OPAC et l''interface professionnelle'),
15
   (13, 'label_creator', 'Créer des étiquettes à partir des données du catalogues et des adhérents'),
17
   (13, 'label_creator', 'Créer des étiquettes à partir des données du catalogues et des adhérents'),
16
   (13, 'edit_calendar', 'Définir les jours de fermeture de la bibliothèque'),
18
   (13, 'edit_calendar', 'Définir les jours de fermeture de la bibliothèque'),
(-)a/installer/data/mysql/it-IT/necessari/userpermissions.sql (+2 lines)
Lines 13-18 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
13
   ( 9, 'edit_catalogue', 'Cataloga (crea/modifica dati bibliografici e di copia)'),
13
   ( 9, 'edit_catalogue', 'Cataloga (crea/modifica dati bibliografici e di copia)'),
14
   ( 9, 'fast_cataloging', 'Catalogazione veloce'),
14
   ( 9, 'fast_cataloging', 'Catalogazione veloce'),
15
   ( 9, 'edit_items', 'Crea/modifica copie'),
15
   ( 9, 'edit_items', 'Crea/modifica copie'),
16
   (10, 'writeoff', 'Write off charges'),
17
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
16
   (11, 'vendors_manage', 'Crea/modifica fornitori'),
18
   (11, 'vendors_manage', 'Crea/modifica fornitori'),
17
   (11, 'contracts_manage', 'Crea/modifica contratti'),
19
   (11, 'contracts_manage', 'Crea/modifica contratti'),
18
   (11, 'period_manage', 'Gestisci scadenze budgets'),
20
   (11, 'period_manage', 'Gestisci scadenze budgets'),
(-)a/installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql (+2 lines)
Lines 31-36 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
31
   ( 9, 'edit_catalogue', 'Endre katalogen (Endre bibliografiske poster og eksemplaropplysninger)'),
31
   ( 9, 'edit_catalogue', 'Endre katalogen (Endre bibliografiske poster og eksemplaropplysninger)'),
32
   ( 9, 'fast_cataloging', 'Hurtigkatalogisering'),
32
   ( 9, 'fast_cataloging', 'Hurtigkatalogisering'),
33
   ( 9, 'edit_items', 'Endre eksmeplarer'),
33
   ( 9, 'edit_items', 'Endre eksmeplarer'),
34
   (10, 'writeoff', 'Write off charges'),
35
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
34
   (11, 'vendors_manage', 'Administrere leverandører'),
36
   (11, 'vendors_manage', 'Administrere leverandører'),
35
   (11, 'contracts_manage', 'Administrere kontrakter'),
37
   (11, 'contracts_manage', 'Administrere kontrakter'),
36
   (11, 'period_manage', 'Administrere perioder'),
38
   (11, 'period_manage', 'Administrere perioder'),
(-)a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql (+2 lines)
Lines 11-16 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
11
   ( 9, 'edit_catalogue', 'Edit catalogue'),
11
   ( 9, 'edit_catalogue', 'Edit catalogue'),
12
   ( 9, 'fast_cataloging', 'Szybkie katalogowanie'),
12
   ( 9, 'fast_cataloging', 'Szybkie katalogowanie'),
13
   ( 9, 'edit_items', 'Edit Items'),
13
   ( 9, 'edit_items', 'Edit Items'),
14
   (10, 'writeoff', 'Write off charges'),
15
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
14
   (11, 'vendors_manage', 'Zarządzanei dostawcami'),
16
   (11, 'vendors_manage', 'Zarządzanei dostawcami'),
15
   (11, 'contracts_manage', 'Zarządzanie kontraktami'),
17
   (11, 'contracts_manage', 'Zarządzanie kontraktami'),
16
   (11, 'period_manage', 'Manage periods'),
18
   (11, 'period_manage', 'Manage periods'),
(-)a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql (+2 lines)
Lines 37-42 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
37
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
37
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
38
   ( 9, 'fast_cataloging', 'Fast cataloging'),
38
   ( 9, 'fast_cataloging', 'Fast cataloging'),
39
   ( 9, 'edit_items', 'Edit Items'),
39
   ( 9, 'edit_items', 'Edit Items'),
40
   (10, 'writeoff', 'Write off charges'),
41
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
40
   (11, 'vendors_manage', 'Manage vendors'),
42
   (11, 'vendors_manage', 'Manage vendors'),
41
   (11, 'contracts_manage', 'Manage contracts'),
43
   (11, 'contracts_manage', 'Manage contracts'),
42
   (11, 'period_manage', 'Manage periods'),
44
   (11, 'period_manage', 'Manage periods'),
(-)a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql (+2 lines)
Lines 37-42 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
37
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
37
   ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'),
38
   ( 9, 'fast_cataloging', 'Fast cataloging'),
38
   ( 9, 'fast_cataloging', 'Fast cataloging'),
39
   ( 9, 'edit_items', 'Edit Items'),
39
   ( 9, 'edit_items', 'Edit Items'),
40
   (10, 'writeoff', 'Write off charges'),
41
   (10, 'remaining_permissions', 'Remaining updatecharges permissions'),
40
   (11, 'vendors_manage', 'Manage vendors'),
42
   (11, 'vendors_manage', 'Manage vendors'),
41
   (11, 'contracts_manage', 'Manage contracts'),
43
   (11, 'contracts_manage', 'Manage contracts'),
42
   (11, 'period_manage', 'Manage periods'),
44
   (11, 'period_manage', 'Manage periods'),
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 8129-8134 if(CheckVersion($DBversion)) { Link Here
8129
    SetVersion($DBversion);
8129
    SetVersion($DBversion);
8130
}
8130
}
8131
8131
8132
$DBversion = "3.15.00.XXX";
8133
if ( CheckVersion($DBversion) ) {
8134
   $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES ('10', 'writeoff', 'Write off charges')");
8135
   $dbh->do("INSERT INTO permissions (module_bit, code, description) VALUES ('10', 'remaining_permissions', 'Remaining updatecharges permissions')");
8136
   print "Upgrade to $DBversion done (Bug 9448 - Add separate permission for writing off fees)\n";
8137
   SetVersion ($DBversion);
8138
}
8139
8132
=head1 FUNCTIONS
8140
=head1 FUNCTIONS
8133
8141
8134
=head2 TableExists($table)
8142
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-2 / +2 lines)
Lines 100-106 function enableCheckboxActions(){ Link Here
100
    <td>
100
    <td>
101
    [% IF ( line.amountoutstanding > 0 ) %]
101
    [% IF ( line.amountoutstanding > 0 ) %]
102
        <input type="submit" name="pay_indiv_[% line.accountno %]" value="Pay" />
102
        <input type="submit" name="pay_indiv_[% line.accountno %]" value="Pay" />
103
        <input type="submit" name="wo_indiv_[% line.accountno %]" value="Write off" />
103
        [% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="wo_indiv_[% line.accountno %]" value="Write off" />[% END %]
104
    [% END %]
104
    [% END %]
105
    <input type="hidden" name="itemnumber[% line.accountno %]" value="[% line.itemnumber %]" />
105
    <input type="hidden" name="itemnumber[% line.accountno %]" value="[% line.itemnumber %]" />
106
    <input type="hidden" name="description[% line.accountno %]" value="[% line.description %]" />
106
    <input type="hidden" name="description[% line.accountno %]" value="[% line.description %]" />
Lines 148-154 function enableCheckboxActions(){ Link Here
148
</table>
148
</table>
149
<fieldset class="action">
149
<fieldset class="action">
150
<input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
150
<input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
151
<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />
151
[% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />[% END %]
152
<input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
152
<input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
153
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
153
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
154
</fieldset>
154
</fieldset>
(-)a/members/boraccount.pl (-1 / +1 lines)
Lines 42-48 my ($template, $loggedinuser, $cookie) Link Here
42
                            query => $input,
42
                            query => $input,
43
                            type => "intranet",
43
                            type => "intranet",
44
                            authnotrequired => 0,
44
                            authnotrequired => 0,
45
                            flagsrequired => {borrowers => 1, updatecharges => 1},
45
                            flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
46
                            debug => 1,
46
                            debug => 1,
47
                            });
47
                            });
48
48
(-)a/members/mancredit.pl (-1 / +1 lines)
Lines 65-71 if ($add){ Link Here
65
					  query => $input,
65
					  query => $input,
66
					  type => "intranet",
66
					  type => "intranet",
67
					  authnotrequired => 0,
67
					  authnotrequired => 0,
68
                      flagsrequired => $flagsrequired,
68
                      flagsrequired => { borrowers => 1, updatecharges => 'remaining_permissions' },
69
					  debug => 1,
69
					  debug => 1,
70
					  });
70
					  });
71
					  
71
					  
(-)a/members/maninvoice.pl (-1 / +1 lines)
Lines 83-89 if ($add){ Link Here
83
					query => $input,
83
					query => $input,
84
					type => "intranet",
84
					type => "intranet",
85
					authnotrequired => 0,
85
					authnotrequired => 0,
86
					flagsrequired => {borrowers => 1, updatecharges => 1},
86
                                      flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
87
					debug => 1,
87
					debug => 1,
88
					});
88
					});
89
					
89
					
(-)a/members/pay.pl (-1 / +2 lines)
Lines 44-55 use C4::Members::Attributes qw(GetBorrowerAttributes); Link Here
44
44
45
our $input = CGI->new;
45
our $input = CGI->new;
46
46
47
my $updatecharges_permissions = $input->param('woall') ? 'writeoff' : 'remaining_permissions';
47
our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
48
our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
48
    {   template_name   => 'members/pay.tmpl',
49
    {   template_name   => 'members/pay.tmpl',
49
        query           => $input,
50
        query           => $input,
50
        type            => 'intranet',
51
        type            => 'intranet',
51
        authnotrequired => 0,
52
        authnotrequired => 0,
52
        flagsrequired   => { borrowers => 1, updatecharges => 1 },
53
        flagsrequired   => { borrowers => 1, updatecharges => $updatecharges_permissions },
53
        debug           => 1,
54
        debug           => 1,
54
    }
55
    }
55
);
56
);
(-)a/members/paycollect.pl (-1 / +2 lines)
Lines 31-42 use C4::Branch; Link Here
31
31
32
my $input = CGI->new();
32
my $input = CGI->new();
33
33
34
my $updatecharges_permissions = $input->param('writeoff_individual') ? 'writeoff' : 'remaining_permissions';
34
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
35
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
35
    {   template_name   => 'members/paycollect.tmpl',
36
    {   template_name   => 'members/paycollect.tmpl',
36
        query           => $input,
37
        query           => $input,
37
        type            => 'intranet',
38
        type            => 'intranet',
38
        authnotrequired => 0,
39
        authnotrequired => 0,
39
        flagsrequired   => { borrowers => 1, updatecharges => 1 },
40
        flagsrequired   => { borrowers => 1, updatecharges => $updatecharges_permissions },
40
        debug           => 1,
41
        debug           => 1,
41
    }
42
    }
42
);
43
);
(-)a/members/printfeercpt.pl (-1 / +1 lines)
Lines 41-47 my ($template, $loggedinuser, $cookie) Link Here
41
                            query => $input,
41
                            query => $input,
42
                            type => "intranet",
42
                            type => "intranet",
43
                            authnotrequired => 0,
43
                            authnotrequired => 0,
44
                            flagsrequired => {borrowers => 1, updatecharges => 1},
44
                            flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
45
                            debug => 1,
45
                            debug => 1,
46
                            });
46
                            });
47
47
(-)a/members/printinvoice.pl (-2 / +1 lines)
Lines 38-44 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
38
        query           => $input,
38
        query           => $input,
39
        type            => "intranet",
39
        type            => "intranet",
40
        authnotrequired => 0,
40
        authnotrequired => 0,
41
        flagsrequired   => { borrowers => 1, updatecharges => 1 },
41
        flagsrequired => { borrowers => 1, updatecharges => 'remaining_permissions' },
42
        debug           => 1,
42
        debug           => 1,
43
    }
43
    }
44
);
44
);
45
- 

Return to bug 9448