[koha-commits] main Koha release repository branch master updated. v3.18.00-565-gfaab00b
Git repo owner
gitmaster at git.koha-community.org
Tue Mar 31 16:35:36 CEST 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 faab00b88a155bdd7d5de35ef9226e134ce4b35b (commit)
via 589fd84107ed76ed50397f63d4ca809468f57ffe (commit)
via 5502cd1623f5beaa505c5cacf9d52796ab0112a8 (commit)
via 889e1953ec7fa07c4778918de9de8952c660d22e (commit)
via b7d5ce5f9a696e4d88a4c9df090a8d8918af6364 (commit)
via e0e80e0efbf774df8c745762a53650cbf250680a (commit)
via 9871417d4462a99129cf938c3470c98ae6fae85f (commit)
via e887ae544dd610a5c2f20ce326b0410aae587c81 (commit)
via c131b9821da6a04b1ec946f022fa831272e09769 (commit)
via 2bf394e6d247753a6edbb94c57573a14e303a71b (commit)
via fecffe6ebcd8be44d1ecbc2556a226d8a82f4bd5 (commit)
via cbb77c118d07559c47556433f17d1b65e5341909 (commit)
via 31bb705f55782d77efe69a4ef5fee337402ca1f1 (commit)
via 1e2a74dcdabe77daf23e74068e707384b3b78b5b (commit)
via deab5ca89b1d8e7add49e972d555804107090724 (commit)
via 24ec14716ff96d6ce7ec4590641bfe1be1a62815 (commit)
via 7a7cca1649799ea9b55352383ad0b03154547300 (commit)
via 36e7ede02f3670d927a8a28e527bd16ccd511351 (commit)
from 89a3ef5c5a1658bead838789f8b4c2857583217f (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 faab00b88a155bdd7d5de35ef9226e134ce4b35b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 16 10:16:40 2015 -0400
Bug 13841 - Returns via backdating or SIP2 can create new fines with an amount outstanding of 0
Due to the way AddReturn and UpdateFine work, if you pass in a return
date to AddReturn, and that item has a calculated fine of 0, Koha will
insert the 0 amount fine into accountlines.
This is good behavior when we want to update an existing fine, but bad
behavior if there was no fine to begin with!
Test Plan:
1) Apply the unit test patch
2) prove t/db_dependent/Circulation.t
3) Note the test fails
4) Apply this patch
5) prove t/db_dependent/Circulation.t
6) Note the test passes
Signed-off-by: Jen DeMuth <jdemuth at roseville.ca.us>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Confirmed the problem in the staff interface and that the patch
fixes it. Also tested that fines still get calculated.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 589fd84107ed76ed50397f63d4ca809468f57ffe
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 16 10:15:54 2015 -0400
Bug 13841 - Unit Test
Signed-off-by: Jen DeMuth <jdemuth at roseville.ca.us>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5502cd1623f5beaa505c5cacf9d52796ab0112a8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 26 16:10:11 2015 +0100
Bug 7391: Return to cart after adding items to a list
If you select items in your cart and choose to add them to a list, upon
completion of the transaction the pop-up window, which was originally
opened for the cart, is closed. Instead you should be returned to the
Cart view.
Test plan:
Confirm the expected behavior.
Confirmed.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 889e1953ec7fa07c4778918de9de8952c660d22e
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Mar 22 22:07:32 2015 +0100
Bug 13890 - Switch from full serials permission to 'routing' permission for reordering routing lists
For changing the sequence of patrons on a routing list by changing
one of the numbers via the pull downs, full serial permission is needed:
To test:
- Give your patron full serial permissions
- Create a subscription and a routing list for it
- Change the sequence on the routing list using the pull downs
- Verify this works
- Remove any of the serial sub permissions (claim serials or similar)
- Verify changing the sequence now results in a permission error
- Apply patch
- Verify that the permission error is gone now
- Remove the routing permission
- Verify the permission error is back (but this seems to make sense)
In general more fixes would be required to make all routing related
features depend on the routing permission, but I think this fixes
the bug making it depend on the correct permission.
Followed test plan. Works as expected.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b7d5ce5f9a696e4d88a4c9df090a8d8918af6364
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Mar 16 01:55:52 2015 +0100
Bug 11201 - QA follow-up - Pending on-site checkouts
Changes page name to "Pending on-site checkouts" as
agreed during the hackfest.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e0e80e0efbf774df8c745762a53650cbf250680a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Mar 6 10:29:30 2015 +0100
Bug 11201: qa-followup
- move h4 to h1
- Make the link on the circ home page depending on the pref
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9871417d4462a99129cf938c3470c98ae6fae85f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Nov 4 10:20:00 2014 +0100
Bug 11201: Display overdues in red
On the pending on-site checkout list, the date for overdues are now
displayed in red.
Test plan:
Make sure you have on-site checkouts created today and before.
The date for the ones created before today should be displayed in red.
Signed-off-by: Nicole <nicole at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e887ae544dd610a5c2f20ce326b0410aae587c81
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Nov 5 12:32:30 2013 +0100
Bug 11201: Add a in-house use list pages
The circulation page has a new entry: a link to a list of the pending
in-house use.
Bug 10860 introduces a new way for managing in-house uses.
This patch adds a new page (from the circulation home page) to list all
pending in-house uses.
Test plan:
Go on the circulation home page and click on the in-house use link.
Verify all your in-house uses are listed and information are consistent.
Bug 11201: Display lib instead of AV code
This patch assumes that items.location is linked the the LOC
authorised values.
Signed-off-by: Nicole <nicole at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c131b9821da6a04b1ec946f022fa831272e09769
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Mar 31 11:23:08 2015 -0300
Bug 10328: DBRev 3.19.00.018
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2bf394e6d247753a6edbb94c57573a14e303a71b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Feb 23 16:24:12 2015 +0100
Bug 10328 - Rename opaccolorstylesheet to OpacAdditionalStylesheet
Test plan (from comment #1)
1) Apply this patch
2) Run updatedatabase.pl
3) Verify the system pref OpacColorStyleSheet still works
i.e. no change should be noted
Additionally, I changed the path to an other stylesheet and verified that it worked.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described and no more occurences of opaccolorstylesheet were found.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fecffe6ebcd8be44d1ecbc2556a226d8a82f4bd5
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Mar 17 23:45:51 2015 +0100
Bug 13857: Email field for sharing is a bit short
The email field for sharing a list with another patron is
a bit short.
To test:
- Make sure OpacAllowSharingPrivateLists is activated
- Create a list in OPAC
- Use the "Share list" link to share with another user
- Check the length of the email field and if you like it
better with this patch applied
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cbb77c118d07559c47556433f17d1b65e5341909
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Mar 21 11:23:27 2015 +0100
Bug 13068: [QA Follow-up] Remove the Talking-Tech-itiva file from atomicupdate
The file can be removed. The code is included in the db revisions
3.09.00.014 and 3.15.00.040.
Also I adjusted the text of TalkingTech.README and removed the reference to
the atomicupdate file.
NOTE: I open a new report for adding TalkingTechItivaPhoneNotification to
sysprefs.sql. Probably, the text inserted in the db revisions should have
been inserted into the sample notices sql text too. These corrections are
outside the scope of this report.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 31bb705f55782d77efe69a4ef5fee337402ca1f1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 20 13:26:50 2015 -0400
Bug 13068 [QA Followup] - Remove use File::Slurp
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1e2a74dcdabe77daf23e74068e707384b3b78b5b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 20 13:24:38 2015 -0400
Bug 13068 [QA Followup] - Fix reading of sql files list
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit deab5ca89b1d8e7add49e972d555804107090724
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 11 14:27:31 2015 +0100
Bug 13068: (follow-up) Remove old files, use C4::Installer
The do method does not accept more than 1 sql query.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 24ec14716ff96d6ce7ec4590641bfe1be1a62815
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Mar 6 17:06:05 2015 +0100
Bug 13068: (QA followup) Remove old files, use C4::Installer
* moving oai-sets.sql from atomicupdate to updatedatabase itself
* using Installer file loader to load & execute SQL file
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 7a7cca1649799ea9b55352383ad0b03154547300
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue Oct 14 11:21:15 2014 +0200
Bug 13068: Follow-up for cleaning up atomicupdate folder
The folder atomicupdate can be cleaned up. It mainly contains old files that
are not used any more.
I found two files that are still referenced:
[1] Bug-4246-Talking-Tech-itiva-phone-notifications.pl
A readme file refers to it. The code in this file slightly differs
from the TalkingTech db revision. It can probably be deleted too, but
I will first check.
[2] oai_sets.sql
This file should remain. It is used in dbrev 3.07.00.029.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 36e7ede02f3670d927a8a28e527bd16ccd511351
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Mar 6 16:38:45 2015 +0100
Bug 13068: updatedatabase improvement for developer process
with this patch, the updatedatabase now checks info the atomicupdate directory. If there is some SQL here, it's executed.
Note that there is no version update, so if you run the updatedatabase script twice, you'll get an sql error probably.
This patch will be very useful for sandbox testing process.
When the RM pushes a patch with something in i'atomicupdate', he will have to copy it into updatedatabase.pl, give it a number, and remove the file in db_update
Test plan:
* apply the patch
* create a files with a .sql extension in the atomicupdate directory
* run updatedatabase.pl
* look at your database, what was in the .sql file must have been run
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 4 +-
C4/Circulation.pm | 32 ++++++++
C4/Overdues.pm | 41 +++++-----
C4/Templates.pm | 4 +-
patron_lists/lists.pl => circ/on-site_checkouts.pl | 21 +++--
...-permit_to_define_fine_days_in_issuing_rules.pl | 22 -----
.../0004-Add_Some_Missing_fields_to_suggestions.pl | 22 -----
.../atomicupdate/0005-Add_CAS_Configuration.pl | 8 --
.../mysql/atomicupdate/0007-Opac-search-history.pl | 24 ------
.../0008-opac-description-for-authorised-values.pl | 7 --
.../0009-patron-attr-display-checkout.pl | 7 --
...-4246-Talking-Tech-itiva-phone-notifications.pl | 27 -------
installer/data/mysql/atomicupdate/README | 2 +
...Renew_membership_from_expiry_or_current_date.pl | 9 ---
...dd-returnbranch-to-branch-item-issuing-rules.pl | 20 -----
.../atomicupdate/bug_7284_authority_linking_pt1 | 21 -----
.../atomicupdate/bug_7284_authority_linking_pt2 | 9 ---
installer/data/mysql/atomicupdate/hourlyloans.sql | 1 -
.../data/mysql/atomicupdate/importauthorities.pl | 26 ------
.../data/mysql/atomicupdate/issuedate_times.pl | 17 ----
.../data/mysql/atomicupdate/local_cover_images.pl | 30 -------
installer/data/mysql/atomicupdate/oai_sets.sql | 35 --------
.../mysql/atomicupdate/subscription_add_enddate.pl | 9 ---
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 74 ++++++++++++++++-
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../prog/en/modules/circ/circulation-home.tt | 4 +
.../prog/en/modules/circ/on-site_checkouts.tt | 85 ++++++++++++++++++++
.../bootstrap/en/includes/doc-head-close.inc | 8 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/js/basket.js | 6 +-
kohaversion.pl | 2 +-
misc/cronjobs/thirdparty/TalkingTech.README | 8 +-
serials/reorder_members.pl | 2 +-
t/db_dependent/Circulation.t | 38 ++++++++-
t/db_dependent/Circulation/GetIssues.t | 12 ++-
36 files changed, 288 insertions(+), 355 deletions(-)
copy patron_lists/lists.pl => circ/on-site_checkouts.pl (67%)
delete mode 100755 installer/data/mysql/atomicupdate/0001-bug_2929-permit_to_define_fine_days_in_issuing_rules.pl
delete mode 100755 installer/data/mysql/atomicupdate/0004-Add_Some_Missing_fields_to_suggestions.pl
delete mode 100755 installer/data/mysql/atomicupdate/0005-Add_CAS_Configuration.pl
delete mode 100755 installer/data/mysql/atomicupdate/0007-Opac-search-history.pl
delete mode 100755 installer/data/mysql/atomicupdate/0008-opac-description-for-authorised-values.pl
delete mode 100644 installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl
delete mode 100644 installer/data/mysql/atomicupdate/Bug-4246-Talking-Tech-itiva-phone-notifications.pl
create mode 100644 installer/data/mysql/atomicupdate/README
delete mode 100755 installer/data/mysql/atomicupdate/bug_6843_Renew_membership_from_expiry_or_current_date.pl
delete mode 100644 installer/data/mysql/atomicupdate/bug_7144-add-returnbranch-to-branch-item-issuing-rules.pl
delete mode 100644 installer/data/mysql/atomicupdate/bug_7284_authority_linking_pt1
delete mode 100755 installer/data/mysql/atomicupdate/bug_7284_authority_linking_pt2
delete mode 100644 installer/data/mysql/atomicupdate/hourlyloans.sql
delete mode 100755 installer/data/mysql/atomicupdate/importauthorities.pl
delete mode 100644 installer/data/mysql/atomicupdate/issuedate_times.pl
delete mode 100755 installer/data/mysql/atomicupdate/local_cover_images.pl
delete mode 100644 installer/data/mysql/atomicupdate/oai_sets.sql
delete mode 100755 installer/data/mysql/atomicupdate/subscription_add_enddate.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list