[koha-commits] main Koha release repository branch master updated. v17.11.00-1237-g0797d9c
Git repo owner
gitmaster at git.koha-community.org
Thu Apr 19 17:50:48 CEST 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 0797d9cc09fdb8e0f1b1e0b5824775ff6286c60a (commit)
via 9b080c2d1b924058563c8e12b30a24308c26cf68 (commit)
via 50f4c8c831290aa6a02a821d591497e6d33ce94b (commit)
via 62ed6df83e9e8586510e4ed612a25b50a697800d (commit)
via f1659fa09f68541efbb552390f858f5567354f2d (commit)
via 8a92d53bc8be12f4f57a3931bc8cde84a8a844e7 (commit)
via 10dd350a8bdb408c226721e1387edd9dd3b1575e (commit)
via 75ebc49f2585b9dbfd1e52a58a83b49862ce12b4 (commit)
via f1f773318f4382b57b4fa9cd1f0cc618528b3a25 (commit)
via 49a0ed8d16a9481ee0ea466adc6db0ad52cbfcbf (commit)
via 5372faf4e5be575f91eacd91ddbfba73c5835bf5 (commit)
via 46cf3910a368ce5affdc9517c0a5f28d360bdbcb (commit)
via cce5ce7ce78642a451c9f06f4bc1dee80f9451c7 (commit)
via 7311d35f934eabad15d1b261d6ca968a3b736373 (commit)
via fde5ea23fc87662e59a590aa8e90f8aea6caefa2 (commit)
via 73d2ba31889af8c3a39d8e7a5908ba5a36e5e21b (commit)
via 618ccd243ea9bdd2daa115415bafb5a4c864333b (commit)
via 67d905d49f2871c884dc868bd1b50517624dcdbf (commit)
via 71e5c4274057755bc593d8f1ca598d378b558649 (commit)
via 26201f906c90d1596ad450a4ee788ccd301c24d4 (commit)
via 233be0fe1390022d45edf1811675c12ad45d2f22 (commit)
via d444b0bb9d48060de246818f1cbc8a9b470956b7 (commit)
via eb796f4eb8c5b0c3a7cd29fdd32e250d88166350 (commit)
via ea983250dc14583b7594aa7af4d942ddc3f38ad6 (commit)
via d3de9bc0042ee7f661aaa7d9fdba57647a0fd7b5 (commit)
via 3d1f04b2699737ddd2b2ea5a374cc343f46c2380 (commit)
via dc5d3b9abd34b0e80794fff7029809b7438bcefa (commit)
from f553d76600e967b4492f03494f34170c8cf5d83e (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 0797d9cc09fdb8e0f1b1e0b5824775ff6286c60a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 10:50:33 2018 -0300
Bug 20590: Koha::Exceptions::Exception
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9b080c2d1b924058563c8e12b30a24308c26cf68
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 09:12:11 2018 -0300
Bug 7143: Update about page for new dev - Andrew Isherwood
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 50f4c8c831290aa6a02a821d591497e6d33ce94b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 09:09:31 2018 -0300
Revert "Bug 20104: Update minimum version of Perl to 5.20"
This reverts commit 4218875ec039dc375124f969caea1624399c21a4.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 62ed6df83e9e8586510e4ed612a25b50a697800d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 11 13:56:11 2018 +0000
Bug 19952: Update popup window templates to use Bootstrap grid: UNIMARC cataloging plugins
This patch updates two UNIMARC cataloging plugin templates to use the
Bootstrap grid instead of the YUI grid.
- unimarc_field_210c_bis.tt
- unimarc_field_686a.tt
To test you do not need a UNIMARC system.
Apply the patch and for each plugin, configure a MARC subfield (e.g.
100$a) to use that plugin.
From the MARC edit page, trigger the plugin and confirm that the
page in the popup window looks correct. Confirm that changes made in the
popup window are saved to the corresponding field in the editor.
Signed-off-by: Te Rauhina Jackson <terauhina.jackson at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f1659fa09f68541efbb552390f858f5567354f2d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 12:29:20 2018 -0300
Bug 18790: DBRev 17.12.00.034
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8a92d53bc8be12f4f57a3931bc8cde84a8a844e7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 12:19:17 2018 -0300
Bug 18790: Prevent the tests to fail if precision changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 10dd350a8bdb408c226721e1387edd9dd3b1575e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 13 12:25:51 2018 +0000
Bug 18790: (QA follow-up) Use a transaction for voiding
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 75ebc49f2585b9dbfd1e52a58a83b49862ce12b4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 13 11:16:19 2018 +0000
Bug 18790: (QA follow-up) Fix capitalization
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit f1f773318f4382b57b4fa9cd1f0cc618528b3a25
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Wed Feb 21 07:04:22 2018 -0500
Bug 18790: Add new account offsets to atomic update
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 49a0ed8d16a9481ee0ea466adc6db0ad52cbfcbf
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Wed Feb 21 07:03:17 2018 -0500
Bug 18790: Add logging for voided payments
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 5372faf4e5be575f91eacd91ddbfba73c5835bf5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Sat Jun 10 11:34:56 2017 +0000
Bug 18790: Add ability to void payments
We've had the ability to 'reverse' a payment for a long time, but it
would be much better if we had a true void payment function that
replaces the paid amounts into the fee so that it appears as if the
payment was never made.
Test Plan:
1) Apply this patch and dependent patches
2) Run updatedatabase.pl
3) Create some fines
4) Pay those fines
5) Use the new 'void' button to void the payments
6) Note the fines were restored to their pre-payment amounts
Signed-off-by: Koha-us conference <koha-us at koha-us.net>
Signed-off-by: BWS Sandboxes <ByWaterSandboxes at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 46cf3910a368ce5affdc9517c0a5f28d360bdbcb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 12:28:16 2018 -0300
Bug 18786: DBRev 17.12.00.033
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit cce5ce7ce78642a451c9f06f4bc1dee80f9451c7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 12:21:00 2018 -0300
Bug 18786: DBIC Schema changes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 7311d35f934eabad15d1b261d6ca968a3b736373
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Apr 13 13:15:57 2018 -0300
Bug 18786: Add PAYMENT_TYPE to the AV categories
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fde5ea23fc87662e59a590aa8e90f8aea6caefa2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jun 12 10:09:35 2017 -0400
Bug 18786: Add ability to create custom payment types
Some libraries would like to be able to specify more specific payment types such as cash, check, credit card, or even canned food ( for food drives ). This feature will allow a library to specify payment types as authorised values of the type PAYMENT_TYPE.
Test Plan:
1) Apply patches
2) Update database
3) Add authorised value PAYMENT_TYPE with values 'Cash', 'Check', 'Credit card'
4) Go to the fines section of a patron who has several fines
5) Tab 'Fines'
6) Click on 'Pay' for an individual fine
7) Verify that in the form a 'Pay an individual fine' dropdown appears with payment types
8) Select a payment type, confirm payment
9) Verify that payment type appears in "Description of charges" in tab 'Account'
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Bug 18786: Remove use of Koha::Patron::Images
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Bug 18786: Remove duplicate block with bad IF
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 73d2ba31889af8c3a39d8e7a5908ba5a36e5e21b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Jun 12 10:07:53 2017 -0400
Bug 18786: Update database
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 618ccd243ea9bdd2daa115415bafb5a4c864333b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Apr 18 15:20:02 2018 +0200
Bug 20343: Put translatable strings in strings.tt
Also add a CSS class on <details> for easier styling and change the
list style so it take less space on screen
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 67d905d49f2871c884dc868bd1b50517624dcdbf
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Mar 6 14:47:46 2018 +0100
Bug 20343: Show number of checkouts by itemtype in circulation.pl
It is sometimes useful to have the number of checkouts grouped by
itemtype (to see if we're approaching the maximum number of checkouts
allowed for instance).
This patch adds this information above the checkouts table, in
circ/circulation.pl
Test plan:
1. Check out some items with various item types to a patron
2. In circ/circulation.pl, click on 'Show checkouts' button to display
the table
3. Notice the line "Number of checkouts by item type" above the table,
click on it
4. See that the list of item types is displayed with a count in front of
each one
5. Compare the numbers to the checkouts in the table and verify that the
numbers are correct
Signed-off-by: claude <claude.brayer at cea.fr>
Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 71e5c4274057755bc593d8f1ca598d378b558649
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Apr 17 18:12:50 2018 -0300
Bug 20599: Add the Koha::Subscription->vendor method
Test plan:
prove t/db_dependent/Koha/Subscription.t
must return green
NOTE: My preference is for $subscription to be object,
and perhaps something like $built_subscription to
be from the builder. Because, $object is a poor
variable name.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 26201f906c90d1596ad450a4ee788ccd301c24d4
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Apr 19 12:26:21 2018 -0300
Bug 19794: DBRev 17.12.00.032
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 233be0fe1390022d45edf1811675c12ad45d2f22
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Apr 17 00:17:09 2018 +0000
Bug 19794: (follow-up) Add atomic update
The update will
- change the RLIST notice code to SERIAL_ALERT
- adapt the description if it has remained unchanged from
'Routing List' to 'New serial issue'
- update subscriptions to use the new notice code
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d444b0bb9d48060de246818f1cbc8a9b470956b7
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Apr 16 14:56:33 2018 +0000
Bug 19794: (QA follow-up) Change tab to space
Test plan:
Run qa tools, it should be happy
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit eb796f4eb8c5b0c3a7cd29fdd32e250d88166350
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Feb 20 21:33:10 2018 +0000
Bug 19794: Rename RLIST notice to SERIAL_ALERT to better reflect its purpose
The RLIST sample notice is used to send an email to patrons who have
subscribed to be notified when a new issue for a subscription arrives.
This is a feature that is totally independent and not related to the
use of routing lists. In the GUI however, this was misleading so far.
- Rename RLIST to SERIAL_ALERT and fixes the sample notices
- Fix explanations in the helf files
- Fix name of the module in letters from 'serials (routing list)'
to 'serials (new issue)'
Note: There is no logic to be changed as the notice template
to be used is defined for each subscriptions and this is just
the sample notice. I've also opted against a database update, to not
interfere with existing installations, reports etc.
A patch to the manual will be submitted shortly after this passes QA.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ea983250dc14583b7594aa7af4d942ddc3f38ad6
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Fri Apr 13 09:57:38 2018 -0400
Bug 12123: Make iframe large enough to remove scroll bars
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d3de9bc0042ee7f661aaa7d9fdba57647a0fd7b5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Apr 22 06:55:22 2014 -0700
Bug 12123: Prevent HTML notices to break the notice viewer
Depending on the content of an html notice, it can cause the notice to
either not be collapsible, be uncollapsible, or to be permanently
collapsed.
Test Plan:
1) Set your CHECKOUT notice to the following ( with HTML Message checked ) :
<p>The following items have been checked out:</p>
----
<blockquote> <<biblio.title>> </blockquote>
----
<p>Thank you for visiting the <<branches.branchname>> of HMCPL.</p>
2) Check out some items to a patron
3) View the patrn's notices
4) Note the notice viewer is broken ( message is not collapsed, and
con't be collapsed ).
5) Apply this patch
6) Reload the page
7) Note the notice viewer is no longer broken
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I followed the test plan successfully.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3d1f04b2699737ddd2b2ea5a374cc343f46c2380
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 16 13:48:54 2018 -0300
Bug 20562: Pass the Koha::Checkout object to AddIssuingCharge
We do not need to pass all those parameters, just the checkout object is
enough.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dc5d3b9abd34b0e80794fff7029809b7438bcefa
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Sun Apr 8 07:11:11 2018 +0000
Bug 20562: issue_id is not stored in accountlines for rental fees
Test Plan:
1) Apply this patch
2) Assign a charge to an item type
3) Checkout an item of that type to a patron
4) View the accountlines table for that patron
SELECT * FROM accountlines WHERE accounttype='Rent' and borrowernumber=##;
5) Note there is an issue_id
Or
1) Apply this patch
2) prove t/db_dependent/Circulation/issue.t
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 15 ++--
Koha.pm | 2 +-
Koha/Account.pm | 2 +
Koha/Account/Line.pm | 79 ++++++++++++++++++++
Koha/Exceptions/Exception.pm | 25 +++++++
Koha/Schema/Result/Accountline.pm | 12 ++-
Koha/Subscription.pm | 12 +++
docs/history.txt | 1 +
installer/data/mysql/account_offset_types.sql | 3 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +-
.../data/mysql/en/mandatory/sample_notices.sql | 2 +-
.../data/mysql/es-ES/mandatory/sample_notices.sql | 2 +-
.../mysql/fr-CA/obligatoire/sample_notices.sql | 2 +-
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +-
installer/data/mysql/it-IT/necessari/notices.sql | 2 +-
installer/data/mysql/kohastructure.sql | 1 +
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +-
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +-
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 2 +-
.../data/mysql/ru-RU/optional/sample_notices.sql | 2 +-
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 43 +++++++++++
installer/install.pl | 4 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 20 +++++
.../intranet-tmpl/prog/en/includes/strings.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
.../value_builder/unimarc_field_210c_bis.tt | 6 +-
.../value_builder/unimarc_field_686a.tt | 19 ++---
.../en/modules/help/serials/subscription-add.tt | 2 +-
.../prog/en/modules/help/tools/letter.tt | 2 +-
.../prog/en/modules/installer/step1.tt | 2 +-
.../prog/en/modules/members/boraccount.tt | 4 +
.../prog/en/modules/members/notices.tt | 10 ++-
.../prog/en/modules/members/paycollect.tt | 25 +++++++
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 4 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 20 ++++-
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 +
members/boraccount.pl | 7 +-
members/paycollect.pl | 38 ++++++----
t/db_dependent/Accounts.t | 66 +++++++++++++++-
t/db_dependent/Circulation/issue.t | 13 ++--
t/db_dependent/Koha/Subscription.t | 24 +++++-
42 files changed, 413 insertions(+), 75 deletions(-)
create mode 100644 Koha/Exceptions/Exception.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list