[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-56-gf982c72

[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  f982c725c6da0e96cdfe3bf8fa2a999479f09b7d (commit)
       via  b3c5ce5948de817764144048ae0862c57ec7a4ec (commit)
      from  2e07c95fd3ad171dadd338c30671584027e65302 (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 f982c725c6da0e96cdfe3bf8fa2a999479f09b7d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Mar 24 16:22:46 2015 +0100

    Bug 4277: Display the correct budget planning after saving
    
    The budget_period_id is not pass to the script, so after saving the
    budget planning, the planning for the first active budget is displayed.
    
    Test plan:
    1/ Edit a budget planning
    2/ Save
    3/ You should see the budget planning you were editing
    
    Patch behaves 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 gmail.com>
    (cherry picked from commit bb4db981586ab0a734285e8b6f229b38670bb152)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit b3c5ce5948de817764144048ae0862c57ec7a4ec
Author: Rafal Kopaczka <rkk0 at poczta.onet.pl>
Date:   Mon Mar 9 14:30:30 2015 +0100

    Bug 9481 - charge not showing fines On 'Check out' and 'Details'.
    
    When looking at the patron record or the checkout screen the checkout
    summary is now showing 0 for all the Charges even if the item was
    overdue and has accrued fines.
    Removed unused(?) footer values in checkouts-table-footer.inc
    
    To test:
    1/ Check out items with past due date
    2/ Run fines.pl script (ensure finesMode is set to Calculate and Charge)
    3/ Verify on Fines->Pay Fines screen that fines where calculated
    correct.
    4/ Go to Patron record, charge column on Details and Check out
    screen
    should be 0 or rental charge amount only. But total amount row
    display right
    number, same as in pay fines screen.
    4/ Apply patch.
    5/ Now charges on display and check out screen shows all outstanding
    fees for each item.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 901be3db53276b3e599fc7412de9aaff006c67cb)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 .../prog/en/includes/checkouts-table-footer.inc       |    5 +++--
 .../prog/en/includes/checkouts-table.inc              |    1 +
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js       |   17 ++++++++++++++++-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt     |    1 +
 svc/checkouts                                         |    3 +++
 5 files changed, 24 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository