[koha-commits] main Koha release repository branch master updated. v18.05.00-1416-gd013562
Git repo owner
gitmaster at git.koha-community.org
Thu Nov 8 19:33:22 CET 2018
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 d013562745a9683378f65316c15f955e2b6e25d3 (commit)
via 92944ae3a4944c61e7c491a9aef23822a8d543d9 (commit)
via 3bd68dace98a6cf72c862a512b11851299f1b333 (commit)
via ee0c8f319a5cfa9a23d6ac2be0cd2d6ebf70beed (commit)
via d1c6e70b446ff0f099f42e29352c5b718b36b0b1 (commit)
via eae72c6712d1eec517afb428ca0c013aada4c706 (commit)
via 7ada579ae056537cd8fb87eaaedaabd84ec62689 (commit)
via 6d6bc705ec4f9697076dbb01ebdafced5fa92492 (commit)
via d708255c7a4d981c7c7bdd0644a75202ec43b297 (commit)
via 41ebda2d95f6d01c068a7f4ab82c160105050678 (commit)
via b844c3c46fac6d35f6bfb08fb18294912ef0dcbb (commit)
via 4f51ad613699919fae357a3ae8bc1248d0b4fc6f (commit)
via 222a0efa5e25e27b00e4db55bb4c403296b4a694 (commit)
via 5cd4b1cc86766d6c2723422ffb762aeb8c1f0a9f (commit)
via bbe179a1d50bba9a7d101b42d05d924335bbff38 (commit)
via d658cb6f7ecb18845a78d4708ee63ad1126f220f (commit)
via 1883508b2ae38216e9481c3356f517231e933738 (commit)
via 9e75d96d62e4ed4ccec911920ed2948c16e6ce1d (commit)
via 6aa113b28b1bd1aff0ad370a12f50ed25789d8e1 (commit)
via bf5d8115f5db26b43f829932b657bf864dce7a04 (commit)
via 1c58a309f1bbbc3650924f2520b8b021a9b2a262 (commit)
via 64f445022b1c1f7bce64ac75e2d76e8447798ec0 (commit)
via 32a50dc45ee561056c40e4c032c321ad5ccd5c68 (commit)
via 52a851f32d072985a0ed84a17902409e0d4f6b35 (commit)
via 1f9aa587311515400ea6579dcb25642cb0512711 (commit)
via 3ac989e3c5ca5f5f59870d31cd5284fd064b30d9 (commit)
via 7426fab45eed5f73e821f29a8e990f3ae6d5b3f1 (commit)
via 587e12100f4c35caa395e27815fcc03e6bfb4e5d (commit)
via 347cc47fe4609d208715c171ed0612e5ff8e1ee1 (commit)
via ff2040d9dc51a0efbc0ff2d56f741deb1ed4133a (commit)
via 0372a9e95e7baf4e5699c372d1ba5550d351998d (commit)
via fccbdf4daea0a2ecc227f5d32e4f858be3820e65 (commit)
via 87b877e492c317ecf6b6e5cfe5c942e11540aef1 (commit)
via f11a107b5dea8a6d936f8c75458be8e1e972a3ad (commit)
via a74f8eb6343079eef1af1ccdd1f5e059f8712383 (commit)
via 07579849d664a2156282410271a2470ce0ce6fdc (commit)
from 09c76aa01020dc68c22136a6549eeb90530d37e4 (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 d013562745a9683378f65316c15f955e2b6e25d3
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 8 18:00:13 2018 +0000
Bug 12365: (RM follow-up) Fix schema files
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 92944ae3a4944c61e7c491a9aef23822a8d543d9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 31 11:13:49 2018 -0300
Bug 15395: Fix QA failure - filter not found
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3bd68dace98a6cf72c862a512b11851299f1b333
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 31 11:02:56 2018 -0300
Bug 15395: Use POSIX::setlocale
To keep compatibility with jessie (that have Message::Locales 1.23, so
without setlocale)
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ee0c8f319a5cfa9a23d6ac2be0cd2d6ebf70beed
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Oct 25 15:04:46 2018 +0200
Bug 15395: Do not process template files that do not use i18n.inc
It should make the string extraction process a little faster
For the record, I timed some parts of the process to see why it was so
slow, and without surprises the most time-consuming task is the Perl
code analysis by PPI with an average time of 50ms by "template block" on
my machine.
Multiply that by the number of template blocks (approximatively 900),
that gives us 45 seconds just for this task.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d1c6e70b446ff0f099f42e29352c5b718b36b0b1
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Oct 25 14:06:03 2018 +0200
Bug 15395: Make QA test script happy
It is not totally happy because of the template file used in tests.
It has line breaks inside TT directives and QA test script complains
because line breaks in TT directives confuse the current translatable
strings extractor.
However this patchset (along with bug 20988) will hopefully make the
current extractor obsolete and thus make the 'no-line-breaks' rule
useless
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit eae72c6712d1eec517afb428ca0c013aada4c706
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Oct 25 13:44:43 2018 +0200
Bug 15395: Add unit tests for extract_messages_from_templates
Because LangInstaller use FindBin to define some paths, the test
produces warnings about a missing directory. I'm not sure how we can
avoid that.
Test plan:
1. prove t/LangInstaller.t
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7ada579ae056537cd8fb87eaaedaabd84ec62689
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Oct 25 11:22:24 2018 +0200
Bug 15395: Do not use nl_putenv, use $ENV instead
nl_putenv is only useful on Windows systems
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6d6bc705ec4f9697076dbb01ebdafced5fa92492
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Oct 25 10:48:23 2018 +0200
Bug 15395: Make msgmerge quiet
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d708255c7a4d981c7c7bdd0644a75202ec43b297
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Dec 15 02:31:03 2015 +0100
Bug 15395: Allow correct handling of plural translation
Locale::Maketext does not allow correct handling of plural translation
for languages that have more than one plural forms.
Locale::Messages does.
So Koha::I18N is now a wrapper around Locale::Messages, just like
Locale::TextDomain, and export the same symbols as Locale::TextDomain.
You can refer to documentation of Locale::TextDomain to know how to use
exported subroutines.
Example usage:
__("Hi")
__x("Hi {name}", name => 'Bob')
__n("item", "items", $num_items)
__nx("one item", "{count} items", $num_items, count => $num_items)
__p("Bibliographic record", "item")
This patch also brings Koha::I18N power to Template::Toolkit templates
by adding a TT plugin.
This plugin can be used like this:
[%# USE the plugin and define some macros %]
[% PROCESS 'i18n.inc' %]
[%# tn is the equivalent of __n %]
[%# macro names can't start with underscore, t is for "translate" %]
[% tn('item', 'items', num_items) %]
Extraction of strings from templates is a bit complicated and use
Template::Parser and PPI. Template is compiled into Perl code and then
analyzed by PPI. It is slow, but should be correct even with complex
constructions.
Remove dependency to Locale::Maketext and Locale::Maketext::Lexicon
Add dependency to Locale::Messages and PPI
Test plan for translation in Perl code:
1. Open a .pl script or .pm module with your favorite text editor
2. Add 'use Koha::I18N;' in the beginning of file
3. Use one of the subroutines exported by Koha::I18N and be sure to have
a way to visualize the result (pass result to the template for
example, or simply warn and watch the log file)
4. cd misc/translator && ./translate update fr-FR # try other languages
5. Open misc/translator/po/fr-FR-messages.po and translate your
string(s)
You may need to change the "Plural-Forms" header. See
https://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html
6. ./translate install fr-FR
7. Use your web browser to go to the page that should display the
translation, change language and verify the translation is correct
8. prove t/Koha/I18N.t
Test plan for translation in templates:
1. Open a template file (.tt or .inc) with your favorite text editor
2. Add the PROCESS directive mentioned above in the beginning of file
3. Use one of the t* macros defined in i18n.inc. They are used like
their "__" equivalent, with one difference: the 'x' variants take a
hashref instead of a hash as last parameter
4. cd misc/translator && ./translate update fr-FR
5. Open misc/translator/po/fr-FR-messages.po and translate your
string(s)
6. ./translate install fr-FR
7. Use your web browser to go to the page that should display the
translation, change language and verify the translation is
correct
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 41ebda2d95f6d01c068a7f4ab82c160105050678
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 8 11:03:15 2018 -0300
Bug 15184: Fix bad merge conflict with created_by
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b844c3c46fac6d35f6bfb08fb18294912ef0dcbb
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Oct 28 16:35:09 2018 +0000
Bug 15184: Fix TT filter
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4f51ad613699919fae357a3ae8bc1248d0b4fc6f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 15 16:52:41 2018 -0300
Bug 15184: Add missing html filters
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 222a0efa5e25e27b00e4db55bb4c403296b4a694
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Sep 16 09:25:16 2018 -0700
Bug 15184: Improve styling
- Move "Show inactive" checkbox closer to the "Show inactive" text.
- Put more space between the "Show inactive" checkbox and the "The
original..." text
- Add "Check boxes to duplicate the original values" at the top of the
fieldset
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5cd4b1cc86766d6c2723422ffb762aeb8c1f0a9f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 15 14:00:31 2018 -0700
Bug 15184: Change permission (+x) on .pl
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bbe179a1d50bba9a7d101b42d05d924335bbff38
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 7 13:46:12 2018 -0300
Bug 15184: Set created_by to the logged in user
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d658cb6f7ecb18845a78d4708ee63ad1126f220f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 7 13:43:15 2018 -0300
Bug 15184: Do copy items for not a serial OR if items are created on ordering
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1883508b2ae38216e9481c3356f517231e933738
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 31 13:40:08 2018 -0300
Bug 15184: Remove the checkboxes on the last step
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9e75d96d62e4ed4ccec911920ed2948c16e6ce1d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 29 15:17:40 2018 -0300
Bug 15184: add missing filters
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6aa113b28b1bd1aff0ad370a12f50ed25789d8e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 29 15:06:42 2018 -0300
Bug 15184: Add POD
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bf5d8115f5db26b43f829932b657bf864dce7a04
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 27 15:48:31 2018 -0300
Bug 15184: Add the ability to duplicate existing order lines
This patchset adds the ability to duplicate existing order lines to a
given basket. It will help acquisitions of serials of when the same
publication is ordered frequently.
The workflow will be:
- Create a new basket
- Use the "Add to basket" button
- Select the new entry "From existing orders (copy)"
- Search and select the order you want to duplicate
- Define some default values for these orders
- Duplicate!
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1c58a309f1bbbc3650924f2520b8b021a9b2a262
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 27 15:48:23 2018 -0300
Bug 15184: Add the ordernumbers filters to GetHistory
It adds the ability to return the result of GetHistory given a list a
ordernumbers
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 64f445022b1c1f7bce64ac75e2d76e8447798ec0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 27 15:47:06 2018 -0300
Bug 15184: Prepare the ground - Move funds and sort fields autoupdate
We are going to reuse the same logic: when a fund is selected the
statistic values are automatically updated.
Let move it to make it reusable more easily and isolate the code.
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 32a50dc45ee561056c40e4c032c321ad5ccd5c68
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jul 27 15:46:32 2018 -0300
Bug 15184: Prepare the ground - Move order search filters
We are going to reuse these filters so we move it to a separate include
file.
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 52a851f32d072985a0ed84a17902409e0d4f6b35
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 8 15:42:53 2018 +0000
Bug 20312: DBRev 18.06.00.057
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1f9aa587311515400ea6579dcb25642cb0512711
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 8 15:51:37 2018 +0000
Bug 20312: Add missing filters
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3ac989e3c5ca5f5f59870d31cd5284fd064b30d9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 8 15:41:18 2018 +0000
Bug 20312: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7426fab45eed5f73e821f29a8e990f3ae6d5b3f1
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 31 13:53:16 2018 +0000
Bug 20312: (QA follow-up) Make display syspref driven
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 587e12100f4c35caa395e27815fcc03e6bfb4e5d
Author: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Date: Fri Aug 17 16:45:23 2018 -0400
Bug 20312: Add a link to last consulted patron
This new feature adds a link to the last patron consulted
in the staff site. It uses cookies to save this information.
When a staff site user accesses a patron record, the ID, name
and card number of the patron will be saved in the cookie.
To test:
1- Apply the patch
2- Go to a patron details' page
4- Go to another page
4- Verify that the link "Last patron" appears on the top-right
corner of the screen
5- Click on the link
6- Verify that you are at the patron's checkout page
7- Click on the "X" button next to the "Last patron" link
8- The link should be gone
9- Go to another page
10- The link shouldn't appear (until the next patron detail's
page)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 347cc47fe4609d208715c171ed0612e5ff8e1ee1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 8 11:15:04 2018 -0300
Bug 12365: Fix GetHardDueDate.t test
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ff2040d9dc51a0efbc0ff2d56f741deb1ed4133a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 8 15:35:50 2018 +0000
Bug 21079: DBRev 18.06.00.056
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0372a9e95e7baf4e5699c372d1ba5550d351998d
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Nov 8 14:28:48 2018 +0000
Bug 21079: (follow-up) Move from Try::Tiny to eval
In line with similar examples already in Koha, we now eval the
transaction, instead of putting it in a try/catch block.
This patch also addressed the other comments made in
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21079#c10
- AutoCommit & RaiseError are now reset
- Don't set the version if the update fails
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fccbdf4daea0a2ecc227f5d32e4f858be3820e65
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue Jul 17 14:49:47 2018 +0100
Bug 21079: Unify metadata schema across backends
This patch contains a database upgrade that takes appropriate metadata
properties relating to articles in the FreeForm backend and creates
metadata that corresponds with the metadata being created by the BLDSS
backend. This enables us to create templates that can display metadata
equally across any backends that contain this metadata;
To test:
- Ensure you have at least one article request created with the FreeForm backend
- Check the metadata for the request:
=> TEST: You should have properties such as 'article_title', 'article_author' populated
=> TEST: You should NOT have properties such as 'container_title' &
'pages'
- Run the upgrade
=> TEST: For the same requests you should now have the following
properties (if their values were originally populated):
- container_title (this should correspond with what *was* 'title')
- title (this should correspond with 'article_title')
- pages (this should correspond with 'article_pages')
- author (this should correspond with 'article_author')
Signed-off-by: Stephen Graham <s.graham4 at herts.ac.uk>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 87b877e492c317ecf6b6e5cfe5c942e11540aef1
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Nov 7 13:43:52 2018 -0300
Bug 21413: Fix condition to avoid operator bnding isssues
The original WHERE condition wasn't enclosed in parenthesis, and hence
was subject to binding precedence issues in some situations.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f11a107b5dea8a6d936f8c75458be8e1e972a3ad
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Oct 27 13:08:18 2018 +0000
Bug 21413: (QA follow-up) Rename new option
Trying to make the terminology a little more consistent
as we already use items instead of copies directly
above and leaning on the description of the page it
refers to.
Old:
Skip copies marked as waiting holds
New:
Skip items on hold awaiting pickup
Skip items on hold awaiting pickup
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a74f8eb6343079eef1af1ccdd1f5e059f8712383
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Sep 26 11:41:14 2018 -0300
Bug 21413: Inventory - Skip items with waiting holds
This patch enables items to be skipped for inventory stocktaking
if the item is currently a waiting hold. The intention is to skip
items that should be on the holds waiting shelf in the library.
Test Plan:
1) Apply this patch
2) Generate a list of barcodes ordered by callnumber
3) Select one of those items and place it on hold, then confirm the hold
4) Remove that barcode from the list of barcodes
5) Browse to the inventory tool, choose your barcodes file
6) Run the inventory tool with that barcode file.
7) Note the tool says that item should have been scanned
8) Click the browsers back button to return to the previous page
9) Check the checkbox for "Skip copies marked as waiting holds"
10) Run the tool again, not it does not flag that item as previously
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 07579849d664a2156282410271a2470ce0ce6fdc
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Sep 26 11:08:59 2018 -0300
Bug 21413: Unit tests
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Items/GetItemsForInventory.t
=> FAIL: Tests fail!
- Apply the next patches on the bug
- Run:
k$ prove t/db_dependent/Items/GetItemsForInventory.t
=> SUCCESS: Tests pass!
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 5 +
C4/Installer/PerlDependencies.pm | 12 +-
C4/Items.pm | 6 +
Koha.pm | 2 +-
Koha/Acquisition/Order.pm | 99 ++++-
Koha/I18N.pm | 192 +++++++--
Koha/Schema/Result/Issuingrule.pm | 4 +-
Koha/Template/Plugin/I18N.pm | 140 +++++++
acqui/duplicate_orders.pl | 177 ++++++++
acqui/histsearch.pl | 87 ++--
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 111 +++++
.../intranet-tmpl/prog/css/src/staff-global.scss | 28 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../en/includes/acquisitions-add-to-basket.inc | 1 +
.../prog/en/includes/blocking_errors.inc | 2 +
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 3 +
.../prog/en/includes/filter-orders.inc | 97 +++++
.../intranet-tmpl/prog/en/includes/header.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/includes/i18n.inc | 38 ++
.../prog/en/includes/last-borrower.inc | 4 +
.../prog/en/modules/acqui/addorderiso2709.tt | 65 +--
.../prog/en/modules/acqui/duplicate_orders.tt | 429 ++++++++++++++++++++
.../prog/en/modules/acqui/histsearch.tt | 98 +----
.../en/modules/admin/preferences/staff_client.pref | 6 +
.../prog/en/modules/tools/inventory.tt | 4 +
koha-tmpl/intranet-tmpl/prog/js/funds_sorts.js | 67 +++
koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 28 ++
koha-tmpl/opac-tmpl/bootstrap/en/includes/i18n.inc | 38 ++
misc/translator/LangInstaller.pm | 210 ++++++++--
t/Koha/I18N.t | 62 +++
t/Koha/I18N/po/xx_XX/LC_MESSAGES/Koha.mo | Bin 0 -> 1370 bytes
t/LangInstaller.t | 108 +++++
t/LangInstaller/templates/simple.tt | 35 ++
t/db_dependent/Acquisition.t | 7 +-
t/db_dependent/Circulation/GetHardDueDate.t | 1 +
t/db_dependent/Items/GetItemsForInventory.t | 115 +++++-
tools/inventory.pl | 4 +
38 files changed, 1996 insertions(+), 293 deletions(-)
create mode 100644 Koha/Template/Plugin/I18N.pm
create mode 100755 acqui/duplicate_orders.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/i18n.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/funds_sorts.js
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/i18n.inc
create mode 100755 t/Koha/I18N.t
create mode 100644 t/Koha/I18N/po/xx_XX/LC_MESSAGES/Koha.mo
create mode 100644 t/LangInstaller.t
create mode 100644 t/LangInstaller/templates/simple.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list