[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.03-62-ga3189a6

[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.18.x has been updated
       via  a3189a6f68cf2812849573c8ec64ff76d9fa593d (commit)
       via  f9a2751aaa94b6499d6ac14a92dab93a256f68d3 (commit)
      from  544c59cb22b12c914968fe9a69b49184be9fdcb7 (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 a3189a6f68cf2812849573c8ec64ff76d9fa593d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jan 20 10:11:24 2015 -0500

    Bug 13603 - autoBarcode setting hbyymmincr not taking month into account when looking up next increment
    
    The hbyymmincr autoBarcode builder looks up all barcodes that begin with
    any number of letters ( the branchcode ) and a two-digit year directly
    afterward ( e.g. MPL15 ), then grabs the last four digits as the
    increment counter. The problem is, this does not take months into
    account, so unlike the description that says the system is limited to
    10,000 items a month, it is limited to 10,000 items per *year*.
    
    This situation can easily be corrected my adding the month into the
    lookup ( e.g. MPL1501 ).
    
    Test Plan:
    1) Enable autoBarcode, set to hbyymmincr
    2) Catalog an item, let the barcode.pl plugin generate
       the next barcode.
    3) Catalog an item with the barcode MPL15009999
    4) Catalog another item, use the barcode.pl plugin to
       generate the next barcode.
    5) Note the barcode is generated ends with '0001' instead of the
       correct increment
    6) Apply this patch
    7) Repeat step 4
    8) Note the barcode now ends with the correct increment
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jeanne Heicher <nppublib at pa.net>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Problem confirmed - the continuing number bit was not reset
    to start counting from 1 again on the beginning of a new month.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit b280b4890c813b5535b6e98b27c390d9af10551a)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit f9a2751aaa94b6499d6ac14a92dab93a256f68d3
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Nov 12 14:42:37 2014 -0500

    Bug 13142 - Change "mobile phone" label back to "other phone"
    
    Labeling a phone number field "mobile phone" eliminates the usefulness
    of having the labels "primary" and "secondary." Generic labels let the
    user populate the fields according to their importance rather than their
    type.
    
    To test I recommend editing a patron record so that the values in the
    patron record contain a label matching the table column:
    
    borrowers.phone : 555-555-1234 (primary - phone)
    borrowers.phonepro : 555-555-5678 (secondary - phonepro)
    borrowers.mobile : 555-555-9012 (other - mobile)
    
    View this patron's information in the various affected templates and
    verify that the labels correctly match the data:
    
     - OPAC "your personal details" (opac-memberentry.pl)
     - Submit changes to primary, secondary, and other phone via the OPAC.
       In the staff client, view the confirmation for those changes.
     - Patron details in the staff client (moremember.pl)
     - Patron entry/edit in the staff client (memberentrygen.pl)
     - Patron duplicate confirmation in the staff client
       (you can navigate directly to
       /members/moremember.pl?borrowernumber=XXXX&print=brief)
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit a7da45099f49093cc950a1392d6488543af5ddd3)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 C4/Barcodes/ValueBuilder.pm                                   |    9 +++++----
 koha-tmpl/intranet-tmpl/prog/en/columns.def                   |    2 +-
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt   |    2 +-
 .../intranet-tmpl/prog/en/modules/members/members-update.tt   |    4 ++--
 .../intranet-tmpl/prog/en/modules/members/moremember-brief.tt |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt  |    2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository