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

(-)a/Koha/Template/Plugin/Koha.pm (+1 lines)
Lines 51-56 sub Version { Link Here
51
51
52
    return {
52
    return {
53
        major       => $major,
53
        major       => $major,
54
        minor       => $minor,
54
        release     => $major . "." . $minor,
55
        release     => $major . "." . $minor,
55
        maintenance => $major . "." . $minor . "." . $maintenance,
56
        maintenance => $major . "." . $minor . "." . $maintenance,
56
        development => ( $development ne '000' ) ? $development : undef,
57
        development => ( $development ne '000' ) ? $development : undef,
(-)a/admin/preferences.pl (+9 lines)
Lines 186-191 sub TransformPrefsToHTML { Link Here
186
                        push @chunks, $piece;
186
                        push @chunks, $piece;
187
                    }
187
                    }
188
                } else {
188
                } else {
189
                    if ( $piece ) {
190
                        my $version = Koha::version();
191
                        my ( $major, $minor, $maintenance, $development ) = split( '\.', $version );
192
                        if ( $minor % 2 ) {
193
                            $piece =~ s|__VERSION__|${major}_${minor}|g;
194
                        } else {
195
                            $piece =~ s|__VERSION__|master|g;
196
                        }
197
                    }
189
                    push @chunks, { type_text => 1, contents => $piece };
198
                    push @chunks, { type_text => 1, contents => $piece };
190
                }
199
                }
191
            }
200
            }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-1 / +1 lines)
Lines 9-15 Acquisitions: Link Here
9
                  receiving: receiving an order.
9
                  receiving: receiving an order.
10
                  cataloguing: cataloging the record.
10
                  cataloguing: cataloging the record.
11
        -
11
        -
12
            - "The following <a href='http://schema.koha-community.org/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
12
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
13
            - pref: UniqueItemFields
13
            - pref: UniqueItemFields
14
            - (separated by a space)
14
            - (separated by a space)
15
        -
15
        -
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-3 / +3 lines)
Lines 728-744 OPAC: Link Here
728
              class: integer
728
              class: integer
729
            - "days."
729
            - "days."
730
        -
730
        -
731
            - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
731
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
732
            - pref: PatronSelfRegistrationBorrowerMandatoryField
732
            - pref: PatronSelfRegistrationBorrowerMandatoryField
733
              class: multi
733
              class: multi
734
            - (separate columns with |)
734
            - (separate columns with |)
735
        -
735
        -
736
            - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
736
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
737
            - pref: PatronSelfRegistrationBorrowerUnwantedField
737
            - pref: PatronSelfRegistrationBorrowerUnwantedField
738
              class: multi
738
              class: multi
739
            - (separate columns with |)
739
            - (separate columns with |)
740
        -
740
        -
741
            - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
741
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
742
            - pref: PatronSelfModificationBorrowerUnwantedField
742
            - pref: PatronSelfModificationBorrowerUnwantedField
743
              class: multi
743
              class: multi
744
            - (separate columns with |)
744
            - (separate columns with |)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-3 / +2 lines)
Lines 24-35 Patrons: Link Here
24
               no: "Don't"
24
               no: "Don't"
25
         - default the card number field on the patron addition screen to the next available card number (for example, if the largest currently used card number is 26345000012941, then this field will default to 26345000012942).
25
         - default the card number field on the patron addition screen to the next available card number (for example, if the largest currently used card number is 26345000012941, then this field will default to 26345000012942).
26
     -
26
     -
27
         - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
27
         - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
28
         - pref: BorrowerMandatoryField
28
         - pref: BorrowerMandatoryField
29
           class: multi
29
           class: multi
30
         - (separate columns with |)
30
         - (separate columns with |)
31
     -
31
     -
32
         - "The following <a href='http://schema.koha-community.org/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
32
         - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
33
         - pref: BorrowerUnwantedField
33
         - pref: BorrowerUnwantedField
34
           class: multi
34
           class: multi
35
         - (separate columns with |)
35
         - (separate columns with |)
36
- 

Return to bug 18026