[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.01-60-g83f87a9
Git repo owner
gitmaster at git.koha-community.org
Wed Dec 7 00:44:28 CET 2011
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.6.x has been updated
via 83f87a9d9b588a7f1e343835b2c2edbf2c6754f1 (commit)
via 10b293716b59e2084703e5bbfc1b8cfe1ee04b85 (commit)
via 6cccc60aa5dde23b022a40871c514a25eb5f95ab (commit)
via 7ea9df413a14c7de47266ec9833b6eb853bd9b42 (commit)
from 20fcd965a967bafd9e1910ffc20c7511816ef006 (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 83f87a9d9b588a7f1e343835b2c2edbf2c6754f1
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Tue Dec 6 18:44:14 2011 -0500
Release Notes for 3.06.02.000 06 Dec 2011 23:44:14 Z
commit 10b293716b59e2084703e5bbfc1b8cfe1ee04b85
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Dec 6 20:34:55 2011 +0100
Adding Adrien Saurat as 161th committer.
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6cccc60aa5dde23b022a40871c514a25eb5f95ab
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Fri Nov 4 14:20:31 2011 +0100
Bug 6893 : Updates suggestions list when adding orders
A suggestion added through addorder.pl now changes
to the ORDERED status as initially intended (but so
far it stayed as ACCEPTED).
This fixes the list of potential suggestions to order,
the ORDERED ones don't appear anymore.
Bug 6893 : Follow-up: Disabled WHERE clause excluding ORDERED status
In SearchSuggestions, a WHERE clause was excluding the ORDERED
suggestions from the results. Now replaced with 1=1.
(before 6893 correction, the WHERE clause was excluding the
STATUS='CLAIMED' suggestions, but this status cannot be found anywhere
else in the code... so I changed to STATUS='ORDERED' which
seemed more accurate, but it had impacts on OPAC and some Admin tabs)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Both patches applied cleanly, sqashed them together after testing.
Tested:
1) Creating new suggestions
- from OPAC, shows up in patron account as 'requested', pending in staff
- from staff, shows up in list of pending suggestions
Status in database is ASKED
Note: suggestions made from staff for the same patron have suggestedby = 0
in the database, so are not showing up in the patron account. Is this by
intention? (if not, I think this is a separate bug)
2) Accepting suggestions
- from list
- from edit page
Status in database is ACCEPTED
Patron account shows 'Accepted by the library (Bestseller)'
Note: after changing the status from the list, bug 4068 kicks in and
some tabs and even suggestions are hidden. Going back to the acq start
page and going back to the suggestions page from there helps.
3) Rejecting suggestions
- from list
- from edit page
Status in database is REJECTED
Patron account in OPAC shows 'Suggestion declined'
Note: bug 4068 again.
4) Ordering from suggestions
- new basket
- ordered 2 accepted suggestions
SUCCESS! Great improvement:
- Status in database is now ORDERED
- Already ordered suggestions no longer show up on list of
suggestions to order from.
- Patron account shows 'Ordered by the library (Bestseller)'
- Suggestion management page shows a new tab 'Ordered'
- For the suggestion with a valid 'suggestedby' borrowernumber,
a mail was generated. (bug 7094)
5) Receive ordered suggestions
- received my ordered suggestions
This is is not in the scope of this bug, but for documentation:
- No message was generated to inform the patron
- Status stays ORDERED
- Patron account still shows item as ordered, no change to 4)
Looking at the suggestion.tt I think there should be another status
AVAILABLE.
216 [% ELSIF (suggestion.suggestiontypelabel == "Available") %]Available
Signing off, fixes bug reported. Danke!
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 28ef6c199bac6bc4064c857f24957081c88ed174)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7ea9df413a14c7de47266ec9833b6eb853bd9b42
Author: Mason James <mtj at kohaaloha.com>
Date: Thu Sep 22 21:48:04 2011 +1200
Bug 6908 - increase DEBUG level for *NOISY* Dates.pm init() messages
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 924ce3697dc97767f8d2261552da336afb1552ee)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Dates.pm | 2 +-
C4/Suggestions.pm | 2 +-
acqui/addorder.pl | 2 +-
docs/history.txt | 4 ++++
misc/release_notes/release_notes_3_6_2.txt | 10 ++++++----
5 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list