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

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

Return to bug 22284