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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (+4 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 
<<<<<<< Updated upstream
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 
            - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
14 
=======
15 
            - "The following <a href='http://schema.koha-community.org/master/tables/items.html' target='blank'>database columns</a> should be unique in an item:"
16 
>>>>>>> Stashed changes
13 
            - pref: UniqueItemFields
 17 
            - pref: UniqueItemFields
14 
            - (separated by a space)
 18 
            - (separated by a space)
15 
        -
 19 
        -
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+12 lines)
Lines 728-744 OPAC: Link Here
728 
              class: integer
 728 
              class: integer
729 
            - "days."
 729 
            - "days."
730 
        -
 730 
        -
731 
<<<<<<< Updated upstream
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 
            - "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:"
733 
=======
734 
            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
735 
>>>>>>> Stashed changes
732 
            - pref: PatronSelfRegistrationBorrowerMandatoryField
 736 
            - pref: PatronSelfRegistrationBorrowerMandatoryField
733 
              class: multi
 737 
              class: multi
734 
            - (separate columns with |)
 738 
            - (separate columns with |)
735 
        -
 739 
        -
740 
<<<<<<< Updated upstream
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:"
 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-registration screen:"
742 
=======
743 
            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
744 
>>>>>>> Stashed changes
737 
            - pref: PatronSelfRegistrationBorrowerUnwantedField
 745 
            - pref: PatronSelfRegistrationBorrowerUnwantedField
738 
              class: multi
 746 
              class: multi
739 
            - (separate columns with |)
 747 
            - (separate columns with |)
740 
        -
 748 
        -
749 
<<<<<<< Updated upstream
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:"
 750 
            - "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:"
751 
=======
752 
            - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
753 
>>>>>>> Stashed changes
742 
            - pref: PatronSelfModificationBorrowerUnwantedField
 754 
            - pref: PatronSelfModificationBorrowerUnwantedField
743 
              class: multi
 755 
              class: multi
744 
            - (separate columns with |)
 756 
            - (separate columns with |)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-1 / +8 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 
<<<<<<< Updated upstream
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 
         - "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:"
29 
=======
30 
         - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
31 
>>>>>>> Stashed changes
28 
         - pref: BorrowerMandatoryField
 32 
         - pref: BorrowerMandatoryField
29 
           class: multi
 33 
           class: multi
30 
         - (separate columns with |)
 34 
         - (separate columns with |)
31 
     -
 35 
     -
36 
<<<<<<< Updated upstream
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:"
 37 
         - "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:"
38 
=======
39 
         - "The following <a href='http://schema.koha-community.org/master/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
40 
>>>>>>> Stashed changes
33 
         - pref: BorrowerUnwantedField
 41 
         - pref: BorrowerUnwantedField
34 
           class: multi
 42 
           class: multi
35 
         - (separate columns with |)
 43 
         - (separate columns with |)
36 
-

Return to bug 18110