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

(-)a/admin/smart-rules.pl (+2 lines)
Lines 586-591 my @sorted_branch_item_rules = sort { lc $a->{translated_description} cmp lc $b- Link Here
586
foreach my $entry (@sorted_branch_item_rules) {
586
foreach my $entry (@sorted_branch_item_rules) {
587
    $entry->{holdallowed_any}  = 1 if ( $entry->{holdallowed} == 2 );
587
    $entry->{holdallowed_any}  = 1 if ( $entry->{holdallowed} == 2 );
588
    $entry->{holdallowed_same} = 1 if ( $entry->{holdallowed} == 1 );
588
    $entry->{holdallowed_same} = 1 if ( $entry->{holdallowed} == 1 );
589
    $entry->{holdallowed_group} = 1 if ( $entry->{holdallowed} == 3 );
589
}
590
}
590
591
591
$template->param(show_branch_cat_rule_form => 1);
592
$template->param(show_branch_cat_rule_form => 1);
Lines 613-618 if ($defaults) { Link Here
613
    $template->param( default_holdallowed_none => 1 ) if ( $defaults->{holdallowed} == 0 );
614
    $template->param( default_holdallowed_none => 1 ) if ( $defaults->{holdallowed} == 0 );
614
    $template->param( default_holdallowed_same => 1 ) if ( $defaults->{holdallowed} == 1 );
615
    $template->param( default_holdallowed_same => 1 ) if ( $defaults->{holdallowed} == 1 );
615
    $template->param( default_holdallowed_any  => 1 ) if ( $defaults->{holdallowed} == 2 );
616
    $template->param( default_holdallowed_any  => 1 ) if ( $defaults->{holdallowed} == 2 );
617
    $template->param( default_holdallowed_group  => 1 ) if ( $defaults->{holdallowed} == 3 );
616
    $template->param( default_hold_fulfillment_policy => $defaults->{hold_fulfillment_policy} );
618
    $template->param( default_hold_fulfillment_policy => $defaults->{hold_fulfillment_policy} );
617
    $template->param( default_maxissueqty      => $defaults->{maxissueqty} );
619
    $template->param( default_maxissueqty      => $defaults->{maxissueqty} );
618
    $template->param( default_maxonsiteissueqty => $defaults->{maxonsiteissueqty} );
620
    $template->param( default_maxonsiteissueqty => $defaults->{maxonsiteissueqty} );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-7 / +33 lines)
Lines 430-435 Link Here
430
                            [% END %]
430
                            [% END %]
431
                                From any library
431
                                From any library
432
                            </option>
432
                            </option>
433
                            [% IF ( default_holdallowed_group ) %]
434
                            <option value="3" selected="selected">
435
                            [% ELSE %]
436
                            <option value="3">
437
                            [% END %]
438
                                From local hold group
439
                            </option>
433
                            [% IF ( default_holdallowed_same ) %]
440
                            [% IF ( default_holdallowed_same ) %]
434
                            <option value="1" selected="selected">
441
                            <option value="1" selected="selected">
435
                            [% ELSE %]
442
                            [% ELSE %]
Lines 458-463 Link Here
458
                                </option>
465
                                </option>
459
                            [% END %]
466
                            [% END %]
460
467
468
                            [% IF default_hold_fulfillment_policy == 'holdgroup' %]
469
                                <option value="holdgroup" selected="selected">
470
                                    item's hold group
471
                                </option>
472
                            [% ELSE %]
473
                                <option value="holdgroup">
474
                                    item's hold group
475
                                </option>
476
                            [% END %]
477
461
                            [% IF default_hold_fulfillment_policy == 'homebranch' %]
478
                            [% IF default_hold_fulfillment_policy == 'homebranch' %]
462
                                <option value="homebranch" selected="selected">
479
                                <option value="homebranch" selected="selected">
463
                                    item's home library
480
                                    item's home library
Lines 514-520 Link Here
514
    </div>
531
    </div>
515
    [% IF ( show_branch_cat_rule_form ) %]
532
    [% IF ( show_branch_cat_rule_form ) %]
516
    <div id="holds-policy-by-patron-category" class="container">
533
    <div id="holds-policy-by-patron-category" class="container">
517
    <h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3>
534
        <h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3>
518
        <p>For this library, you can specify the maximum number of loans that
535
        <p>For this library, you can specify the maximum number of loans that
519
            a patron of a given category can make, regardless of the item type.
536
            a patron of a given category can make, regardless of the item type.
520
        </p>
537
        </p>
Lines 593-603 Link Here
593
    [% END %]
610
    [% END %]
594
611
595
    <div id="refund-lost-item-fee-on-return" class="container">
612
    <div id="refund-lost-item-fee-on-return" class="container">
596
  [% IF current_branch == '*' %]
613
        [% IF current_branch == '*' %]
597
    <h3>Default lost item fee refund on return policy</h3>
614
            <h3>Default lost item fee refund on return policy</h3>
598
  [% ELSE %]
615
        [% ELSE %]
599
    <h3>Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %]</h3>
