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

(-)a/admin/columns_settings.yml (+75 lines)
Lines 157-162 modules: Link Here
157
          cannot_be_toggled: 1
157
          cannot_be_toggled: 1
158
          cannot_be_modified: 1
158
          cannot_be_modified: 1
159
159
160
    circulationrules:
161
      circulation-rules:
162
        -
163
          columnname: patron_category
164
          cannot_be_toggled: 1
165
          cannot_be_modified: 1
166
        -
167
          columnname: item_type
168
          cannot_be_toggled: 1
169
          cannot_be_modified: 1
170
        -
171
          columnname: actions
172
          cannot_be_toggled: 1
173
          cannot_be_modified: 1
174
        -
175
          columnname: note
176
        -
177
          columnname: current_checkouts_allowed
178
        -
179
          columnname: current_on-site_checkouts_allowed
180
        -
181
          columnname: loan_period
182
        -
183
          columnname: unit
184
        -
185
          columnname: hard_due_date
186
        -
187
          columnname: fine_amount
188
        -
189
          columnname: fine_charging_interval
190
        -
191
          columnname: when_to_charge
192
        -
193
          columnname: fine_grace_period
194
        -
195
          columnname: overdue_fines_cap
196
        -
197
          columnname: cap_fine_at_replacement_price
198
        -
199
          columnname: suspension_in_days
200
        -
201
          columnname: max._suspension_duration
202
        -
203
          columnname: suspension_charging_interval
204
        -
205
          columnname: renewals_allowed
206
        -
207
          columnname: renewal_period
208
        -
209
          columnname: no_renewal_before
210
        -
211
          columnname: automatic_renewal
212
        -
213
          columnname: no_automatic_renewal_after
214
        -
215
          columnname: no_automatic_renewal_after_hard_limit
216
        -
217
          columnname: holds_allowed_total
218
        -
219
          columnname: holds_allowed_daily
220
        -
221
          columnname: holds_per_record_count
222
        -
223
          columnname: on_shelf_holds_allowed
224
        -
225
          columnname: item_level_holds
226
        -
227
          columnname: article_requests
228
        -
229
          columnname: rental_discount
230
        -
231
          columnname: actions
232
          cannot_be_toggled: 1
233
          cannot_be_modified: 1
234
160
    libraries:
235
    libraries:
161
      libraries:
236
      libraries:
162
        -
237
        -
(-)a/admin/smart-rules.pl (-2 / +2 lines)
Lines 148-154 elsif ($op eq 'add') { Link Here
148
    my $suspension_chargeperiod = $input->param('suspension_chargeperiod') || 1;
148
    my $suspension_chargeperiod = $input->param('suspension_chargeperiod') || 1;
149
    my $firstremind  = $input->param('firstremind');
149
    my $firstremind  = $input->param('firstremind');
150
    my $chargeperiod = $input->param('chargeperiod');
150
    my $chargeperiod = $input->param('chargeperiod');
151
    my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at');
151
    my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at') || 0;
152
    my $maxissueqty  = $input->param('maxissueqty');
152
    my $maxissueqty  = $input->param('maxissueqty');
153
    my $maxonsiteissueqty  = $input->param('maxonsiteissueqty');
153
    my $maxonsiteissueqty  = $input->param('maxonsiteissueqty');
154
    my $renewalsallowed  = $input->param('renewalsallowed');
154
    my $renewalsallowed  = $input->param('renewalsallowed');
Lines 177-183 elsif ($op eq 'add') { Link Here
177
    my $hardduedate = $input->param('hardduedate') || undef;
177
    my $hardduedate = $input->param('hardduedate') || undef;
178
    $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );
178
    $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );
179
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
179
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
180
    my $hardduedatecompare = $input->param('hardduedatecompare');
180
    my $hardduedatecompare = $input->param('hardduedatecompare') || -1;
181
    my $rentaldiscount = $input->param('rentaldiscount');
181
    my $rentaldiscount = $input->param('rentaldiscount');
182
    my $opacitemholds = $input->param('opacitemholds') || 0;
182
    my $opacitemholds = $input->param('opacitemholds') || 0;
183
    my $article_requests = $input->param('article_requests') || 'no';
183
    my $article_requests = $input->param('article_requests') || 'no';
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-6 / +16 lines)
Lines 4-9 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE Categories %]
5
[% USE Categories %]
6
[% USE CirculationRules %]
6
[% USE CirculationRules %]
7
[% USE ColumnsSettings %]
7
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
8
9
9
[% SET branchcode = humanbranch %]
10
[% SET branchcode = humanbranch %]
Lines 351-356 Link Here
351
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
352
                        <button name="cancel" class="clear_edit btn btn-default btn-xs"><i class="fa fa-undo"></i> Clear</button>
352
                    </td>
353
                    </td>
353
                </tr>
354
                </tr>
355
                </tbody>
354
                <tfoot>
