[koha-commits] main Koha release repository branch master updated. v18.11.00-883-g9712c8d
Git repo owner
gitmaster at git.koha-community.org
Thu Mar 21 19:47:09 CET 2019
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 9712c8dcacbd33ed270fb455d8ce06d8d14b97c2 (commit)
via a98e7521be9b01acd3f13c5e233072e615701099 (commit)
via 00697631d7905d687b5ccba9cbd3effe40ece67b (commit)
via cb3831317f343a214f5f5fe363de5977a99b8bb9 (commit)
via bb231e6208fb8e3f0fccc249da2b8a94e715c244 (commit)
via 6e3da5397e00d4f87bcac20b9965fb317707a14f (commit)
via e43e972ec57d9e07839ec2d678652469b9995bd5 (commit)
via 28ff4f6393e65ebfca60c05611fafc926f1fb239 (commit)
via 48e9082043115416063e66217db60f0054b68088 (commit)
via bc36d8e06b3b43b09b655718f7fad5a1780b246a (commit)
via 0aa4f355d4fa4f973530290044b694ddd2a55e33 (commit)
via 0aeae50229c6a381fe112644b72eefd6848fb655 (commit)
via 876323cf5bb5185834a875f3da29ac33f7760ef4 (commit)
via 2f5e839bf780955d228c9672abce9d6e5ad1aedf (commit)
via 9922d2bf40e2b7429f300d4d73134f9fef3b8c65 (commit)
via ca28c83abbd449c7e5f1d7b86760b7fb53741988 (commit)
via ab4cf23286219b473820b61bca82c884de274e80 (commit)
via d9b3d0fa36869a40b9db65375dba4972913697d8 (commit)
via 4ccbae8879a386a1846bb48c18b3722f936dc983 (commit)
via b17ca2b701fab5307330b6196590e5d3048978e1 (commit)
via 00cf699c82aeea46ef5a72bf344fd306430c5aba (commit)
via bf0882252f242efa8cc9f08625c0abe305d205a6 (commit)
via 7fe5f8cd2c2d1eddd2a835fb644c262cffcbd34c (commit)
via aea90223d6f250d6f74e00244abbb3e0334107b5 (commit)
via cde6c897d507d8e93453ed62c1f7f579744b9ded (commit)
via 2b52e54b201ea8917ac6f6f0306cf36218aead9e (commit)
via 821e754e02b576320c29f00bf3d7d04f2655018a (commit)
via dbcd0511e7580cce996965d54982bfcce7c97b14 (commit)
via 1f35fa518f38e5eea55886b74fb495b3f6105763 (commit)
via a57723fc594e92a197da9470959d4067e3d63221 (commit)
from dccc6242fffe8133e07927658327d4bb0d05dd48 (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 9712c8dcacbd33ed270fb455d8ce06d8d14b97c2
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 21 18:21:32 2019 +0000
Bug 21683: DBRev 18.12.00.030
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a98e7521be9b01acd3f13c5e233072e615701099
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Mar 8 06:22:08 2019 +0000
Bug 21683: (follow-up) Remove last occurences of statistics.proccode
columns.def is used to define descriptions of db columns in guided
reports
test is not useful anymore IMO
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 00697631d7905d687b5ccba9cbd3effe40ece67b
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Mar 7 08:12:30 2019 +0000
Bug 21683: (QA follow-up) Drop statistics.proccode
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cb3831317f343a214f5f5fe363de5977a99b8bb9
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Feb 22 14:29:50 2019 +0000
Bug 21683: (QA follow-up) Koha::Account::Line rebase fix
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bb231e6208fb8e3f0fccc249da2b8a94e715c244
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 22 14:33:17 2019 +0000
Bug 21683: (follow-up) Polish the change - based on feedback
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6e3da5397e00d4f87bcac20b9965fb317707a14f
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Feb 22 14:27:21 2019 +0000
Bug 21683: Remove accountlines.accountno
Test plan:
1) Play with fines, should work OK
2) Try to print receipts on fines - prinfeercpt.pl, printinvoice.pl
3) git grep getnextacctno -> no occurences
4) git grep accountno should return only:
installer/data/mysql/atomicupdate/bug_21683_remove_column_accountno.perl
installer/data/mysql/update22to30.pl
misc/release_notes/release_notes_3_10_0.txt
misc/release_notes/release_notes_3_22_0.txt
5) prove
t/db_dependent/Accounts.t
t/db_dependent/ILSDI_Services.t
t/db_dependent/Stats.t
t/db_dependent/Koha/Account.t
Rescued-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e43e972ec57d9e07839ec2d678652469b9995bd5
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Oct 26 11:02:58 2018 +0000
Bug 21683: Database update
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 28ff4f6393e65ebfca60c05611fafc926f1fb239
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Mar 20 15:52:07 2019 +0000
Bug 13763: (follow-up) Strip leading whitespace characters from input barcode
this makes the work with barcodes from input consistant on checking out,
checking in and renewing
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 48e9082043115416063e66217db60f0054b68088
Author: Hayley Mapley <hayleymapley at catalyst.net.nz>
Date: Thu Mar 14 04:58:31 2019 +0000
Bug 13763: Added check for filter syspref in renew.pl
In Circulation->Renew, the renew feature does not check the system
preference itemBarcodeFilter to see whether the barcode needs to be
converted. This patch fixes this, adding a check for the system pref and
applying it accordingly to convert the barcode if it is needed.
Test plan:
1) In Circulation->Renew, enter a barcode that you know exists in the
catalogue but add extra spaces, breaking up the barcode. Note that this
fails with a warning that says 'No item matches this barcode'
2) In system Preferences, set the itemBarcodeInputFilter pref to Remove
spaces and repeat step1. Note that the result is the same as in step 1
3) Apply the patch
4) Repeat step 1, and note that the filter removes the spaces and the
item is renewed (or gives an error that indicates it recognises the
barcode)
Sponsored-by: Catalyst IT
Signed-off-by: Bin Wen <bin.wen at inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bc36d8e06b3b43b09b655718f7fad5a1780b246a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 21 18:11:29 2019 +0000
Bug 18736: DBRev 18.12.00.029
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0aa4f355d4fa4f973530290044b694ddd2a55e33
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 1 12:51:54 2018 -0300
Bug 19469: Fix record links on multi holds
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0aeae50229c6a381fe112644b72eefd6848fb655
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jan 15 15:06:06 2019 +0000
Bug 18736: Calculate tax depending on rounding
Marcel's comments pointed out that while I tried to avoid storing
rounded values it is required for tax generation.
This patch makes that change and adds test coverage and POD for
populate_order_with_prices
To test:
Follow plan on other patches, ensure that orders and totals match on the
basket, invoice, and budget pages
prove -v t/db_dependent/Acquisition/populate_order_with_prices.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 876323cf5bb5185834a875f3da29ac33f7760ef4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 14 10:46:56 2018 +0100
Bug 18736: (QA follow-up) Resolve uninitialized warn from Biblio.pm L3334
Running t/db/Budgets.t:
Use of uninitialized value in join or string at C4/Biblio.pm line 3334.
Test plan:
Run again. Verify no warnings left.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2f5e839bf780955d228c9672abce9d6e5ad1aedf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 28 11:20:49 2018 +0200
Bug 18736: (QA follow-up) Change to signed, add large int test
[1] Add trivial subtest in t/Number/Price.t
Checking a negative number and a large number for the MAX_INT change.
Note: Confusing to have t/Prices.t too.
[2] Change UNSIGNED to SIGNED in get_rounding_sql. Although I did not spot
problems with negative prices, we theoretically could while casting.
cast(-2 as unsigned) == 18446744073709551614
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9922d2bf40e2b7429f300d4d73134f9fef3b8c65
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Sep 28 10:09:01 2018 +0200
Bug 18736: (QA follow-up) Cosmetic changes
[1] Resolve warnings like:
Use of uninitialized value $rounding_pref in string eq at /usr/share/koha/devclone/C4/Acquisition.pm line 2040.
[2] Fixing unusual use of whitespace too.
[3] Remove list operator from get_rounding_sql return. Only used in scalar
context.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ca28c83abbd449c7e5f1d7b86760b7fb53741988
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Sep 20 19:34:10 2018 +0000
Bug 18736: (follow-up) Remove duplicate code and adjust tests
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ab4cf23286219b473820b61bca82c884de274e80
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Sun Sep 16 01:21:16 2018 +0000
Bug 18736: (follow-up) cast as UNSIGNED instead of INTEGER
More recent MySql versions require the use of SIGNED or UNSIGNED rather
than INTEGER. UNSIGNED will still work in older installs
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d9b3d0fa36869a40b9db65375dba4972913697d8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 24 11:11:19 2018 +0000
Bug 18736: Unit tests for GetBudgetHierarchy
prove -v t/db_dependent/Budgets.t
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4ccbae8879a386a1846bb48c18b3722f936dc983
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Aug 24 01:22:35 2018 +0000
Bug 18736: (follow-up) Fix missing rounding and bad formatting
This patch:
Adds a missing use
Uses 'Koha::Number::Price->round()' instead of 'format()' to ensure numeric
returns
Ensures too big numbers don't crash round()
Uses syspref in 'GetBudgetHierarchy'
To test:
Follow previous test plan
Check values on admin/aqbudgets.pl are affected by syspref
Ensure values throughout acquisitions are correctly calculated/displayed
(even when greater than 1,000)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b17ca2b701fab5307330b6196590e5d3048978e1
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Apr 17 23:39:57 2018 +0000
Bug 18736: (follow-up) Add missing test cases
We now fully cover GetBudgetsPlanCell in these tests
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 00cf699c82aeea46ef5a72bf344fd306430c5aba
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 17 14:37:11 2018 +0000
Bug 18736: (follow-up) Add tests and FIXME for GetbudgetsPlanCell
prove t/db_dependent/Budgets.t
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bf0882252f242efa8cc9f08625c0abe305d205a6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jun 6 10:37:17 2017 -0400
Bug 18736: Unit tests for rounding
Unit tests to highlight the issue
To test:
Prove t/db_dependent/Budgets.t
prove t/Acquisition.t
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7fe5f8cd2c2d1eddd2a835fb644c262cffcbd34c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Dec 28 15:15:47 2017 +0000
Bug 18736: Use rounding syspref to determine correct prices in calculations
To test:
Place an order (no tax just for simplicity)
listprice/rrp = 16.99
discount = 42%
quantity = 8
estimated calculated at 9.85
but order total is 78.83, but 8 times 9.85 = 78.80
Apply patches, set OrderPriceRounding syspref to 'Nearest cent'
Not order total is now as expected
View ordered.pl and confirm values are correct
Complete order, view invoice and confirm values
View spent.pl and confirm values
Go through acquisitions module and confirm prices throughout are
correct.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit aea90223d6f250d6f74e00244abbb3e0334107b5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Dec 28 15:11:11 2017 +0000
Bug 18736: Add OrderPriceRounding syspref
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cde6c897d507d8e93453ed62c1f7f579744b9ded
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Mar 20 14:35:24 2019 +0000
Bug 22330: (QA follow-up) Fix number of tests in Reserves.t
Test plan:
prove t/db_dependent/Reserves.t
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2b52e54b201ea8917ac6f6f0306cf36218aead9e
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Wed Mar 20 14:29:25 2019 +0000
Bug 22330: (QA follow-up) Enable datatable in patron search
Test plan:
Try to search patron for circulation (or for creating hold), when there
are more than 1 patron, you should see a table with patrons found.
--> without this patch, the datatable is not created (for example
sorting the table by clicking to column heading does not work)
--> with this patch, the datatable works
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 821e754e02b576320c29f00bf3d7d04f2655018a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Mar 20 07:02:11 2019 -0400
Bug 22330: (QA follow-up) Fix QA script failure
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dbcd0511e7580cce996965d54982bfcce7c97b14
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 11 14:26:49 2019 -0400
Bug 22330: (QA follow-up) Remove duplicate use lines, combine and sort remaning lines
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1f35fa518f38e5eea55886b74fb495b3f6105763
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Feb 13 15:45:28 2019 -0500
Bug 22330: Cache item and library objects when building the holds queue
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a57723fc594e92a197da9470959d4067e3d63221
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Feb 8 14:46:18 2019 -0500
Bug 22330: Transfer limits should be respected for placing holds in staff interface and APIs
Branch transfer limits are respected for placing holds in the OPAC but nowhere else. This should be remedied.
Test Plan:
1) Set up a branch transfer limit from Library A to Library B
2) Verify you cannot set up a hold for an item from Library A for pickup at Library B from the staff interface ( without overriding )
3) Verify you cannot place that hold via ILS-DI
4) Verify you cannot place that hold via SIP
4) Verify a forced hold from Library A to Library B will not show up in the holds queue
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 27 ---
C4/Acquisition.pm | 108 +++++++++---
C4/Biblio.pm | 2 +-
C4/Budgets.pm | 22 ++-
C4/Circulation.pm | 2 +-
C4/HoldsQueue.pm | 16 +-
C4/ILSDI/Services.pm | 12 +-
C4/Reserves.pm | 42 +++--
C4/SIP/ILS/Transaction/Hold.pm | 6 +
C4/Stats.pm | 10 +-
Koha.pm | 2 +-
Koha/Account.pm | 24 ---
Koha/Account/Line.pm | 1 -
Koha/Number/Price.pm | 7 +-
Koha/REST/V1/Patrons/Account.pm | 1 -
Koha/pdfformat/layout3pages.pm | 7 +-
Koha/pdfformat/layout3pagesfr.pm | 1 +
acqui/basket.pl | 8 +-
acqui/basketgroup.pl | 10 +-
acqui/invoice.pl | 14 +-
acqui/ordered.pl | 3 +-
acqui/parcel.pl | 10 +-
acqui/spent.pl | 3 +-
circ/renew.pl | 2 +
installer/data/mysql/kohastructure.sql | 3 -
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 20 +++
koha-tmpl/intranet-tmpl/prog/en/columns.def | 1 -
.../en/modules/admin/preferences/acquisitions.pref | 9 +-
.../prog/en/modules/reserve/request.tt | 18 +-
members/printfeercpt.pl | 1 -
members/printinvoice.pl | 1 -
misc/cronjobs/staticfines.pl | 9 +-
misc/maintenance/fix_accountlines_date.pl | 6 +-
.../fix_accountlines_rmdupfines_bug8253.pl | 14 +-
reports/orders_by_fund.pl | 4 +-
reserve/request.pl | 6 +-
t/Acquisition.t | 68 +++++++
t/Number/Price.t | 16 +-
t/db_dependent/Accounts.t | 4 -
.../Acquisition/populate_order_with_prices.t | 165 +++++++++++++++++
t/db_dependent/Budgets.t | 185 +++++++++++++++++++-
t/db_dependent/Holds/HoldFulfillmentPolicy.t | 20 ++-
t/db_dependent/HoldsQueue.t | 74 +++++++-
t/db_dependent/ILSDI_Services.t | 96 +++++++++-
t/db_dependent/Reserves.t | 16 +-
t/db_dependent/Stats.t | 7 +-
t/lib/TestBuilder.pm | 3 -
48 files changed, 895 insertions(+), 192 deletions(-)
create mode 100644 t/Acquisition.t
create mode 100644 t/db_dependent/Acquisition/populate_order_with_prices.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list