[koha-commits] main Koha release repository branch master updated. v3.18.00-500-g1410422
Git repo owner
gitmaster at git.koha-community.org
Wed Mar 25 15:28:02 CET 2015
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 1410422ab65a7049411edab96d4ae0de454466ef (commit)
via 836a7eba0b76a034a18fd0bfc46b97caf907dc10 (commit)
via fe179c737df8a56be3cac6098d5266becb2dfef2 (commit)
via 413a3002992e68f9c6aa27b2d40b6ba9c5685bd9 (commit)
via cc01bfe8e84b7ce64567ddaf957fcbde7d255ac6 (commit)
via 0e8927a5fa676bf105f3a2ee3fab05bfb4be65a3 (commit)
via d269bef7eb536a94013e0c415bb3572d2a1e65dd (commit)
via e044995d8ab9c9a452faf978bd9dc8676a9c36a5 (commit)
via 7f893f9e1cb4bb486b34b66c68ed5ad8f319d52a (commit)
via 7614cbf462a00c29b5870a8379d3c1f70ddc77d0 (commit)
via e2667222d8406a4a707d3e4c1c17652acb31faff (commit)
via ebccf4099fd2762e24773ebb13b5099f10991101 (commit)
via 1802aa91530a4e8716da4a6b956ca6e0cee7d471 (commit)
from d149cd1d977ab796edd5da9881f08bac251c54e1 (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 1410422ab65a7049411edab96d4ae0de454466ef
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Mar 6 10:55:12 2015 +0100
Bug 13801: svc/bib - Set charset to utf-8 on printing header
Test plan:
0/ Add unicode characters on the record biblionumber=X
1/ go on http://<staff-interface>/cgi-bin/koha/svc/bib/X
2/ Confirm you have encoding issues
3/ Apply the patch
4/ Repeat 2
5/ Confirm that all is correctly encoded
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 836a7eba0b76a034a18fd0bfc46b97caf907dc10
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 20 09:09:45 2015 -0400
Bug 12820: [QA Followup] Tab and whitespace cleanup
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fe179c737df8a56be3cac6098d5266becb2dfef2
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Feb 10 17:22:43 2015 +0000
Bug 12820: Handle rental fees in Sip issue and renew
Implement correct handling of fees associated with checking out
an item.
This is associated with fee acknowledged field (BO)
To quote from the Sip2 document
" If this field is N in a Checkout message and there is a fee
associated with checking out the item, the ACS should tell the
SC in the Checkout Response that there is a fee, and refuse to
check out the item. If the SC and the patron then interact and the
patron agrees to pay the fee, this field will be set to Y on a second
Checkout message, indicating to the ACS that the patron has acknowledged
the fee and checkout of the item should not be refused just
because there is a fee associated with the item"
So there are two Checkout requests the first with BO not set to Y is
rejected but the fee amount is returned. The Second Checkout with BO set
to Y should succeed.
Added a debug log message indicating why we block a checkout
when we dont otherwise indicate
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 413a3002992e68f9c6aa27b2d40b6ba9c5685bd9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Mar 10 14:25:48 2015 -0400
Bug 13818 - Editing and saving a course reserve displays the add item form
If one chooses to edit an existing course reserve for an item, saving it
should go back to the course details, but instead displays the "add
items: scan barcode" form.
Test Plan:
1) Edit a course reserve
2) Save it
3) Note you get the "add items: scan barcode" form
4) Apply this patch
5) Repeat steps 1 and 2
6) Note you are now redirected back to the course details page
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cc01bfe8e84b7ce64567ddaf957fcbde7d255ac6
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Mar 17 23:31:00 2015 +0100
Bug 13856: Hard to translate strings on patron search results page
'Add selected patrons to:' at the top of the patron search result
table is hard to translate correctly, because the 'to:' appears
as a separate string from the rest of the sentence.
To test:
- Make sure patron lists are activated
- Do a patron search with more than 1 result
- Look for the text at the top of the search results table
- Verify it looks the same before and after the patch
Bonus:
- run perl translate update <langcode> and verify the
2 strings are now 1 string with the patch applied
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0e8927a5fa676bf105f3a2ee3fab05bfb4be65a3
Author: “ByWater <“staff at bywatersolutions.com”>
Date: Fri Mar 13 09:53:40 2015 -0400
Bug 13832 - Missing table header IDs on record holdings table in OPAC
All but two of the table headers in the item holdings table in the opac have identifiers. The remaining two should be added so they can be modified easily with CSS.
Test Plan:
1) Apply this patch
2) View the holdings table for a record
3) Note the new id field for the item holds column
4) Note the new id field for the hold prioirty column ( if enabled )
Followed test plan. 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>
commit d269bef7eb536a94013e0c415bb3572d2a1e65dd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Mar 24 13:23:53 2015 +0100
Bug 4847: Remove the python dependency for package builds
The only place python is used is in the debian/bd-to-depends script.
This patch rewrite this script using perl.
Test plan:
The execution of
debian/bd-to-depends
Should return the same output.
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Checked output, built a package, all is happy. Yay for no python!
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e044995d8ab9c9a452faf978bd9dc8676a9c36a5
Author: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
Date: Thu Mar 19 21:39:49 2015 -0600
Bug 13878 - Typo in help file (aqbudgets.tt)
Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt:15' and check the typo "wan" or go to Administration > Acquisition parameters > Funds > Help
2) Apply the patch
3) Repeat step 1 and check if the typo is fixed.
Sponsored-by: Universidad de El Salvador
Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
Typo is fixed.
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>
commit 7f893f9e1cb4bb486b34b66c68ed5ad8f319d52a
Author: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
Date: Wed Mar 18 21:05:03 2015 -0600
Bug 13872 - Typographical error on columns_settings.tt
Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/columns_settings.tt' line 9 and check the typo "columsn" and change for columns.
2) See also changes for Column settings to Columns settings at lines 3 and 15
3) Apply the patch
4) Repeat step 1 and chek if the typo is fixed or go to Administration > Additional parameters > Configure columns and go to Help page.
Sponsored-by: Universidad de El Salvador
Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
Typo is fixed
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>
commit 7614cbf462a00c29b5870a8379d3c1f70ddc77d0
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Mar 25 10:31:53 2015 -0300
Bug 5786: DBRev 3.19.00.017
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e2667222d8406a4a707d3e4c1c17652acb31faff
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Mar 5 13:59:39 2015 +0100
Bug 5786 [QA Followup] - Fix language
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ebccf4099fd2762e24773ebb13b5099f10991101
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Dec 19 06:27:27 2014 -0500
Bug 5786 [QA Followup]
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1802aa91530a4e8716da4a6b956ca6e0cee7d471
Author: Srdjan <srdjan at catalyst.net.nz>
Date: Mon Feb 25 16:43:00 2013 +1300
Bug 5786 - Move AllowOnShelfHolds and OPACItemHolds system prefs to the Circulation Matrix
C4::Reserves:
* Added OnShelfHoldsAllowed() to check issuingrules
* Added OPACItemHoldsAllowed() to check issuingrules
* IsAvailableForItemLevelRequest() changed interface, now takes
$item_record,$borrower_record; calls OnShelfHoldsAllowed()
opac/opac-reserve.pl and opac/opac-search.pl:
* rewrote hold allowed rule to use OPACItemHoldsAllowed()
* also use OnShelfHoldsAllowed() through
* IsAvailableForItemLevelRequest()
templates:
* Removed AllowOnShelfHolds and OPACItemHolds global flags, they now
only have meaning per item type
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
I have tested this patch left, right and upside down for the last
several months. All tests have passed.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 1 -
C4/Circulation.pm | 8 +-
C4/ILSDI/Services.pm | 2 +-
C4/Items.pm | 2 +
C4/Reserves.pm | 233 +++++++++++++-------
C4/SIP/ILS.pm | 5 +-
C4/SIP/ILS/Transaction.pm | 1 +
C4/SIP/ILS/Transaction/Checkout.pm | 13 ++
C4/SIP/ILS/Transaction/Renew.pm | 11 +
C4/SIP/Sip/MsgType.pm | 46 ++--
C4/UsageStats.pm | 2 -
C4/VirtualShelves/Page.pm | 5 +-
Koha/Schema/Result/Issuingrule.pm | 21 +-
admin/smart-rules.pl | 56 +++--
course_reserves/add_items.pl | 7 +
debian/bd-to-depends | 44 ++--
debian/control | 4 +-
debian/control.in | 2 +-
.../mysql/it-IT/necessari/system_preferences.sql | 1 -
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/sysprefs.sql | 2 -
installer/data/mysql/updatedatabase.pl | 37 +++-
installer/html-template-to-template-toolkit.pl | 2 +-
.../en/modules/admin/preferences/circulation.pref | 6 -
.../prog/en/modules/admin/preferences/opac.pref | 7 -
.../prog/en/modules/admin/smart-rules.tt | 17 ++
.../en/modules/course_reserves/add_items-step2.tt | 1 +
.../en/modules/course_reserves/course-details.tt | 2 +-
.../prog/en/modules/help/admin/aqbudgets.tt | 2 +-
.../prog/en/modules/help/admin/columns_settings.tt | 8 +-
.../prog/en/modules/members/member.tt | 3 +-
.../bootstrap/en/includes/opac-detail-sidebar.inc | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 68 +++---
.../bootstrap/en/modules/opac-results-grouped.tt | 10 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 8 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
kohaversion.pl | 2 +-
opac/opac-ISBDdetail.pl | 27 ++-
opac/opac-MARCdetail.pl | 18 +-
opac/opac-detail.pl | 22 +-
opac/opac-reserve.pl | 41 ++--
opac/opac-search.pl | 19 +-
reserve/request.pl | 11 +-
svc/bib | 2 +-
t/db_dependent/Circulation.t | 2 +-
t/db_dependent/Circulation_Issuingrule.t | 6 +
t/db_dependent/Reserves.t | 24 +-
48 files changed, 531 insertions(+), 294 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list