[koha-commits] main Koha release repository branch master updated. v3.08.00-66-gf61a961

[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, master has been updated
       via  f61a9617184ec4b24100c1d99150bfd4ebf13336 (commit)
       via  8e18b25d9eec35b6fbb59bdcafd51d801e106ba1 (commit)
       via  c7bbb0f77316f08d2ca020ebe7bbc67b2f7575ef (commit)
       via  a598b100613a37dc2710090cb381dce56eae2f26 (commit)
       via  d83596ad1b63839b3b2bf9f9e30386ea1458934f (commit)
       via  7a81b89357f965953a149c1ba846bbef9db8c2af (commit)
       via  9295e47a66f3b03be148f7763956823ffc92a697 (commit)
       via  42a38e4a2aeb16327811f9efb0b4d94bf16e01f5 (commit)
      from  9ec7ac5b8e036ad824636df5acd4e1ec2ebb45c8 (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 f61a9617184ec4b24100c1d99150bfd4ebf13336
Author: Ian Walls <koha.sekjal at gmail.com>
Date:   Thu Mar 22 17:06:21 2012 -0400

    Bug 5549 followup: fix suspension in days further
    
    Grace periods are now measured in the same unit as the loan.
    
    Suspension in days works explicitly in days, independent of unit.  Since
    the 'deltadays' duration is actually the duration, possibly in hours, between
    when the material was due and when it's returned, we need to take the finedays
    factor (how many days per unit overdue) and multiple it by 24 if the unit is
    hourly.
    
    Example: a 1 hour loan material with 1 hour grace period and finedays = 2,
    returned 2 hours late would give 4 days suspension
    
    To test:
    1.  create some circ rules:
      A) an hourly loan rule with suspension in days
      B) an hourly loan rule with suspension in days and a grace period
      C) a daily loan rule with suspension in days
      D) a daily loan rule with suspension in days and a grace period
    2.  Check out 2 materials under each rule.  We'll call these A1-D1
    and A2-D2 (to associate with the rule)
    3.  Return A1-D1 late, but within the grace period for B1 and D1 as appropriate
    4.  Return A2-D2 late, after the grace periods
    
    You should get:
    
    A1: suspended for (#hours late) * (#suspensionindays) days
    B1: not suspended
    C1: suspended for (#days late) * (#suspensionindays) days
    D1: not suspended
    
    A2: suspended for (#hours late) * (#suspensionindays) days
    B2: suspended for (#hours late) * (#suspensionindays) days
    C2: suspended for (#days late) * (#suspensionindays) days
    D2: suspended for (#days late) * (#suspensionindays) days
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 8e18b25d9eec35b6fbb59bdcafd51d801e106ba1
Merge: a598b10 c7bbb0f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon May 14 18:14:10 2012 +0200

    Merge remote-tracking branch 'origin/new/bug_8022'

commit a598b100613a37dc2710090cb381dce56eae2f26
Merge: 9295e47 d83596a
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon May 14 16:18:46 2012 +0200

    Merge remote-tracking branch 'origin/new/bug_7178'

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

Summary of changes:
 C4/Circulation.pm                                  |    8 ++-
 C4/Items.pm                                        |   38 ++++++++
 acqui/check_uniqueness.pl                          |   27 ++-----
 acqui/neworderempty.pl                             |    2 +-
 .../data/mysql/es-ES/mandatory/userpermissions.sql |    1 +
 koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css   |    9 ++-
 .../intranet-tmpl/prog/en/css/staff-global.css     |   90 ++++++++++++--------
 .../prog/en/includes/budgets-admin-search.inc      |    3 +-
 .../prog/en/includes/cities-admin-search.inc       |    3 +-
 .../prog/en/includes/patrons-admin-search.inc      |    3 +-
 .../prog/en/includes/prefs-admin-search.inc        |    2 +
 .../prog/en/includes/roadtype-admin-search.inc     |    7 +-
 .../prog/en/includes/z3950-admin-search.inc        |    3 +-
 koha-tmpl/intranet-tmpl/prog/en/js/additem.js      |    4 +-
 .../prog/en/modules/acqui/neworderempty.tt         |    9 ++-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   13 ++--
 16 files changed, 144 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
main Koha release repository