[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-28-g0311e39

Wed Sep 11 19:39:06 CEST 2013

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.12.x has been updated
       via  0311e39c269291156f82393fbb7269caab7b679e (commit)
       via  a4dbe6821d167908792a7665c492d0e2976aaa0a (commit)
       via  10ce9281d7eb63276511e05879af88d807495785 (commit)
       via  800e1fc6d059b59a6aa0f5f0353c64ea1b606560 (commit)
       via  eb0373c7eb6d1f0cb52155709c18e06c09ab55df (commit)
       via  5fde0910787f9c36caedfc12bc5af6dfedc7df36 (commit)
       via  af6c169f2a68296d99ad7f6908e441ababb79c98 (commit)
       via  98397ed4b10b03fb0b00e9550b571c3cc47407dc (commit)
      from  d7bd725fb1309813b89190b73556e0cb0ba7c4b4 (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 0311e39c269291156f82393fbb7269caab7b679e
Author: root <root at kenza-VirtualBox>
Date:   Thu Jul 25 13:47:09 2013 +0200

    Bug 10642: fix inappropriate uses of $sth->finish() in C4::RotatingCollections.pm

    From the man page

    finish()
    Indicate that no more data will be fetched from this statement handle
    before it is either executed again or destroyed.
    You almost certainly do not need to call this method.

    Adding calls to "finish" after loop that fetches all rows is a common
    mistake, don't do it, it can mask genuine problems like uncaught fetch errors.

    To test:

    Verify that prove -v t/db_dependent/RotatingCollections.t passes

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, passes UT provided by bug 10653

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit d1b3e4ab6b432844e076e1eb0662a9c04a5f412e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit a4dbe6821d167908792a7665c492d0e2976aaa0a
Author: Marc Veron <veron at veron.ch>
Date:   Sun Oct 7 19:54:44 2012 +0200

    Bug 8887: only display desired result when doing exact syspref search

    This patch fixes an issue where entering the complete name of a system
    preference when doing a syspref search in the staff interface resulted
    in the display of *all* preferences belonging to the desired one's
    module.

    Since providing a more specific search string should result in getting
    back more specific results, the previous behavior was not intuitive.

    Test scenario:

    a) In sysprefs, do a search with partial match (e.g. intranetcolor)
    -> Result shows one entry: intranetcolorstylesheet
    b) Do an exact search. e.g. intranetcolorstylesheet
    -> Result shows all Staff Client preferences

    Apply patch, test again. Now b) behaves like a).

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, works as advertised.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9bc53a0fccc3b673dca43791ebfcb53fd6e0a9ee)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 10ce9281d7eb63276511e05879af88d807495785
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 13 10:05:58 2013 -0400

    Bug 9238 - make fund pull down say 'select fund', not 'select budget'

    When adding a new order to a basket the fund selection field is labeled
    "Fund:" but the default option is "Select a budget." This patch changes
    this string to "Select a fund" and also corrects the associated
    JavaScript error message text displayed when one doesn't choose a fund.

    To test, add an order to basket. The "New order" form should show
    "Select a fund" as the default option for "Fund" in the "Accounting
    details" section. If you submit the form without selecting a fund the
    error message should read "You must select a fund."

    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    tests pass

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    String updates only, passes koha-qa.pl

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit dbe233a0e5d86975c28918d8b7023b70bdd29d38)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 800e1fc6d059b59a6aa0f5f0353c64ea1b606560
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Aug 16 16:09:13 2013 +0000

    Bug 10653: (follow-up) minor tweaks to RotatingCollections tests

    - remove unnecessary module import
    - use parentheses for all C4 function calls

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 40aa42f31f10acad92da5f2c57319f049fba9289)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit eb0373c7eb6d1f0cb52155709c18e06c09ab55df
Author: Kenza Zaki <kenza.zaki at biblibre.com>
Date:   Tue Jul 30 13:43:19 2013 +0200

    Bug 10653: add unit tests for C4::RotatingCollections.pm

    The tests are wrap in a database transaction.

    Test plan:
    prove t/db_dependent/RotatingCollections.t
    t/db_dependent/RotatingCollections.t .. ok
    All tests successful.
    Files=1, Tests=41, 20 wallclock secs ( 0.02 usr  0.01 sys +  0.41 cusr  0.02 csys =  0.46 CPU)
    Result: PASS

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 12061f44beb46709e03d09f7ff61551fa9297b2e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 5fde0910787f9c36caedfc12bc5af6dfedc7df36
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Aug 16 15:00:35 2013 +0000

    Bug 10481: (follow-up) fix typo in POD

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 1e84b1217afc74f490423538b7b8808e3d34513a)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit af6c169f2a68296d99ad7f6908e441ababb79c98
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Jul 11 11:45:06 2013 +0200

    Bug 10481: Unit tests for C4::Members::AddEnrolmentFeeIfNeeded

    prove t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
    t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t .. ok
    All tests successful.
    Files=1, Tests=3,  0 wallclock secs ( 0.02 usr  0.00 sys +  0.38 cusr
    0.01 csys =  0.41 CPU)
    Result: PASS

    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 1c8efaf3f9b14caf5f6512149d5fcd957bd3e487)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 98397ed4b10b03fb0b00e9550b571c3cc47407dc
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Jun 17 14:56:22 2013 +0200

    Bug 10481: FIX No enrollment fee when changing patron category.

    When a patron changes to a category with enrollment fee, they
    are not generated.

    Test plan:
    - Choose a category without fee (e.g. Kid)
    - Add an enrollment fee for another category (e.g. Young adult)
    - Choose a kid and change his category to "Young adult".
    - Note the warning message "Fees & Charges: Patron has Outstanding fees
      & charges of XX" on the check out page.

    This patch also moves all instances of adding the enrollment fee
    to a new routine in C4::Members, AddEnrolmentFeeIfNeeded(), so
    additional tests include:

    - Register a new patron and give it a category that has
      an enrollment fee.  Verify that the fee is charged.
    - Renew the patron.  Verify that the additional fee is charged.
    - Register a new patron with a child patron category.
    - Use the 'update child to adult' menu option to change the
      patron's category to one that is fee-bearing.  Verify that the
      enrollment fee was charged.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit f8eb19163bd4e59e99b6dae90a5712b6a7be52f6)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 C4/Members.pm                                      |   65 +++--
 C4/RotatingCollections.pm                          |   18 --
 admin/preferences.pl                               |   10 +-
 .../prog/en/modules/acqui/neworderempty.tt         |    6 +-
 t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t   |   56 ++++
 t/db_dependent/RotatingCollections.t               |  307 ++++++++++++++++++++
 6 files changed, 412 insertions(+), 50 deletions(-)
 create mode 100644 t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t
 create mode 100644 t/db_dependent/RotatingCollections.t

hooks/post-receive
-- 
main Koha release repository