[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.03-180-g2712e1e
Git repo owner
gitmaster at git.koha-community.org
Mon Mar 25 16:07:48 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, 18.11.x has been updated
via 2712e1ee55208332db4ec01310f58b8fa0b882c6 (commit)
via 4505ad4dc52c5384866c157c08ba6a5a6c95a619 (commit)
via 5115ee767d9ee47992eb8bb3c1f11bb06174a208 (commit)
via f27aba73f626c9b2dd1418dffd7fcddb7eee73b2 (commit)
via 2fc7a3917acd374706be3cb647a5bc813b908bcf (commit)
via 545551b173a49592f88727cbf032f27845891368 (commit)
via b67eb18c8a433e42029f536c18e0fae617bdc12f (commit)
via d86e9339e57583e35470b6e046b25933e70a8f4b (commit)
via 9bd4c6a608eb3bc0df9926ae85a8705c99b25c6b (commit)
via 223de864b08cc8af50554fddad5e21f446c75a9a (commit)
via 5491709d806da011c8bcb4328417722932b39631 (commit)
via 277b869f18927c40041166ec5e825431a2a3f166 (commit)
via 714a53836831d126b534267b8e5e989662da348e (commit)
via 9b851abe0629c47f35733578825bc76e0badf181 (commit)
via a968e5f59c8cfb0e996d978c22bfd1d395ad6258 (commit)
via a220d9e979e746ce1920e1f2aec475d32c792902 (commit)
from 040f850342e3ea953bad34692ea8cc144fe22c00 (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 2712e1ee55208332db4ec01310f58b8fa0b882c6
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>
(cherry picked from commit 28ff4f6393e65ebfca60c05611fafc926f1fb239)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4505ad4dc52c5384866c157c08ba6a5a6c95a619
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>
(cherry picked from commit 48e9082043115416063e66217db60f0054b68088)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5115ee767d9ee47992eb8bb3c1f11bb06174a208
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 21 18:11:29 2019 +0000
Bug 18736: DBRev 18.11.03.004
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit bc36d8e06b3b43b09b655718f7fad5a1780b246a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f27aba73f626c9b2dd1418dffd7fcddb7eee73b2
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>
(cherry picked from commit 0aeae50229c6a381fe112644b72eefd6848fb655)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2fc7a3917acd374706be3cb647a5bc813b908bcf
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>
(cherry picked from commit 876323cf5bb5185834a875f3da29ac33f7760ef4)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 545551b173a49592f88727cbf032f27845891368
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>
(cherry picked from commit 2f5e839bf780955d228c9672abce9d6e5ad1aedf)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b67eb18c8a433e42029f536c18e0fae617bdc12f
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>
(cherry picked from commit 9922d2bf40e2b7429f300d4d73134f9fef3b8c65)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d86e9339e57583e35470b6e046b25933e70a8f4b
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>
(cherry picked from commit ca28c83abbd449c7e5f1d7b86760b7fb53741988)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9bd4c6a608eb3bc0df9926ae85a8705c99b25c6b
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>
(cherry picked from commit ab4cf23286219b473820b61bca82c884de274e80)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 223de864b08cc8af50554fddad5e21f446c75a9a
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>
(cherry picked from commit d9b3d0fa36869a40b9db65375dba4972913697d8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5491709d806da011c8bcb4328417722932b39631
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>
(cherry picked from commit 4ccbae8879a386a1846bb48c18b3722f936dc983)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 277b869f18927c40041166ec5e825431a2a3f166
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>
(cherry picked from commit b17ca2b701fab5307330b6196590e5d3048978e1)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 714a53836831d126b534267b8e5e989662da348e
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>
(cherry picked from commit 00cf699c82aeea46ef5a72bf344fd306430c5aba)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9b851abe0629c47f35733578825bc76e0badf181
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>
(cherry picked from commit bf0882252f242efa8cc9f08625c0abe305d205a6)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a968e5f59c8cfb0e996d978c22bfd1d395ad6258
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>
(cherry picked from commit 7fe5f8cd2c2d1eddd2a835fb644c262cffcbd34c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a220d9e979e746ce1920e1f2aec475d32c792902
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>
(cherry picked from commit aea90223d6f250d6f74e00244abbb3e0334107b5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 108 +++++++++---
C4/Biblio.pm | 2 +-
C4/Budgets.pm | 22 ++-
Koha.pm | 2 +-
Koha/Number/Price.pm | 7 +-
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/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 8 +
.../en/modules/admin/preferences/acquisitions.pref | 9 +-
reports/orders_by_fund.pl | 4 +-
t/Acquisition.t | 68 +++++++
t/Number/Price.t | 16 +-
.../Acquisition/populate_order_with_prices.t | 165 +++++++++++++++++
t/db_dependent/Budgets.t | 185 +++++++++++++++++++-
22 files changed, 592 insertions(+), 63 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