[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.02-30-g1312416

[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  1312416b0afbfc517233717d60d4aab63d39e73d (commit)
       via  2190b9b67ccde78c70e7c4f8956ddb004fc4d6a5 (commit)
       via  33125c05ac12db65fd03a70283c946daaf22a581 (commit)
       via  6daf2b7c437a8cd94ee45683bc6669497fa98642 (commit)
      from  ec9766e8a66121422779b9ec8e826706f0168cab (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 1312416b0afbfc517233717d60d4aab63d39e73d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Dec 30 09:51:32 2014 +0100

    Bug 1861: Add 1 test to AddMember
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    (cherry picked from commit 5b165a2420bf4f024d7936477c214b6261b4e567)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 2190b9b67ccde78c70e7c4f8956ddb004fc4d6a5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Dec 30 15:37:39 2014 +1300

    Bug 1861: There is a problem introduced with an earlier patch, on this patchset
    
    -    $data{'userid'} = Generate_Userid($data{'borrowernumber'},
    $data{'firstname'}, $data{'surname'}) if $data{'userid'} eq '';
    +    $data{'userid'} = Generate_Userid( $data{'borrowernumber'},
    $data{'firstname'}, $data{'surname'} )
    +      if ( $data{'userid'} eq '' || Check_Userid( $data{'userid'} ) );
    
    Check_Userid returns 1 if it is unique.  So this means unique userids
    will always be discarded and new ones created.
    
    This is why all the tests depending on a userid are now failing
    
    To test
    
    1/ run perl t/db_dependent/Serials_2.t
    2/ Notice lots of tests fail
    3/ OR Add a borrower with a userid set, notice the userid is ignored
    and one is generated instead
    4/ Apply patch
    5/ Add a new borrower, notice the userid sticks (if it is unique)
    6/ Run perl t/db_dependent/Serials_2.t notice tests pass
    7/ Run perl t/db_dependent/Members.t notice tests still pass
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    (cherry picked from commit f326488f9afb9752b93d07858b6ac9d525838ff0)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 33125c05ac12db65fd03a70283c946daaf22a581
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Nov 27 16:54:21 2014 +0100

    Bug 13360: C4::Ris assumes that hash keys are ordered - KW
    
    This patch only fixes the KW order.
    
    Test plan:
    1/ Choose/create a record with several 6XX (for KW), see the code source
    to know which fields you can use
    2/ Export this record in RIS format
    3/ Verify that the KW lines are ordered following the marc record fields
    order.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    We really should refactor this whole thing into Koha::RIS sometime, it's
    a horrible module at the moment.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 801ba4a9204254fb2c24726495370ce813b1b22b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6daf2b7c437a8cd94ee45683bc6669497fa98642
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Dec 12 12:28:11 2014 -0500

    Bug 13453: Koha.t daily quote tests assume sample data
    
    By adding quotes 3 and 25 from the sample data, this test can
    pass without having the sample quote data loaded.
    
    TEST PLAN
    ---------
    1) Ensure there is no quote id=3 or that it is NOT
       Abraham Lincoln.
    2) prove t/db_dependent/Koha.t
       -- this should fail the daily quote test.
    3) apply patch
    4) prove t/db_dependent/Koha.t
       -- this should *NOT* fail the daily quote test.
    5) run koha qa test tools
    
    Followed test plan 1)-4). Without patch, daily quote test failed. With patch, test passed OK.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Works as described, leaves actual data unchanged.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 7aec3a9aa4ed826767fb02c2b4b3acf90b5f0e54)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Members.pm            |    2 +-
 C4/Ris.pm                |   53 +++++++++++++++++++++++-----------------------
 t/db_dependent/Koha.t    |    7 ++++++
 t/db_dependent/Members.t |    8 ++++++-
 4 files changed, 41 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
main Koha release repository