[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.02-23-ge2fac72
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 25 18:54:54 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.12.x has been updated
via e2fac72763cd541eef32d7278dea33dadc1aa6cc (commit)
via f67769bc637c2acb7eb4593374f4d1db06d06266 (commit)
via 4251c1f8185bb91df17949b903391ad29d58f6f0 (commit)
via ec5f90161d8bfca53f45364281f9141b89bad862 (commit)
via 090d7de036421441089c1f87a586efaaeb67e975 (commit)
via 6536249a7df7ea045b54163df3a1c4793fad2bca (commit)
via 67d2f66fbbe030345da410bf3f1686ca5213981a (commit)
via 5b1fda0cf3bb86c04db73d4992a09ceca2f6c9d9 (commit)
via 88c877ab2d09382c34d20813595c2e112e08136f (commit)
via a89699cc66ab6471d55d13d67da322e975dd5c57 (commit)
via 3b6abb0ea18720eef688241aa2c2e6399d922fa0 (commit)
via aa15f7031bc7d9c0f2c9901db491dada53f21c65 (commit)
via d359b05cb8958cd4d2a2681a86d7813a48748670 (commit)
via 18c86575ff8d31ea9afbee7d0d21c19405e530c4 (commit)
from df765f82b3b96e9bf4e883450d1e3260cce01dfd (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 e2fac72763cd541eef32d7278dea33dadc1aa6cc
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 20 08:38:46 2013 -0700
Bug 10170: expose more managed staged MARC strings to translation
This commit makes it possible to translated the 'staged'
and 'error' record statuses as well as the 'auto_match'
overlay status.
Also takes out a bit of HTML cruft in one string that is
not needed for translation.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests pass. New strings are parsed into the po files:
"%s Always add items %s Add items only if matching bib was found %s Add items only if no matching bib was found %s Ignore items %s %s %s %s "
"%s No match %s Match applied %s Match found %s %s %s "
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7d990042e9dcc86e6f60b923763720d5c9ed6b2c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f67769bc637c2acb7eb4593374f4d1db06d06266
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Thu May 2 16:56:54 2013 +0200
Bug 10170: strings in MARC import made translatable
Following bug 9215: non translatable strings are now
present in the template and translatable
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Not only does this make the strings translatable it makes the template
a lot easier to read
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 24e561f4da56e442dc1a9d25afa63e8ab74d9236)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4251c1f8185bb91df17949b903391ad29d58f6f0
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Jul 9 11:52:31 2013 +0200
Bug 10556: The delivery time is not inserted on adding a supplier.
Test plan:
Add/edit a supplier and check that the delivery time is set in DB.
Note: This patch cleans the code (sql query) in order to see easily if a
problem occurred.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b95c3134a8a38ba430f7d70173f91e055b4fa30e)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ec5f90161d8bfca53f45364281f9141b89bad862
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Jul 16 14:55:09 2013 +0000
bug 10556: regression test for setting deliverytime when adding vendor
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 41baeafda9733caa69cd678b3f471976c6b27a7c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
I'm loving Galen's regression tests :-D
commit 090d7de036421441089c1f87a586efaaeb67e975
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Jul 5 14:50:03 2013 +0200
Bug 10274: Execute sql queries into a transaction
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit eab1812b7dcfb460378fb287a63c6a81b3c8d820)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6536249a7df7ea045b54163df3a1c4793fad2bca
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri May 17 15:11:35 2013 +0200
Bug 10274: UT: Acquisition.t needs to create its own data
Try before the patch:
prove t/db_dependent/Acquisition.t
And after, it should produce:
t/db_dependent/Acquisition.t .. ok
All tests successful.
Files=1, Tests=41, 2 wallclock secs ( 0.03 usr 0.00 sys + 0.42 cusr
0.02 csys = 0.47 CPU)
Result: PASS
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Tests pass and the bookseller is deleted.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f72e78f2bd4e3f208f38063f948365d9108e6d40)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Fixed a small conflict, tests pass and looks fine.
commit 67d2f66fbbe030345da410bf3f1686ca5213981a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Jul 1 10:11:05 2013 +0200
Bug 10275: Use a transaction for OrderFromSubscription.t
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 4f09ebfc8a4a04125777d6e90c36b73217bae888)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5b1fda0cf3bb86c04db73d4992a09ceca2f6c9d9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri May 17 15:27:45 2013 +0200
Bug 10275: UT: OrderFromSubscription.t needs to create its own data
Try before the patch:
prove t/db_dependent/Acquisition/OrderFromSubscription.t
And after, it should produce:
t/db_dependent/Acquisition/OrderFromSubscription.t .. ok
All tests successful.
Files=1, Tests=12, 2 wallclock secs ( 0.02 usr 0.00 sys + 0.46 cusr
0.02 csys = 0.50 CPU)
Result: PASS
And some warnings...
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes tests.
Assumes Dateformat is set to US dates as in the sample data.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 8e442955247e925dacf303455f40522a89a349b2)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 88c877ab2d09382c34d20813595c2e112e08136f
Author: Kenza Zaki <kenza.zaki at biblibre.com>
Date: Mon Jul 1 10:48:03 2013 +0200
Bug 10499: VirtualShelves.t - wrap tests in a database transaction
Before this patch, the queries in VirtualShelves.t were committed in the
database and have to be removed at the end.
This patch wraps tests in a database transaction.
Test plan:
prove t/db_dependent/VirtualShelves.t
VirtualShelves.t .. ok
All tests successful.
Files=1, Tests=72, 1 wallclock secs ( 0.06 usr 0.00 sys + 0.72 cusr 0.06 csys = 0.84 CPU)
Result: PASS
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
All tests pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit d2a756128853e9d3a1e0b99f47a04c9e0f31de75)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a89699cc66ab6471d55d13d67da322e975dd5c57
Author: Kenza Zaki <kenza.zaki at biblibre.com>
Date: Thu Jul 11 16:28:11 2013 +0200
Bug 10575 : GetOrdersByBiblionumber.t needs a database transaction
Before this patch, the queries in GetOrdersByBiblionumber.t were commited in the database and have to be removed at the end.
This patch wraps tests in a database transaction.
Test Plan :
prove t/db_dependent/Acquisition/GetOrdersByBiblionumber.t
t/db_dependent/Acquisition/GetOrdersByBiblionumber.t .. ok
All tests successful.
Files=1, Tests=3, 0 wallclock secs ( 0.02 usr 0.01 sys + 0.37 cusr 0.05 csys = 0.45 CPU)
Result: PASS
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tests pass.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 45fafb31ce03244011513a3a758e28f8db9615a4)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 3b6abb0ea18720eef688241aa2c2e6399d922fa0
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Jun 25 09:09:38 2013 +0200
Bug 10504: Remove the unused C4::Acq::ModOrderItem routine
This routine has been introduced by commit 2d90fb22d43db986547bbaa945873d6dd78aab71.
The only call has been removed by commit 9eba7dc594fc0d4698da5e791d5f6f8682b2712a.
So now, this routine is useless.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9f4f1ceafe218afcbc55d6dfb9ac1e32fc11803a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit aa15f7031bc7d9c0f2c9901db491dada53f21c65
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Jul 2 12:56:21 2013 +0200
Bug 10527: remove disused routine C4::Branch::get_branch_code_from_name
This routine is not in used and does not make sense. It should not be
used later.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, not references to get_branch_code_from_name found.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7d930649065663325de95c3f8ecdbcea3bddb3b5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d359b05cb8958cd4d2a2681a86d7813a48748670
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jul 2 09:59:21 2013 -0400
Bug 10422 - Remove references to unused and non-existent wizard.css
doc-head-close.inc contains a reference to "wizard.css" which doesn't
exist. The option to include it never evaluates as true, and that
section can be removed from the template.
To test, apply the patch and view any page in the staff client.
Everything should be styled as before. A search of the Koha source
should return no references to "wizard.css" or a "wizard" variable.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
No occurrence of "wizard" in pl/pm files.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 986f7a24e8abe566d57a3488a8df87488ab3aeb6)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 18c86575ff8d31ea9afbee7d0d21c19405e530c4
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jun 5 14:16:14 2013 +0200
Bug 6898: fix DB update that assigns the circulate/overdues_report permission
This patch fixes a bug that prevented the circulate/overdues_report
permission from being assigned to staff users during upgrade. This
patch will not affect databases that are already running 3.12.x
or later.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
This will only fix the permissions for updates done
after the patch has been applied. But I agree with
Fridolyn, that we can not safely update permissions for
existing installations.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit c6bf2670502afbd12981aa5e913779c38c19bdc4)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 33 +----
C4/Bookseller.pm | 43 +++---
C4/Branch.pm | 11 +--
cataloguing/moveitem.pl | 2 +-
installer/data/mysql/updatedatabase.pl | 2 +-
.../prog/en/includes/doc-head-close.inc | 3 -
.../prog/en/modules/tools/manage-marc-import.tt | 84 +++++++++-
labels/label-edit-batch.pl | 1 -
labels/label-manage.pl | 1 -
patroncards/edit-batch.pl | 1 -
patroncards/manage.pl | 1 -
t/db_dependent/Acquisition.t | 169 +++++++++++++-------
.../Acquisition/GetOrdersByBiblionumber.t | 17 +--
t/db_dependent/Acquisition/OrderFromSubscription.t | 42 ++++--
t/db_dependent/VirtualShelves.t | 35 ++---
tools/manage-marc-import.pl | 1 -
16 files changed, 258 insertions(+), 188 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list