[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.01-52-g776f738

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.22.x has been updated
       via  776f738382010f2d9ce8eef7efc73ed5fca45d6c (commit)
       via  6438df72872d88c263b4fa331c2d44adb0ac2fa4 (commit)
      from  7f708a361b95c449a972b8571acde4c52d3f336b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 776f738382010f2d9ce8eef7efc73ed5fca45d6c
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Sun Dec 20 19:57:54 2015 +0000

    Bug 15373: More changes of Zip to ZIP on intranet
    
    To test:
    
    - Log in to Staff Interface, go to Administration, Libraries and Groups (cgi-bin/koha/admin/branches.pl). Click 'New library' and confirm that it says 'ZIP/Postal Code:' in the form.
    - Go back to Administration, Cities and towns (cgi-bin/koha/admin/cities.pl). Confirm it says 'ZIP/Postal code' in table heading. Click 'New city' and confirm it says 'ZIP/Postal code:' in form
    - Go back to Administration, Global system preferences, I18L/L10N (cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n). Under AddressFormat, confirm all available options say '[ZIP/Postal Code]'
    - Go to Reports, Patrons (cgi-bin/koha/reports/borrowers_stats.pl). Confirm it says 'ZIP/Postal code' under Title
    - Go to Tools, Batch patron modification (cgi-bin/koha/tools/modborrowers.pl), enter any card number and click 'Continue'. Confirm it says 'ZIP/Postal code' in the table of patron details, and in the form to edit
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    NOTE: Tested together with first patch.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 5df49b04ef69ad6b33b3f7744acb379c0dd83b0f)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 6438df72872d88c263b4fa331c2d44adb0ac2fa4
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Mon Dec 14 22:43:26 2015 +0000

    Bug 15373: Changing Zip to ZIP on OPAC and Intranet
    
    To test:
    
    1) Login to OPAC --> You personal details.
    2) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
    3) Login to Staff interface --> Go to a member's page (ie koha/members/memberentry.pl) --> Details.
    4) Ensure it says 'ZIP/Postal Code' under Alternate address and Alternative contact
    5) Click Edit
    6) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
    
    Signed-off-by: Barry Cannon <bc at interleaf.ie>
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    NOTE: Tested together with second patch.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 3da8abcfeff331d5022ee54bbf27ecfbc4ebe18c)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/columns.def                      |    6 +++---
 .../prog/en/includes/member-alt-address-style-de.inc             |    2 +-
 .../prog/en/includes/member-alt-address-style-us.inc             |    2 +-
 .../prog/en/includes/member-alt-contact-style-de.inc             |    2 +-
 .../prog/en/includes/member-alt-contact-style-us.inc             |    2 +-
 .../prog/en/includes/member-main-address-style-de.inc            |    2 +-
 .../prog/en/includes/member-main-address-style-us.inc            |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt        |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt          |    6 +++---
 .../prog/en/modules/admin/preferences/i18n_l10n.pref             |    4 ++--
 .../intranet-tmpl/prog/en/modules/members/members-update.tt      |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt    |    4 ++--
 .../intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt    |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt     |    6 +++---
 reports/borrowers_stats.pl                                       |    2 +-
 16 files changed, 27 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
main Koha release repository