[koha-commits] main Koha release repository branch 3.20.x updated. v3.20.04-27-g0960249

[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.20.x has been updated
       via  09602496882c4202abd2de7b53d1f76ba36536f2 (commit)
       via  bacb9773170cf3c37c3e2e0b21ee23c78b6ce502 (commit)
       via  b8facad6ae96d06edf10b323cd36e163c1a7c3b2 (commit)
       via  7c27cefedf448c3026420ddd032a8b65f075df20 (commit)
      from  8a47fd191e27b7b8d5214e6a25f16d408a85545a (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 09602496882c4202abd2de7b53d1f76ba36536f2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Oct 9 09:14:33 2015 +0100

    Bug 14990: Format the date template-side for moremember
    
    Test plan:
    print slip and show the member detail page, the 3 dates date of birth,
    date enrolled and date of expiry should be displayed correctly.
    
    Followed test pan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 6506ddd1e859c3afbb9519d6a956495c06d628ce)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Conflicts:
    	members/moremember.pl

commit bacb9773170cf3c37c3e2e0b21ee23c78b6ce502
Author: Rafal Kopaczka <rkk0 at poczta.onet.pl>
Date:   Tue Oct 6 14:57:52 2015 +0200

    Bug 14966: Table header broken at detail.tt
    
    For user without item edit permission, table at catalogue/detail.pl is
    corrupted.
    
    Test plan:
    1) Log in as staff member, without edit item permission.
    2) Go to biblio view, with items attached:
    /cgi-bin/koha/catalogue/detail.pl?biblionumber=X. Confirm that table
    does not display correctly.
    3) Apply patch.
    4) Repeat steps 1 and 2. Confirm patch works.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 390233a10c789a241f948f0f41df92fda3e51052)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit b8facad6ae96d06edf10b323cd36e163c1a7c3b2
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Aug 6 10:49:03 2015 +0200

    Bug 14653: Acq planning export always use default active period
    
    In Acq planning /cgi-bin/koha/admin/aqplan.pl, left side filter and export forms have no parameter budget_period_id nor authcat, so the use the default active period.
    As said in code
    - IF PERIOD_ID IS DEFINED,  GET THE PERIOD - ELSE GET THE ACTIVE PERIOD BY DEFAULT
    my $period = GetBudgetPeriod($budget_period_id);
    
    This patch corrects the export form.
    
    Test plan :
    - Create an active budget "B_ACTIVE" with 1 fund
    - Create an inactive budget "B_OLD" with 3 funds
    - Go to "B_OLD" planning by libraries
    - You see 3 funds
    - Click on "Submit" in export form
    => Without patch, you get the planning of "B_ACTIVE" with 1 fund
    => Without patch, you get the planning of "B_OLD" with 3 funds by libraries
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Works as advertised
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 852075d48e84c519c6bf0a28d492c1dafd291f0d)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 7c27cefedf448c3026420ddd032a8b65f075df20
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Aug 6 10:49:03 2015 +0200

    Bug 14653: Acq planning filter always use default active period
    
    In Acq planning /cgi-bin/koha/admin/aqplan.pl, left side filter and export forms have no parameter budget_period_id nor authcat, so the use the default active period.
    As said in code :
    - IF PERIOD_ID IS DEFINED,  GET THE PERIOD - ELSE GET THE ACTIVE PERIOD BY DEFAULT
    my $period = GetBudgetPeriod($budget_period_id);
    
    This patch corrects the filter form.
    
    Test plan :
    - Create an active budget "B_ACTIVE" with 1 fund
    - Create an inactive budget "B_OLD" with 3 funds
    - Go to "B_OLD" planning by libraries
    - You see 3 funds
    - In filter form, select "by months" in "Select planning type"
    => Without patch, you see planning of "B_ACTIVE" with 1 fund
    => Without patch, you see planning of "B_OLD" with 3 funds
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 837fa140e7c6621b3cfa9b0ce825844cac4543f5)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt      |    8 ++++++--
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tt  |    2 --
 .../prog/en/modules/members/moremember-brief.tt        |    9 +++++----
 .../prog/en/modules/members/moremember.tt              |   10 +++++-----
 members/moremember.pl                                  |   16 +++++++---------
 5 files changed, 23 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
main Koha release repository