[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.14-53-g63eeb1b
Git repo owner
gitmaster at git.koha-community.org
Wed Aug 13 20:42:18 CEST 2014
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 63eeb1b8e29ab8ca3b71cdf1b54a03e6fdab4efd (commit)
via 172cd00658830beee873316e7991f0ea7d77a2e7 (commit)
via 5e5005264416e9a2dfe4774dc13aa7c3d23c7e9f (commit)
via 50a540f27f6987e5c994cdd161d931c56de694d0 (commit)
via cd71ce7777510f6ac554324f1e0cd4a6f41af88d (commit)
via 17718177fe83772e9cba7524e75cb00a6c4d523c (commit)
via 88d31ff746cde1471fd27c0a08ec81e97250e35b (commit)
via 9afcd220439a95c611dbe9300f586f44e83db59f (commit)
via 80d7b61c1485b45d53336681ef59aa6e1e84daea (commit)
via 3c8be0709fefa1952df875856d3a4731f7b94e73 (commit)
via 357f22363ceb8996aa95384fb386b68b02bc0b43 (commit)
via a899e1b6832807f8846e6dfcd0fc78257f813c94 (commit)
via dc196fd01bbe9e5aed68ccdde36295ced3da7791 (commit)
via eef3a2b36c31d3e3ed5cfb71fd40ccb6325cfda8 (commit)
via 5af5298a44f334a4653829c9a7564001776c0975 (commit)
via 4b7f39a250ae9fe343806fdd374c61c2cc719fb1 (commit)
via b30ee9546cf5ba6085ba04645e3f62a971c50544 (commit)
via 0ab77a620bd3a539e47e09ff29e1e91ddc4864dd (commit)
via aad4cc7b82b156ce752b2e90441607324c632f44 (commit)
via 44196fd05fed2682e3bc0fc1e40fb3c26834d055 (commit)
via 18a743969331e1b8ca1d9f635438807ef476e738 (commit)
via 811227d92705a0c43afac2def8f537f3e390c4ff (commit)
via 0a3c26f58a0783013d43c72fed2ca155166e87f5 (commit)
via b73417876316c978b62a3bc73f38dbaf47f37f45 (commit)
via 05c13f12370df3b162064f487300944a34d5af81 (commit)
via fa69b2d074a2134a51f7b9b69ced9c1ac84846a0 (commit)
via a5d366ab598ef85fefb292880a53ce89bdc10a75 (commit)
via 0f02ea6d0862c8751388bea2e1b5aa733da489ae (commit)
via a556116fe908dab21058d3296939ded8a7e7c5ff (commit)
via 8a975f8d30b22e63ba8d72421d0e69c29340f847 (commit)
via 487638232f4c79d34e020411008254918a5267df (commit)
via abd7a020b02dd51f0221291e2644ce2f9d5eb0fc (commit)
via 768481e7d7d4ec648b24df47f6e68e18b7366781 (commit)
via ea8d10c3d32201e2da972bb0b1a8fb37a00506d7 (commit)
via 1e43d9f8817392322fcdeb289fc6f790f86722d7 (commit)
via 9e9b0cf78d4867d17093cd4c12707d0be7703604 (commit)
via 09df2c1da99550a8f521825cc9894b616fc2bf0f (commit)
via c36a7c8bccfce7fe9fb31b25b3c3ee9a0a14c775 (commit)
via 13c794c0fca9c38db18d9e0c9abbd4571c38a38b (commit)
via 998f92a1fe9f632b108ef188d2575cc82401efdf (commit)
via 1dcb8c6ceb209d76309c036c167efbb9c10255bc (commit)
via 56317289c2406907f365e8734a6399c813a30cb6 (commit)
via 5727909b704ba6f4058ec1604d3aaa3474c39fd6 (commit)
via 69e0a1b9b2f622bcdab05c4ebe548bd8c548bc6a (commit)
via 87c0b157f97cce9748ab095bbee0e32144424a89 (commit)
via a950cb6a6bfdb51d8892653ad101f82a30df9f2d (commit)
via 805f823073f17927d88367858922e809f0c4c903 (commit)
via cfd53e654cdd30c6a9bf47a63fe78c8574c552e1 (commit)
via 9ee1e66e66218f68f086df6bf7e59ea9d7aaeb2c (commit)
via dfb3a62d42c3a408cabffc2b07f61b89d044fb69 (commit)
via 850df48328b00dfeba0f80bb4140fa2740651ceb (commit)
via e56e87913e6e36427b6e39636e9ab1b3cf05d5ed (commit)
from a225a9320aa5b1731c4b4679dfde4f2550492de4 (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 63eeb1b8e29ab8ca3b71cdf1b54a03e6fdab4efd
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun Apr 20 20:20:15 2014 +0000
Bug 9288: (follow-up) more tweaks
- add license and copyright statement
- tidy up help text
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9fa0649c5c755bc16b66a177cd330f93a285e05d)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 8a2d935e4e69c0ad19257ac845260451aa995a6e)
commit 172cd00658830beee873316e7991f0ea7d77a2e7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Dec 30 08:22:33 2013 -0500
Bug 9288: (follow-up) remove function prototype
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 90f1814b9e83d37a29fdef011912741230a5cdfe)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 30e515190b70afa25026976a6e59a631b9b7b4ba)
commit 5e5005264416e9a2dfe4774dc13aa7c3d23c7e9f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Oct 22 12:32:44 2013 -0400
Bug 9288: (follow-up) minor code tweaks
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 887829613fd12c04694d80975c7a6c8244c2574e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit aae1eef58892194bac815c8f8c4cccfabdbb3e32)
commit 50a540f27f6987e5c994cdd161d931c56de694d0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Sep 20 10:04:41 2013 -0400
Bug 9288: (follow-up) use specified terminator for both input and output
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 8af35f89badacaf025226811c233f2cf44554910)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4003f9f88470673d19e204f435fa2385f5bd3492)
commit cd71ce7777510f6ac554324f1e0cd4a6f41af88d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jul 8 09:21:25 2013 -0400
Bug 9288: (follow-up) add --terminator option; use Modern::Perl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0f521663cf73b1c1122712d08094c65f1d59df6a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit bb2874c30445391fe1b048f9f107fc01b2efb8f0)
commit 17718177fe83772e9cba7524e75cb00a6c4d523c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Dec 14 11:56:36 2012 -0500
Bug 9288 - Add a script to test SIP from the command line
This is a very basic start to a sip server testing script.
I imagine we will want to make it interactive in end,
essentially replicating what a SIP based self-checkout machine does.
Signed-off-by: Adrien Saurat <adrien.saurat at biblibre.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b2e8dfe816ad2f0b130a0b5fab07514c1464cee7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 84f169621108b8fe17a05eb60c67d86a7b99e99f)
commit 88d31ff746cde1471fd27c0a08ec81e97250e35b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Nov 17 18:37:59 2013 +0100
Bug 11248: (follow-up) fix template for translated list emails in staff
- Fixes some capitalization problems
- Adds an URL filter
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5b8494dcc9256358865eb1b8a49a91d96cddb2bb)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4f47868591ebf7fe3fff80f29f8f110fd479bf51)
commit 9afcd220439a95c611dbe9300f586f44e83db59f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Nov 14 14:05:53 2013 +0100
Bug 11248: fix encoding issue on emailing a list (OPAC)
Test plan:
- send a list via email with the english version.
- translate templates and retry with another language.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely. Links to the OPAC are correct.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 394ece2e1012aebdc5543f739c5438f91c66d477)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 51d7f2da3a59a06bd0089cad5f34077c1811ca8a)
commit 80d7b61c1485b45d53336681ef59aa6e1e84daea
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Nov 14 14:00:46 2013 +0100
Bug 11248: fix encoding issue on emailing a list (INTRANET)
Test plan:
- send a list via email with the english version.
- translate templates and retry with another language.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Sending an intranet list from translated templates requires
a new list template for the intranet. I have added the needed
changes in a follow-up.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9181636874a03cf43e7c26a89364279bfe2aa2ee)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5e1e2c2d182744292dfb324b7c5295d07a7418c4)
commit 3c8be0709fefa1952df875856d3a4731f7b94e73
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Mar 5 15:08:13 2014 +0100
Bug 8258: Use patron's library's notice for DUEDGST and PREDUEDGST
If a notice is defined for the library of the patron, it should be
used.
Without this patch, the notice used is the one defined for all
libraries.
Test plan:
1/ Set the advanced notice for a patron using digest.
2/ Check one item out to this patron (backdate the return date according
the days in advance value).
3/ launch advance_notices.pl -c
4/ Verify the notice used is the default one.
5/ Define a notice for the library of the patron for PREDUEDGST
6/ launch advance_notices.pl -c
7/ Verify the notice used is the one previously defined.
8/ Check one item out to this patron (date due = today)
9/ launch advance_notices.pl -c
10/ Verify the notice used is the default one.
11/ Define a notice for the library of the patron for DUEDGST
12/ launch advance_notices.pl -c
13/ Verify the notice used is the one previously defined.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Test case: User from Library A, checked out books
- in library A from A and B
- in library B from B
Verified, that the 'all libraries' notice is still used,
when no specific notice is defined.
Verified, that the patron's home library noticed is used,
when defined.
Note: Before and after the patch we print the branch information
from the patron's home library, so also using the template from
this branch, seems logical. All items over all branches are
processed into one single reminder email, before and after the patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 836f3ce992ef2c3bffbcf80c73bcacbbe479ea85)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 125f532a92d53aa31960f81e066dfea8eda91b1e)
commit 357f22363ceb8996aa95384fb386b68b02bc0b43
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Nov 15 10:43:21 2013 +0100
Bug 11254: make reservoir search normalize ISBNs
When importing records, the ISBN is normalized and stored
into database (see C4::ImportBatch::_add_biblio_fields). But when
searching with ISBN into reservoir, it is not normalized
(see C4::Breeding::BreedingSearch). So search does not match.
This patch adds the normalisation to reservoir search. Also, it
replaces call private method _isbn_cleanup by GetNormalizedISBN,
the correct public method. Also allows the reservoir search
on ISBN with hyphens.
This is intended to fix only reservoir searches.
Revised Test plan
-----------------
1) Back up DB
2) Save copy of attached example somewhere findable
2) Home -> Tools -> Stage MARC records for import
3) Click Browse and select the example MARC file
4) Click Upload file
5) Tweak as desired then click Stage for import
6) Click Manage staged records
7) Click Import this batch into the catalog
8) Home -> Cataloging
9) In the Cataloging search text box type 978-0-691-14289-0 and
click Submit
-- ISBN13 with hypens not found in reservoir
10) In the Cataloging search text box type 9780691142890 and
click Submit
-- ISBN13 without hypens not found in reservoir
11) In the Cataloging search text box type 0-691-14289-0 and
click Submit
-- ISBN10 with hypens not found in reservoir
12) In the Cataloging search text box type 0691142890 and
click Submit
-- ISBN10 without hypens found in reservoir
13) Apply patch
14) Repeat steps 9-12, this time it is always found! :)
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit cac06afeb1f03200cfc7ab48162c184be8d1526b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0ddc2b90f9068ef8a30efb845dd84b70041cf7e5)
commit a899e1b6832807f8846e6dfcd0fc78257f813c94
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Mar 20 11:14:58 2014 +0100
Bug 11912: (follow-up) Use the common way to mock syspref
t::lib::Mocks::mock_preference provides a simple way to mock syspref.
Test plan:
Verify that t/db_dependent/Biblio.t returns green.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit c5f8bf244b9db2e3279774435ae75f7c4b4ab68a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 11a890df5ab01c504d799d813f70cd6c841379b3)
commit dc196fd01bbe9e5aed68ccdde36295ced3da7791
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Mar 10 11:52:19 2014 -0300
Bug 11912: (refactoring followup) make GetMarcISBN implement its advertised API
The current implementation of GetMarcISBN contradicts the documented API.
It currently returns an array of hashes with only one key (marcisbn)
which doesn't add any value to it.
I chose to fix GetMarcISBN to honour the API instead of changing thex
docs, because it seems a really silly change.
To test:
- Run:
prove t/db_dependent/Biblio.t
=> SUCCESS
- catalogue/detail.pl should correctly show ISBNs.
- opac/opac-detail.pl should correctly show ISBNs in both prog and bootstrap.
- opac-opac-sendshelf.pl should correctly show ISBNs in the email.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 774483772b2a7ff8ebdb8a9aeac82881e7c858cf)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit eef3a2b36c31d3e3ed5cfb71fd40ccb6325cfda8
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Mar 9 18:39:11 2014 -0300
Bug 11912: fix problem where GetMarcISBN wrongly prepends a space to ISBNs
This patch makes the logic inside GetMarcISBN simpler and
fixes the issue.
To test:
- Run the regression tests:
prove -v t/db_dependent/Biblio.t
=> FAIL
- Apply the patch
- Run:
prove -v t/db_dependent/Biblio.t
=> SUCCESS
- Verify that opac-detail.pl and catalogue/detail.pl look as usual regarding ISBN
- Sign off
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit c4900dc448aa029749ab27f98b59d1be6eb8bb14)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d2d5600cdc8d629a77e3eaad42b24ffdd3b1b59e)
commit 5af5298a44f334a4653829c9a7564001776c0975
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sun Mar 9 17:21:48 2014 -0300
Bug 11912: (regression tests) GetMarcISBN wrongly prepends a space to ISBNs
This patch makes the tests run in both MARC21 and UNIMARC contexts.
It previously run only for MARC21. It mocks what needs to be mocked.
To test, run
- prove t/db_dependent/Biblio.t
=> Notice the first ISBN has a space in front of it and those tests fails.
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit da7dd4ed8c2462597712a11b0a018db87b1fef87)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit f09c5a08769375948812bde71577cabcc2a86204)
commit 4b7f39a250ae9fe343806fdd374c61c2cc719fb1
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 16:14:34 2014 +0000
Bug 11489: (follow-up) fix tab
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6c6d21a8d040482b88b5b6752b32ed749089fbc9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 08c87c6acdefd47d454555f0f6f9ddd8e4986cee)
commit b30ee9546cf5ba6085ba04645e3f62a971c50544
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Jan 9 17:53:04 2014 +0100
Bug 11489: (OPAC prog theme) show facets only if there is a result to display
If all results are hidden, the facets are displayed.
With this patch, the facets are hidden too.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Michot <nmichot at voila.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script. Tested:
- Record with 1 lost item, result list = 1
- Verified without both patches 404 error page is shown
- Verified with 1st patch, no results page is shown
- Verified with 2nd patch, the still showing facets are gone
- Record with 1 lost item, result list > 1
- Record is hidden from result list, but
- result count is wrong
- result numbering is wrong
> This is an old problem, just noting
- Record with 1 lost and 1 available item, result list = 1
- Detail page is shown, only lost item is hidden
- Record with 1 lost and 1 available item, result list > 1
- Only available item is shown in result list
Also checked that the lost item shows up with hidelostitems off.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 65fb03c0f439fdc8bef7ce0359afa75598c39147)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0ab77a620bd3a539e47e09ff29e1e91ddc4864dd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jan 7 10:19:37 2014 -0700
Bug 11489: in OPAC search, display "no results" when the only search result is suppressed
If hidelostitems is enabled, and the result of an opac search is a single
lost item, then the OPAC will display a 404 error, rather than a
"no results" screen.
Test Plan:
1) Catalog a record/item such that it is the only result for some search
e.g. Give it the title 'zxcvb'
2) Enable hidelostitems
3) Mark this item as lost
4) Perform an OPAC search that should result in a redirect to this record
5) Notice you a redirected to a 404 error
6) Apply this patch
7) Repeat step 4
8) Note you new get a "No results found!" page instead
Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
Signed-off-by: Michot <nmichot at voila.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2277a42c565e18475c49fde031268b8038575e1a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b3c73cff32c99f12b77a9b110e2a928f5dfd1679)
commit aad4cc7b82b156ce752b2e90441607324c632f44
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 24 09:58:38 2013 +0100
Bug 10138: (follow-up) FIX sql errors
There were 2 INSERT in error.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I have gone ahead and fixed the typo pointed out by Mathieu:
Endommadgé-> Endommagé
Sample files install without problems, tests look good.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e81513199cba41a254820347442719a6fd50ec0b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 5d5c15f873f6285ef1fdd900c2a15cdac3a9e2c5)
commit 44196fd05fed2682e3bc0fc1e40fb3c26834d055
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Sun Apr 28 19:06:11 2013 +0200
Bug 10138: Add some authorized values in French installer; small fixes in frameworks
This patch adds some categories of values in French installer :
- SUGGEST
- OPAC_SUG
- REPORT_GROUP
- LOST
- DAMAGED
SUGGEST and OPAC_SUG are used by Suggestions module.
REPORT_GROUP is used by Reports module.
It also adds a new status for "ETAT" (en commande)
It creates a 995$2 subfield in french frameworks when it did not exist.
It links existing 995$2 subfield with LOST category.
It cleans up the list of authorised values installed with "Lecture
publique" framework :
- some codes are moved in general 1-Obligatoire/authorised_values.sql
(SUGGEST, REPORT_GROUP)
- some are suppressed, because they are also defined in
1-Obligatoire/authorised_values.sql (langue, COUNTRY, statut)
- the code for inserting the ones left is changed (I suppress the `id`
column)
To test :
1. Take a fresh new Koha
2. Install Koha choosing French installer and UNIMARC Lecture publique
3. Check the authorised values are imported
4. Check the cataloguing frameworks are usable :
especially 995 $2 field, which must be mapped with LOST values :
Perdu, Long retard, Perdu et remboursé, Introuvable
you can also check 101$a (language codes), 102$a (country codes)
5. In OPAC, make a suggestion. See if you can select a cause for your
suggestion ("Bestseller" or "'L'exemplaire en rayon est endommagé")
6. In staff interface, manage some suggestions. See if you can select a
cause for rejection or acceptation ("Bestseller", "Budget
insuffisant" etc)
7. In reports, see if you can sort reports according to values of
REPORT_GROUP ("Circulation", "Catalogue", "Adhérents" etc)
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Comments on second patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e5fe771cc9ebab7980cac27216d553952cb60277)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ee7fb5e8ec4c3539e166fb0256929126d88ece7a)
commit 18a743969331e1b8ca1d9f635438807ef476e738
Author: Francesca Moore <francescalamoore at gmail.com>
Date: Wed Jan 15 12:03:51 2014 +1300
Bug 11231: remove reference to ambiguous notes column from two hold request reports
The 'notes' column has been removed from the pending holds and hold
ratios reports as they were not displaying in the first place.
1.apply patch
2.verify that both reports work
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit cc34a816a10ca76004e079032f1a46aec1ccb1c4)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b462dfc66a23d53088e6ad0b9bfa7354a8347cae)
commit 811227d92705a0c43afac2def8f537f3e390c4ff
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Fri Nov 22 11:00:21 2013 +0100
Bug 9578: avoid a search crash when attempting to sort results of invalid query
When searching with a sort (means not by relevance) and there is an error
in Zebra connexion (server is down or query is wrong), you get the message :
Error : Can't call method "sort" on an undefined value at /home/kohaadmin/src/C4/Search.pm line 405.
This patch corrects by not performing sort if there are no no results.
Steps to reproduce the error without patch:
In OPAC go to Advanced Search
Choose "Title" in first "Search for:" end enter "ccl=( and )"
Display "More options"
Set "Sort by" to "Title (A-Z)"
Click "Search" at bootom of page
Result:
Error:
Can't call method "sort" on an undefined value at /usr/share/kohaclone/C4/Search.pm line 430.
After applying the patch, try that search again. This time,
it should report not results found with out the error message.
Alternative Test plan :
- Set OPACdefaultSortField on something else than relevance
- Perform a simple search with a wrong CCL query. For example : ccl=( and )
=> You get the messge : No results found ...
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>
Adds another check to prevent a bad Zebra error message.
Works as described, passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3b402d04e1a321afac02da84bae12f0342b776ad)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 65f76726846e2e9dd38d80a8fa1891410f6100f2)
commit 0a3c26f58a0783013d43c72fed2ca155166e87f5
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date: Mon Feb 10 10:09:21 2014 +0100
Bug 11680: (follow-up) fix unexpected tax rate changes on edit
Follow-up to fix similar issue on vendor edit.
If the tax rates in Acquisitions -> gist system preference
are entered with trailing zeroes, given vendor tax rate value
may not be correctly handled on vendor edit.
Test plan for this follow-up:
1) insert some tax rates with trailing zeroes in gist
system preference (e.g: '0|0.080|0.12|0.20|0.23')
2) add some vendors, choosing 8.0% 12.0% 20.0% 23.0%
as gst rate
3) try to modify them
4) note that vendors with 12.0% and 23.0% tax rates are
preserving previously choosen rates on edit, while
the ones with 8.0% and 20.0% do not (they are defaulting
to the first defined tax rate)
5) apply the patch
6) repeat 2) and 3)
7) all tax rates configured in system prefrence shall now
behave properly while editing vendors
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f3cb186de5d60395d5d681dc5e83971d0717592a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit ff077e30d3c519377966e0e4715e46a2f75765d3)
commit b73417876316c978b62a3bc73f38dbaf47f37f45
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date: Wed Feb 5 11:16:14 2014 +0100
Bug 11680: fix case where tax rate changes unexpectedly on editing an order
If the tax rates in Acquisitions -> gist system preference are entered
with trailing zeroes, given order tax rate value may not be correctly
handled on order edit.
To test:
1) insert some tax rates with trailing zeroes in gist
system preference (e.g: '0|0.080|0.12|0.20|0.23')
2) place some new orders, choosing 8.0% 12.0% 20.0% 23.0%
as gst rate
3) try to modify them
4) note that orders with 12.0% and 23.0% tax rates are
preserving previously choosen rates on edit, while
the ones with 8.0% and 20.0% do not (they are defaulting
to the first defined tax rate)
5) apply the patch
6) repeat 2) and 3)
7) all tax rates configured in system prefrence shall now
behave properly while editing orders
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
All tests pass
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Confirmed the problem and that this patch fixes it.
Problem also exists for editing the default tax rate of a vendor.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 471215dc46e5a65360a3bde53666f62f809f0861)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a2c0ce097c7623afedb7d3040f3afff8d7ea868c)
commit 05c13f12370df3b162064f487300944a34d5af81
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Apr 4 12:09:37 2013 +0200
Bug 10090: display item type description instead of code on acq ordered and spent pages
On ordered.pl and spent.pl, the itemtype codes are displayed, instead of
descriptions.
Links for the ordernumber should be changed. In ordered.pl, we are
redirected to the receive page. In spent.pl, the links are deleted.
Signed-off-by: Broust <jean-manuel.broust at gmail.com>
Revisited patch: The link to orderreceive was broken, so I undo the
changes.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works alright, itemtype descriptions are shown.
The removed link was potentially 'dangerous' as you shouldn't
get to the receive page for an order, without providing an invoicenumber
first.
Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 378bffa0ddbe793dff75a828e2bf5b03ad666b57)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit da6b078cf415eb2164910b5392848004c41b1d62)
commit fa69b2d074a2134a51f7b9b69ced9c1ac84846a0
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Jan 2 14:42:16 2014 +0000
Bug 11468: Remove given/when from Koha::Dateutils
given and when give warnings due to their experimental
status as of perl 5.18. Replace the construct with
an if/elsif to avoid the keywords
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script, especially t/DateUtils.t.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b529ca00e0cac093fc32a1d123cdbcc84582c155)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 01e627b6412bbb3d2fc82900014c118dc5b06a57)
commit a5d366ab598ef85fefb292880a53ce89bdc10a75
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Dec 18 08:37:40 2013 -0500
Bug 11416: fix case where serials item editor was incorrectly hiding fields
In serials/serials-edit.pl, if an item field is hidden from the OPAC,
it will not display in the editor, even if the field is marked as
visible in the staff intranet and editor. However, the field is still
displayed correctly in the items editor ( additem.pl ).:
Test Plan:
1) Select an item-level field ( e.g. non-public note )
2) Create a serial using the default framework ( or one of your choice )
3) For that framework, mark the chosen field as visible from the
intranet and editor, but not the opac.
4) Receive an item for this serial, note your field does not display
5) Use the biblio item editor to add an item ( additem.pl ), not the
field displayes
6) Apply this patch
7) Repeat step 4, not the field displayes
Signed-off-by: Kim Schwant <kim.schwant at courts.in.gov>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
PrepareItemrecordDisplay is only used for editor (-4 < hidden < 4)
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f14020780836c5fbc65331b3918b843761481c36)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 552e2d5ef0bab15536a730efc57eba3eb1f5c6b1)
commit 0f02ea6d0862c8751388bea2e1b5aa733da489ae
Author: Blou <philippe.blouin at inlibro.com>
Date: Wed Feb 12 12:03:08 2014 -0500
Bug 11752: display the correct frequency for serial subscriptions in OPAC details
This fixes bootstrap and prog by modifying the description displayed
in the OPAC's detail of serials.
RM NOTE: this patch does not cover the case where custom serial
frequencies have been defined.
TESTING to reproduce
- create/find a serial with a 1/week periodicity (4 in the database)
- Find it in the opac-detail.pl, click "more details" at the bottom
- validate the string. Before the patch, it will say:
"The current subscription began on 2013-12-06 and is issued every 3
weeks for 26 issues"
The "every 3 weeks" is clearly wrong.
In fact any periodicity chosen would display a wrong description, not
matching the staff interface.
After the patch, the display is corrected.
As a bonus, the "every 2 years" now has a description, where it had
none before.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7f1e949ea0e8d05b641ddbcb4582a3e1bc913ecd)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit a556116fe908dab21058d3296939ded8a7e7c5ff
Author: Frédérick <frederick.capovilla at libeo.com>
Date: Tue Mar 18 16:11:44 2014 -0400
Bug 11955: Remove spaces in empty indicators when linking an authority to a biblio record.
This patch removes spaces in indicators which are imported when we link an
authority to a biblio record. The spaces made the indicators harder to edit
after the linking, because we had to delete the superfluous space character
before a new value could be entered.
To test:
1. Open some authority on editor, save with empty indicators.
They are saved as ind1=" " ind2=" " on auth_header tables, with spaces
2. Edit some record, link some tag with previous auth,
indicators now have a space on it (or ind1 at last)
3. Apply the patch
4. repeat 2, space is gone
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described. No koha-qa errors.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit afc9549a6f58ddf36cf6d9a5399239385c377c90)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit cb013de95c4ddd0be85c9bd5b83ef2345b850213)
commit 8a975f8d30b22e63ba8d72421d0e69c29340f847
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Nov 15 08:29:23 2013 -0800
Bug 11258: fix another case where holds queue made transfer requests that contradict the library holds policy
This patch fixes a problem where the holds queue generator
was making requests where the pickup library is the
same as the item's library but not the patron's branch,
even if there is a "Default holds policy by item type" rule that states
this item can only fill holds for patrons of the same library as the
item.
Test Plan:
1) Create a test record with 2 items with different itemtypes
2) Set the Default holds policy by item type for the first
item to "From any library"
3) Set the Default holds policy by item type for the second
item to "From home library"
4) Place a record level hold for a patron from another library,
but for pickup at the same library as the item is from
5) Rebuild the holds queue
6) View the holds queue, note the item is listed, though this
patron cannot place a hold on this item
7) Apply this patch
8) Repeat step 5, note the hold is no longer in the queue
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
automated tests pass, functional tests pass. Bug replicated, eradicated by patch.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I finally managed to reproduce this, patch works as described.
Passes tests and QA script, provided tests fail without patch, but
succeed with the patch.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 79660377470e8d6ba9057eb59645886410852c92)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 487638232f4c79d34e020411008254918a5267df
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon Apr 14 19:35:35 2014 -0300
Bug 12081: make tmpl_process3.pl delete ts temp files
This patch enable deletion of temp files used by
tmpl_process3.pl.
Just removed coments on existing code
To test:
1. Do a count of files on /tmp ( ls /tmp | wc -l )
2. Update preferred language
3. Count again, new files on /tmp
4. Apply the patch
5. Update again, check, no new files
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: I watched what temp files were actually in /tmp to make
sure other processes didn't magically increase/decrease
the number.
$ perl translate update {lang code}
generated 10 temporary files for me (2x5 po files). After
removing those ten files, and applying the patch, no
other files were generated.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
These lines has been commented by commit
a399dcefad193fc21ef2dc1fe31d07686ab2da46 without any apparent good
reason.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit de81d7abe43f3c2eed327b52e212bc790b406961)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d9e1a5de8eeb01a450321e4a64d1b9d3fa444405)
commit abd7a020b02dd51f0221291e2644ce2f9d5eb0fc
Author: Mason James <mtj at kohaaloha.com>
Date: Mon Sep 16 15:12:16 2013 +1200
Bug 10825: don't display enum/chron twice for items received via the serials module
TEST PLAN
---------
1) In the staff interface, display a bib that has one or more items
that were received in the serials module. The following query
can identify them:
-- in MySQL:
SELECT items.biblionumber,items.enumchron,serial.serialseq
FROM items,serial,serialitems
WHERE items.itemnumber=serialitems.itemnumber
AND serialitems.serialid=serial.serialid;
2) Note that in the holdings tab, the serial enumeration/chronology
is displayed twice.
3) Apply the patch
4) Refresh the screen
4) Now, the enum/chron should be displayed only once per item.
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, passes tests and QA script.
Template change only.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3f5636cac39ca1109a73b40be08d9dbef096a17c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 8ade958e84035b7132f2f9eb1837f137cc7937c6)
commit 768481e7d7d4ec648b24df47f6e68e18b7366781
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Apr 11 18:49:07 2014 +0000
Bug 12076: better detect an untranslatable template construct
Per bug 6458, template constructs of the form
<li [% IF (foo) %]selected="selected"[% END %]...
are forbidden as they can cause problems with translated templates.
However, the tt_valid.t test currently doesn't catch the variation
where '-' is used to suppress extra whitespace:
<li [%- IF (foo) -%]selected="selected"[%- END -%]...
This patch corrects the issue.
To test:
[1] Temporarily add the following line to a template file:
<li [%- IF a -%]a="a"[%- END -%] />
[2] Run prove -v xt/tt_valid.t. Note that no error is reported.
[3] Apply the patch, and rerun the tt_valid.t test. This time,
an error should be reported.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works well, detects the forbidden pattern
No koha-qa errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9a7eedce78af128772a36b5a16416fdad1a16fcc)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a7b28d19a71f16ebad3805139e7f82f268d77c5c)
commit ea8d10c3d32201e2da972bb0b1a8fb37a00506d7
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Apr 11 15:25:41 2014 +0000
Bug 11441: (follow-up) improve utility help text
This patch expands and reformats the help text displayed
when running remove_unused_authorities.pl -h.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit f4633cc5e51e8859f93be397eaee1370afc54099)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 38c4ad601bea09ec3b01587b417b88deadcc38c6)
commit 1e43d9f8817392322fcdeb289fc6f790f86722d7
Author: Juan Romay Sieira <juan.sieira at xercode.es>
Date: Tue Jan 21 12:46:09 2014 +0100
Bug 11441: enhance remove_unused_authorities.pl ability to select records
remove_unused_authorities.pl previously required that --aut be supplied
to specify one or more authority types to check for unlinked authority
records. If --aut was omitted, it would default to search for
records of authority type NC, which is not present in many (or any?)
Koha databases.
Now, if --aut is omitted, unlinked authority records of any type
are removed.
To test it:
Parse only PERSO_NAME authorities:
misc/migration_tools/remove_unused_authorities.pl -aut PERSO_NAME
Parse all authorities:
misc/migration_tools/remove_unused_authorities.pl
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0f6652d62bd9053c87de5b94eb6a35f68a3af4bf)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 770cab7d8da7e138629a80af1bef212e29b79f09)
commit 9e9b0cf78d4867d17093cd4c12707d0be7703604
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Thu Feb 27 10:16:21 2014 +0100
Bug 7267: Add account number to German PDF template
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout2pagesde
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check the account number from your vendor shows up with the other
vendor details
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ae030272a4f30104adefe9d6164eb99a0f4d8f73)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 53b8968e7d196f5a2634a48fcd17fecaf52bc4b2)
commit 09df2c1da99550a8f521825cc9894b616fc2bf0f
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Thu Feb 27 10:13:33 2014 +0100
Bug 7267: Add account number to English PDF templates
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout2pages
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check the account number from your vendor shows up with the other
vendor details
- Repeat with pdfformat::layout3pages
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 62151ced35329f94e4508b4973521464d48307c9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b2dd833cc9860b00422ab4f3dd18fda646ff40e5)
commit c36a7c8bccfce7fe9fb31b25b3c3ee9a0a14c775
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Thu Feb 27 10:17:44 2014 +0100
Bug 7267: Add account number to French PDF template
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout3pagesfr
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check the account number from your vendor shows up with the other
vendor details
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit a4841aae08cf60b4fcf628eee991738e2232cc80)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 35832122a3d43f00696ec209904ccb7643c8d05e)
commit 13c794c0fca9c38db18d9e0c9abbd4571c38a38b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Mar 1 09:33:27 2014 +0100
Bug 11828: (follow-up) add new option to OrderPdfFormat
To test:
- Check appearance of the OrderPdfFormat system preference
It will offer a pull down with options, including
"German 2-page"
Followed test plan. Patch behaves as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6372689f5dc7f0e9d34ffef3ad0c2a1ab6d6fb58)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 998f92a1fe9f632b108ef188d2575cc82401efdf
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Wed Feb 26 17:50:10 2014 +0100
Bug 11828: Add German translation of layout2pages PDF template
To test:
- Switch system preference OrderPdfFormat to pdfformat::layout2pagesde
- Create one or more baskets with some orders each.
- Add all baskets to one basket group
- Print the basket group
- Check everything is translated into German and the formatting/layout
looks ok
Followed test plan and compared English with German printout.
German version is OK.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit ffeb666994327b97e26bc372fd574d05a40e8336)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 069b6e62e5c491db1630e8bbbed7e17fd90aa86d)
commit 1dcb8c6ceb209d76309c036c167efbb9c10255bc
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Apr 11 10:32:37 2014 +0200
Bug 11885: (follow-up) add a CSS class to set subfield code bold
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit eab5480614edf9cc5895bc076d4e31dc77c1fe40)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 04f5eb91e15f1b8c89ff8f666256318d583ec634)
commit 56317289c2406907f365e8734a6399c813a30cb6
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Wed Apr 9 08:43:23 2014 -0300
Bug 11885: (follow-up) remove tabs
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 35142704d0a9831b6d4560cdf98a1bc9481414e9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a143c904dfedef41b8fd8e6e8a0ed0d18a9a1403)
commit 5727909b704ba6f4058ec1604d3aaa3474c39fd6
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Apr 2 20:22:44 2014 -0400
Bug 11885: (follow-up) make default styling consistent with previous look
Jonathan Druart raised the following three issues:
1/ subtags was bold before patch
2/ 1 dash existed between tag and tag name
3/ A space has been added ("606 #1 - Sujet nom commun"
becomes "606 # 1 Sujet nom commun", "101 ## - Langue"
becomes "101 # # Langue")
This patch addresses them in the following way:
1/ You will note that @ was not bold on the 0 tab.
Every other tab were bold. By making the similar template
into a procedure based on the 0XX tab, bolding was lost.
This patch bolds all subtags including the @, so that
the visible change is minimized.
2/ The dash was programmatically added in at the code stage
previously. This bug fix splits the the single concatenation
mess into parts which can be styled. This puts the dash back
into the template. However, it should be noted that the
spacing for the 0 tab's tag and tag description will have an
extra space after the hypen that was lacking before.
3/ <span>...</span><span>...</span> is different than
<span>...</span>
<span>...</span>
The later puts that extra space. This patch fixes that.
See comment 1 for the test plan.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described.
Small koha-qa errors fixed in followup
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 377dbfc73fb2a06b8a0d50731e2c8ba14968d68e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 86b80a5ba8df5b8e270706b8494311a92819fe78)
commit 69e0a1b9b2f622bcdab05c4ebe548bd8c548bc6a
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Tue Mar 4 08:57:11 2014 +0200
Bug 11885: fix inconsistent HTML in MARC Details
In Catalog > MARC Details, the HTML in the different tabs is slightly
inconsistent and doesn't differentiate different elements, making CSS
styling complicated or impossible:
* tab 0 has <p class="subfield_line"> whereas all the other tabs
have just <p>
* all other tabs wrap the subfield character in <b> tags, except
for tab 0
* the MARC tag title is a single div with the tag, the indicators
and the field description.
Attached patch folds all the tab outputs into a single TT BLOCK,
which is then reused. It also marks the separate parts of the tag
title in their own spans.
The output should be nearly identical to previous behaviour, minus
a dash from the tag title descriptions - it was used to separate
the tag from the description. The description can now be styled
separately from the tag itself, so the dash can be added with CSS,
if necessary.
Revised test:
1) Find a biblio
2) Edit the record so that there is something in every tab (0-9).
3) Save and then click 'MARC' in the left pane to view the
MARC details.
4) Note the contents of each tab.
5) Apply patch
6) Compare the MARC details output to what was noted. Should
be the same, minus a dash in each of the tag title descriptions.
Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0ea17a6a7689e7fb3d60ebb72cac72eefb142d8a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 18a5f1cb289261ffe613d7df22b428e12a5be072)
commit 87c0b157f97cce9748ab095bbee0e32144424a89
Author: Srdjan <srdjan at catalyst.net.nz>
Date: Fri Nov 1 21:24:11 2013 +1300
Bug 11184: correct attribute cloning for the patron editor
This patch fixes Perl warnings logged when setting up the
patron attribute form in the patron editor.
To test - Patron details entry page:
* Have ExtendedPatronAttributes enabled. Check that "Additional
attributes and identifiers" section behaves.
* Verify that editing and saving a patron record does not
result in the following sorts of entries in the Apache log:
se of uninitialized value $_ in hash element at memberentry.pl line 798
Use of uninitialized value in anonymous hash ({}) at memberentry.pl line 798
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested with different types of patron attributes:
- repeatable
- linked to an authorized value
- free text
Tested editing, adding, removing one of multiple, adding multiple,
etc. No regressions found.
Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3334f03d779dc41bac3fe6e25a0d08733fc030ca)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 4bcb5a0d885a308ef9e0992706c5db2db720df7a)
commit a950cb6a6bfdb51d8892653ad101f82a30df9f2d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Apr 9 09:08:27 2014 -0400
Bug 12056: fix untranslatable strings in calendar
In the calendar there are some strings in a JavaScript function which
are not properly wrapped in a function for translation. This patch
corrects this.
This patch also corrects some minor validation issues and spelling and
grammar issues, including those covered by Bug 12055.
To test, apply the patch and view the calendar in Tools -> Calendar.
When you hover your mouse over a day in the calendar you should see a
title tooltip indicating what kind of day/holiday it is and showing the
title of the holiday, if any.
To test that the strings are now being picked up for translation,
run translate update on a po file and confirm that the affected strings
are now present: "Weekly holiday," "Yearly holiday," etc.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works well. New strings on translation file. No koha-qa errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0837954cdda85549f5552dacefd3a5bc3e58292e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 754caccf77595840701fdad400fa02a298993344)
commit 805f823073f17927d88367858922e809f0c4c903
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Apr 4 17:11:15 2014 +0200
Bug 9075: Rename "type" to "material type" on OPAC XSLT detail and results
The label Material type better describes what the icon presents.
It is based on leader values of the MARC record.
Revised Test Plan
-----------------
1) In the staff client, set the OPAC system preference
OPACXSLTDetailsDisplay to 'default' and save.
2) In the staff client, set the OPAC system preference
OPACXSLTResultsDisplay to 'default' and save.
3) In the staff client, set the OPAC system preference
opacthemes to 'bootstrap' and save.
4) In the OPAC, search for biblio used in previous patch testing.
-- It should display "Type:"
6) Look at the biblio details
-- It should also display "Type:"
7) In the staff client, set the OPAC system preference
opacthemes to 'prog' and save.
8) In the OPAC, search for biblio used in previous patch testing.
-- It should display "Type:"
9) Look at the biblio details
-- It should also display "Type:"
10) Apply the patch
11) In the staff client, set the OPAC system preference
opacthemes to 'bootstrap' and save.
12) In the OPAC, search for biblio used in previous patch testing.
-- It should display "Material type:" this time.
13) Look at the biblio details
-- It should display "Material type:" this time.
14) In the staff client, set the OPAC system preference
opacthemes to 'prog' and save.
15) In the OPAC, search for biblio used in previous patch testing.
-- It should display "Material type:" this time.
16) Look at the biblio details
-- It should display "Material type:" this time.
17) Run the koha qa test tool.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Note: Just a simple string change.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
String change, works as advertised in staff, prog and bootstrap
OPAC.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 007c94ff20a5c9d9c3121849b42f820a0da5b869)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d0ea1ce586de9cd65edc92d32ae9c25e112b13fa)
commit cfd53e654cdd30c6a9bf47a63fe78c8574c552e1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Apr 11 11:46:44 2011 +0200
Bug 9075: Rename "type" to "material type" on staff XSLT detail and results
The label Material type better describes what the icon presents.
It is based on leader values of the MARC record.
Revised Test Plan
-----------------
1) Set the Staff system preference XSLTDetailsDisplay to
'default' and save.
2) Set the Staff system preference XSLTResultsDisplay to
'default' and save.
3) Click 'Search the catalog' tab in the search area.
4) Search for something
5) Look for a biblio that has 942$c set to some type.
-- It should display "Type:"
Or take a result and modify it to have a 942$c.
6) Look at the biblio details
-- It should also display "Type:"
7) Apply the patch
8) Search for the same biblio again.
-- It should display "Material type:" this time.
9) Look at the biblio details
-- It should display "Material type:" this time.
10) Run the koha qa test tool.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Note: This is a simple string substitution.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 4bdd8d9a69f72751f0429be5bc58afdd218a4bb0)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 97d9b102fa2fc1a3cf6cee1356b288c0b0d0a15f)
commit 9ee1e66e66218f68f086df6bf7e59ea9d7aaeb2c
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Apr 14 18:44:07 2014 +0000
Bug 12079: ensure that CheckReserves() includes reserve_id in its response
This patch modifies _Findgroupreserve so that its one caller,
CheckReserves(), would include the reserve_id field in the
hold request it returns.
Failure to include reserve_id in every circumstance resulted
in bug 11947. This patch is therefore a complementary fix for
that bug, but is not meant to preempt the direct fix for
that bug.
To test:
[1] Verify that t/db_dependent/Reserves.t passes.
[2] Verify that the following test plan taken from
the patch for bug 11947 works for this patch
*without* applying the patch for 11947:
* have a few borrowers, say 4.
* have a biblio with a single item (you can scale this up, it should
work just the same.)
* issue the item to borrower A
* have borrowers B, C, and D place a hold on the item
* return the item, acknowledge that it'll be put aside for B.
* view the holds on the item.
Without the patch:
* the hold priorities in the UI end up being "waiting, 2, 1" when they
should be "waiting, 1, 2".
* in the database "reserves" table, they're really "0, 2, 3" when they
should be "0, 1, 2".
With the patch:
* the hold priorities in the UI end up being "waiting, 1, 2"
* in the database, they're "0, 1, 2"
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Work as described. No koha-qa errors. Test pass
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 695fdebdee802387f45505a1350120727d3e2f7f)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 71efba230442c583d591f8107874cb10016c096a)
commit dfb3a62d42c3a408cabffc2b07f61b89d044fb69
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Apr 11 10:54:57 2014 +0200
Bug 12071: improve generation of Z39.50 search links
This patch fixes two problems with the generation of
links to execute a Z39.50 search from the staff client
catalog and cataloguing search results page.
First, if using URI::Escape 3.30 or earlier, performing a simple search
with a double quote (e.g., "histoire algerie"), the Javascript is broken
in results page because of :
function GetZ3950Terms(){
var strQuery="&frameworkcode=";
strQuery += "&" + "title" + "=" + ""histoire%20algerie"";
Second, the encoding of non-ASCII characters in the search
term was broken.
This patch moves URI escaping from Perl to template with uri TT filter.
Test plan :
- To reproduce the issue with double quotes, the server
must be running URI::Escape 3.30 or earlier; the current
version of URI::Escape properly escapes double quote.
- In staff interface, perform a search with double quotes
that will return no result, ie "aaa xxx"
=> Without patch, javascript is broken
=> With patch, javascript is not broken
- Click on Z3950 button on results page
=> Without patch, the Title input is empty
=> With patch, the Title input contains the search terms
Additional test:
Do a search with something like äöü and then click Z3950
button on results page.
Without patch, encoding is broken in Z3950 form
With patch, encoding is correct.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixed a few tabs. Passes tests and QA script.
I can't reproduce the Javascript problem, but I can reproduce
the Z39.50 encoding problem and can detect no regression.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 064d5478d31b05442e19b7d57f0af94d3422731e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 850df48328b00dfeba0f80bb4140fa2740651ceb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu May 8 16:36:10 2014 +0000
Bug 4068: (follow-up) use URI::Escape
This allows for suggestions that contain characters such
as the ampersand to have their status changed.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit fb8d47bedac13944d8efd6eec8286c3eff574782)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 6a78d2ba8e7d76549c7dc93178345e10cc0fc2af)
commit e56e87913e6e36427b6e39636e9ab1b3cf05d5ed
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue May 6 08:49:15 2014 -0400
Bug 4068: ensure accepting a suggestion does not hide the 'pending' tab
Prior to this patch:
1) Moving a suggestion from status 'pending' to 'accepted
- After saving only tab 'accepted' is shown.
2) Moving a suggestion back from 'accepted' to 'pending'
- After saving only tab 'pending' is shown.
Test Plan:
1) Verify the bug by taking the actions listed above
2) Apply this patch
3) Verify the bug no longer exists
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
It is not very elegant but I have nothing else to suggest.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 769f18a6a95b3757cb830b0765d93149d03a6495)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 2182bc1532d769b065ee76a6600ce6325b3bbb81)
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 17 +-
C4/Breeding.pm | 5 +-
C4/HoldsQueue.pm | 4 +-
C4/ImportBatch.pm | 2 +-
C4/Items.pm | 3 +-
C4/Reserves.pm | 6 +-
C4/Search.pm | 10 +-
Koha/DateUtils.pm | 43 ++-
acqui/basketgroup.pl | 3 +-
acqui/neworderempty.pl | 2 +-
acqui/pdfformat/layout2pages.pm | 2 +
.../{layout2pages.pm => layout2pagesde.pm} | 12 +-
acqui/pdfformat/layout3pages.pm | 2 +
acqui/pdfformat/layout3pagesfr.pm | 2 +
acqui/supplier.pl | 2 +-
authorities/blinddetail-biblio-search.pl | 4 +
catalogue/MARCdetail.pl | 12 +-
cataloguing/addbooks.pl | 4 +-
circ/pendingreserves.pl | 2 -
circ/reserveratios.pl | 3 +-
.../fr-FR/1-Obligatoire/authorised_values.sql | 33 +-
.../fr-FR/1-Obligatoire/authorised_values.txt | 4 +-
.../Obligatoire/framework_DEFAULT.sql | 3 +-
.../Optionnel/cataloguage_rapide.sql | 2 +-
.../Obligatoire/framework_DEFAULT.sql | 262 +++++++--------
.../Obligatoire/framework_DEFAULT.txt | 3 +-
.../intranet-tmpl/prog/en/css/staff-global.css | 4 +
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 3 +-
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 5 +-
.../en/modules/admin/preferences/acquisitions.pref | 1 +
.../prog/en/modules/catalogue/MARCdetail.tt | 338 +++----------------
.../prog/en/modules/catalogue/detail.tt | 14 +-
.../prog/en/modules/catalogue/results.tt | 2 +-
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../prog/en/modules/tools/holidays.tt | 35 +-
.../prog/en/modules/virtualshelves/sendshelf.tt | 186 +++++++++--
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +-
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 2 +-
koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt | Bin 12688 -> 12728 bytes
koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf | Bin 25541 -> 25887 bytes
.../intranet-tmpl/prog/pdf/layout2pagesde.odt | Bin 0 -> 12859 bytes
.../intranet-tmpl/prog/pdf/layout2pagesde.pdf | Bin 0 -> 23822 bytes
koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt | Bin 12973 -> 13023 bytes
koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf | Bin 26944 -> 27293 bytes
.../intranet-tmpl/prog/pdf/layout3pagesfr.odt | Bin 13284 -> 12854 bytes
.../intranet-tmpl/prog/pdf/layout3pagesfr.pdf | Bin 24394 -> 24401 bytes
.../opac-tmpl/prog/en/includes/opac-facets.inc | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-sendshelf.tt | 2 +-
.../prog/en/modules/opac-serial-issues.tt | 33 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +-
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +-
members/memberentry.pl | 4 +-
misc/cronjobs/advance_notices.pl | 38 ++-
misc/migration_tools/remove_unused_authorities.pl | 24 +-
misc/sip_cli_emulator.pl | 161 ++++++++++
misc/translator/tmpl_process3.pl | 8 +-
opac/opac-search.pl | 3 +-
opac/opac-sendshelf.pl | 31 +-
suggestion/suggestion.pl | 16 +-
t/db_dependent/Biblio.t | 339 ++++++++++++++------
t/db_dependent/HoldsQueue.t | 7 +-
t/db_dependent/Reserves.t | 5 +-
virtualshelves/sendshelf.pl | 21 +-
xt/tt_valid.t | 2 +-
66 files changed, 1009 insertions(+), 736 deletions(-)
copy acqui/pdfformat/{layout2pages.pm => layout2pagesde.pm} (94%)
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.odt
create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pagesde.pdf
create mode 100755 misc/sip_cli_emulator.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list