356
                <tfoot>
355
                    <tr>
357
                    <tr>
356
                      <th>Patron category</th>
358
                      <th>Patron category</th>
Lines 387-393 Link Here
387
                      <th>&nbsp;</th>
389
                      <th>&nbsp;</th>
388
                    </tr>
390
                    </tr>
389
                  </tfoot>
391
                  </tfoot>
390
                </tbody>
391
            </table>
392
            </table>
392
        </form>
393
        </form>
393
    </div>
394
    </div>
Lines 586-592 Link Here
586
                    <td><input name="patron_maxissueqty" size="3" type="text" /></td>
587
                    <td><input name="patron_maxissueqty" size="3" type="text" /></td>
587
                    <td><input name="patron_maxonsiteissueqty" size="3" type="text" /></td>
588
                    <td><input name="patron_maxonsiteissueqty" size="3" type="text" /></td>
588
                    <td><input name="max_holds" size="3" type="text" /></td>
589
                    <td><input name="max_holds" size="3" type="text" /></td>
589
                    <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</td>
590
                    <td class="actions"><button type="submit" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add</button></td>
590
                </tr>
591
                </tr>
591
            </table>
592
            </table>
592
        </form>
593
        </form>
Lines 612-618 Link Here
612
                <tr>
613
                <tr>
613
                    <td>
614
                    <td>
614
                        <select name="refund">
615
                        <select name="refund">
615
                          [#% Default branch %#]
616
                          [% # Default branch %]
616
                          [% IF ( current_branch == '*' ) %]
617
                          [% IF ( current_branch == '*' ) %]
617
                            [% IF ( ( not refundLostItemFeeRule.refund.defined ) || refundLostItemFeeRule.refund ) %]
618
                            [% IF ( ( not refundLostItemFeeRule.refund.defined ) || refundLostItemFeeRule.refund ) %]
618
                            <option value="1" selected="selected">
619
                            <option value="1" selected="selected">
Lines 666-672 Link Here
666
                    <td class="actions">
667
                    <td class="actions">
667
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
668
                        <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
668
                    </td>
669
                    </td>
669
                    </td>
670
                </tr>
670
                </tr>
671
            </table>
671
            </table>
672
        </form>
672
        </form>
Lines 687-693 Link Here
687
            <li><strong>From home library:</strong> Only patrons from the item's home library may put this book on hold.</li>
687
            <li><strong>From home library:</strong> Only patrons from the item's home library may put this book on hold.</li>
688
            <li><strong>No holds allowed:</strong> No patron may put this book on hold.</li>
688
            <li><strong>No holds allowed:</strong> No patron may put this book on hold.</li>
689
        </ul>
689
        </ul>
690
        <p><strong>Note: </strong>If the system preference 'AllowHoldPolicyOverride' is enabled, these policies can be overridden by your circulation staff.</br />
690
        <p><strong>Note: </strong>If the system preference 'AllowHoldPolicyOverride' is enabled, these policies can be overridden by your circulation staff.<br />
691
            <strong>Important: </strong>The policies are applied based on the ReservesControlBranch system preference which is set to <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReservesControlBranch">[% Koha.Preference('ReservesControlBranch') | html %]</a>.
691
            <strong>Important: </strong>The policies are applied based on the ReservesControlBranch system preference which is set to <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=ReservesControlBranch">[% Koha.Preference('ReservesControlBranch') | html %]</a>.
692
        </p>
692
        </p>
693
693
Lines 800-805 Link Here
800
[% MACRO jsinclude BLOCK %]
800
[% MACRO jsinclude BLOCK %]
801
    [% Asset.js("js/admin-menu.js") | $raw %]
801
    [% Asset.js("js/admin-menu.js") | $raw %]
802
    [% INCLUDE 'calendar.inc' %]
802
    [% INCLUDE 'calendar.inc' %]
803
    [% INCLUDE 'datatables.inc' %]
804
    [% INCLUDE 'columns_settings.inc' %]
803
    <script>
805
    <script>
804
806
805
        function clear_edit(){
807
        function clear_edit(){
Lines 925-931 Link Here
925
                e.preventDefault();
927
                e.preventDefault();
926
                clear_edit();
928
                clear_edit();
927
            });
929
            });
930
931
            var columns_settings = [% ColumnsSettings.GetColumns('admin', 'circulationrules', 'circulation-rules', 'json') %];
932
            var table = KohaTable("default-circulation-rules", {
933
                "autoWidth": false,
934
                "dom": '<"top pager"<"table_entries"lp><"table_controls"fB>>t',
935
                "ordering": false,
936
                "paging": false,
937
            }, columns_settings);
928
        });
938
        });
939
929
    </script>
940
    </script>
930
[% END %]
941
[% END %]
931
[% INCLUDE 'intranet-bottom.inc' %]
942
[% INCLUDE 'intranet-bottom.inc' %]
932
- 

Return to bug 15726