616
            <h3>Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %]</h3>
600
  [% END %]
617
        [% END %]
601
        <p>Specify the default policy for lost item fees on return.
618
        <p>Specify the default policy for lost item fees on return.
602
        </p>
619
        </p>
603
        <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
620
        <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
Lines 683-688 Link Here
683
        </p>
700
        </p>
684
        <ul>
701
        <ul>
685
            <li><strong>From any library:</strong> Patrons from any library may put this item on hold. <cite>(default if none is defined)</cite></li>
702
            <li><strong>From any library:</strong> Patrons from any library may put this item on hold. <cite>(default if none is defined)</cite></li>
703
            <li><strong>From local hold group:</strong> Only patrons from libraries in the same item's home library hold groups may put this book on hold.</li>
686
            <li><strong>From home library:</strong> Only patrons from the item's home library may put this book on hold.</li>
704
            <li><strong>From home library:</strong> Only patrons from the item's home library may put this book on hold.</li>
687
            <li><strong>No holds allowed:</strong> No patron may put this book on hold.</li>
705
            <li><strong>No holds allowed:</strong> No patron may put this book on hold.</li>
688
        </ul>
706
        </ul>
Lines 715-720 Link Here
715
                        </td>
733
                        </td>
716
                        <td>[% IF ( branch_item_rule_loo.holdallowed_any ) %]
734
                        <td>[% IF ( branch_item_rule_loo.holdallowed_any ) %]
717
                                <span>From any library</span>
735
                                <span>From any library</span>
736
                            [% ELSIF ( branch_item_rule_loo.holdallowed_group ) %]
737
                                <span>From local hold group</span>
718
                            [% ELSIF ( branch_item_rule_loo.holdallowed_same ) %]
738
                            [% ELSIF ( branch_item_rule_loo.holdallowed_same ) %]
719
                                <span>From home library</span>
739
                                <span>From home library</span>
720
                            [% ELSE %]
740
                            [% ELSE %]
Lines 723-728 Link Here
723
                        </td>
743
                        </td>
724
                        <td>[% IF ( branch_item_rule_loo.hold_fulfillment_policy == 'any' ) %]
744
                        <td>[% IF ( branch_item_rule_loo.hold_fulfillment_policy == 'any' ) %]
725
                                <span>any library</span>
745
                                <span>any library</span>
746
                            [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'holdgroup' ) %]
747
                                <span>item's hold group</span>
726
                            [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'homebranch' ) %]
748
                            [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'homebranch' ) %]
727
                                <span>item's home library</span>
749
                                <span>item's home library</span>
728
                            [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'holdingbranch' ) %]
750
                            [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'holdingbranch' ) %]
Lines 755-760 Link Here
755
                    <td>
777
                    <td>
756
                        <select name="holdallowed">
778
                        <select name="holdallowed">
757
                            <option value="2">From any library</option>
779
                            <option value="2">From any library</option>
780
                            <option value="3">From local hold group</option>
758
                            <option value="1">From home library</option>
781
                            <option value="1">From home library</option>
759
                            <option value="0">No holds allowed</option>
782
                            <option value="0">No holds allowed</option>
760
                        </select>
783
                        </select>
Lines 765-770 Link Here
765
                                any library
788
                                any library
766
                            </option>
789
                            </option>
767
790
791
                            <option value="holdgroup">
792
                                item's hold group
793
                            </option>
794
768
                            <option value="homebranch">
795
                            <option value="homebranch">
769
                                item's home library
796
                                item's home library
770
                            </option>
797
                            </option>
771
- 

Return to bug 22284