[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.05-94-g315847f
Git repo owner
gitmaster at git.koha-community.org
Tue May 14 10:36:31 CEST 2013
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.10.x has been updated
via 315847f5c0d71d02f5a47a1cae9567d04022408c (commit)
via fd93baad37739d1f4587eef37fa53ffdc7e7c235 (commit)
via fc3f76748c6b861580264176a2803f68e628df70 (commit)
via 84d55391cdf74b2ebe5415d62cd76148d2182e66 (commit)
from 1dc63ee38be10f0c13e261de3323b329449fa0ca (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 315847f5c0d71d02f5a47a1cae9567d04022408c
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Thu Apr 18 12:55:18 2013 +0200
Bug 7228: can't add items in an order with Modify
We have a message if we want to add items and we can't add, substract only.
It's ok if we choose to create items on ordering, in this case koha can't add items, just substract
and in this case we have to delete manually the items(s) in the catalog.
But if via the syspref AcqCreateItem we choose to create items when receiving this limitation is not usefull
The patch just checks if the syspref AcqCreateItem is on 'ordering'
if not the message is not shown and we can add items
Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Here is the test I made for signing off :
after applying the patch
- syspref AcqCreateItem : create items on RECEIVING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch
- syspref AcqCreateItem : create items on CATALOGING
- in a basket, create an order (quantity = 1)
- save the order
- reopen the order
- change the quantity (2 instead of 1)
- save the order
=> changing quantity was not possible before the patch
- syspref AcqCreateItem : create items on ORDERING
- in a basket, create an order (click on "add" to add an item => quantity = 1)
- save the order
- reopen the order
- try to change the quantity (2 instead of 1), without clicking on "add" to create a new item => you cannot (alert message)
=> the behavior is the same as before the patch
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Copied test plan from bug report.
Template only change deactivating the Javascript that blocks
you from changing the quantity when AcqCreateItem is set to
something else than 'ordering'.
Passes all tests and QA script.
**Rebased for 3.10.x**
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit fd93baad37739d1f4587eef37fa53ffdc7e7c235
Merge: fc3f767 1dc63ee
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date: Tue May 14 20:36:07 2013 +1200
Merge remote-tracking branch 'origin/3.10.x' into 3.10.x
commit fc3f76748c6b861580264176a2803f68e628df70
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon May 6 06:43:50 2013 +0000
Bug 10185: Add missing columns in update 3.09.00.025
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
SQL only changes fixing an important database update.
IMPORTANT: Patches must be backported to all versions containing
the database update 3.09.00.025.
I used the test plan provided by Julian with some additions:
1/ Do a fresh 3.8 install
2/ Do some reserves
3/ Check your old_reserves table is empty
4/ Update your sources to 3.10
5/ Run updatedatabase.pl
6/ Your reserves table is now empty!
I made sure I had item level and title level holds, also
suspended holds.
I repeated the test with entries in my old_reserves table
(cancelled and filled holds) to make sure this is also still
working correctly.
Before the patch we lost all suspended holds and when the
old_reserves table was empty also all holds in general.
After the patch the reserve_id is added but the other data
in both tables is not altered.
NOTE: Adding the reserve_id first to old_reserves and then
to reserves we are missing one id in between.
old_reserves: 1,2,3
reserves: 5,6
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 30d067400e6d15cd86d8b35daed4bb10438d0e2e)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 059cc4cd3ac5e40326fb8653b581a35dca585ed8)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 84d55391cdf74b2ebe5415d62cd76148d2182e66
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri May 3 17:20:17 2013 +0200
Bug 10185: Fix update 3.09.00.025
It can remove all reserves from reserves table when there is no entries
in old_reserves.
This is due to @ai which is set to NULL in
SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )
and reserve_id > NULL returns no results in
INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > @ai
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test plan and comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 37c52367b08f30514483b02a387cb5a463ea15d0)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(cherry picked from commit 254173bc21043b92cecd3037962da832175bcdcc)
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
acqui/neworderempty.pl | 1 +
installer/data/mysql/updatedatabase.pl | 14 +++++++++-----
.../prog/en/modules/acqui/neworderempty.tt | 2 ++
3 files changed, 12 insertions(+), 5 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list