[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-75-gce7cb18

[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, 18.05.x has been updated
       via  ce7cb18847d5273409dfd30317070338e100a954 (commit)
       via  e4a7a7f05d20b122b70174ecfe2fa90b4745c3b8 (commit)
      from  3662049d146d7e584f9afa43accbbea38fbca92b (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 ce7cb18847d5273409dfd30317070338e100a954
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Mon Dec 3 18:02:03 2018 +0100

    Bug 21937: Syspref autoBarcode annual doesn't increment properly barcode
    
    This patch fix the barcode annual builder. The test should pass.
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 31ace6a9347a8260532f6cc50d55fc36f87f1b44)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 9109d862a08a53dd6328eed902dd4ed45de7f673)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit e4a7a7f05d20b122b70174ecfe2fa90b4745c3b8
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Mon Dec 3 18:27:08 2018 +0100

    Bug 21937: Add test to show autoBarcode annual increment bug
    
    This patch show the issue. If the DB contains a barcode (not auto attributed
    by Koha) which begin with the year used to generate automatically a new one,
    there may be a 'collision'.
    
    prove -v t/db_dependent/Barcodes_ValueBuilder.t
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7262bc066784247b12ce7f25c390498086e1d72b)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit a85edfb2be449cf65691d1e4b32080310ac7aad2)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 C4/Barcodes/ValueBuilder.pm                                      |    2 +-
 .../prog/en/modules/admin/preferences/cataloguing.pref           |    4 ++--
 t/db_dependent/Barcodes_ValueBuilder.t                           |    6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository