[koha-commits] main Koha release repository branch master updated. v18.05.00-209-g68ff870
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 6 16:48:36 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 68ff8702e09be9879d508ea82c0ef7fab53c0ee9 (commit)
via 3f85c9b16b43a98c75f7344cfa389b38c56be022 (commit)
via aabb3350cad7873b4d83240f7a07ab410fb3d9f2 (commit)
via fba064838403961cffaaaa95bd7c41bd4c98c678 (commit)
via 200a468a9c4a75f48ef2fbe77af03c497347c79f (commit)
via 8e58b0396676ee2690857a00aeb786cf64657a52 (commit)
via 4967a3150a65b9b8dbff5352eb837442b951a9bf (commit)
via 6403070e63c80624c17d1e90557b4d0f2c078c6b (commit)
via 32fd93ed6f11b371f3d6efa780b4f36644629837 (commit)
via e1c9386bd8a7b9e5e124525c7df9612e2cde5adf (commit)
via adfdd3b21f821953d4f07145ef3a1e9ab79be0cf (commit)
via 948704964073dd8dea146d959ad5ed690ccafe67 (commit)
via 46b09129c0e0df801d0dd6f526911506a0d36f93 (commit)
via fcd3965fb5f6a5fb0d8830e884dd0ecf5de75af5 (commit)
via 95d8ceef98f5c1242a54dd701c49e7a41bd34721 (commit)
via cdd956bc5fbabd9fe5bd79aa1d57a9acf1ba3753 (commit)
via 175a4037f72186d9b422e2b9ab4b4224df006f7e (commit)
via 3c887b4e07acf9459767a7b934aa4f6c16cae534 (commit)
via 18c0eb1301440c20acb657ef553beed0feaf5d0e (commit)
via 60e40ba573b9ea5b7db3fe2a3fed31a2d3991849 (commit)
via a943a924edff7db28495b0c92341f5357ad952ce (commit)
via 64761e56ccfbf98844d2fc8c7aa68ee608a2b162 (commit)
via 8a83f1e1a975368c006c698f94357975333fd2d6 (commit)
via 65aacc1b1ded569a259f45c3abd5d1a73c3f37e6 (commit)
via 7b6c242d972e3edf5b4d75d6023a0ae1dc9d1f9d (commit)
via cc30dc39bf3c8f627865c1a4891fac534266dc03 (commit)
via f7ed22d25372bb7a68dcbf1a744b81aeb8657b0a (commit)
via b8cae8e5b85aa0bdef7783e39343eedf5a123e9f (commit)
via 59a9e5502dd18db47333fa304ba5c11df32b807f (commit)
via a13061ee4b1f515bc91b6842773d0d9bae6be461 (commit)
via a66542d67ba2cd6edb582055d38b1d577dd1be32 (commit)
via 04cc45bb520b4621af84d3d13b7933f91222c1e4 (commit)
via 1a41e5ef14c9b706ddad3afaddcc6a5f5242ba35 (commit)
via f69e62ff9fbe2958fbb9720a8d914df4566244ab (commit)
via 977c1a73e883b5e9ed1c6fe33eb26f33c439b3b5 (commit)
via 2c5413f36a353fbacdfdd7ce17f5b294fa026207 (commit)
via 9864b805f4986b439551d10e45b8673d2e4c487e (commit)
via e9f12b6baac366195a7666bf2d521c61a2851131 (commit)
via 2479a70a810973ddec2ad67f4638cb9273829912 (commit)
via 8c5fd0dec1a0802c8714cb9ecc966f481fe45d7e (commit)
via 455c254ee01095d574ff1a26171ec4cca251b7b5 (commit)
via 462ec9601a43c31ccb12f010b4bddc80dcb71344 (commit)
via 72058d27415a82799d9f6acac693e94dc7bf9309 (commit)
via 158e50d0bcf214932fb1ca037049e6515fbbd80c (commit)
via d212eb4026c8543c6f1adc9871d96233618173bf (commit)
via b3cd3855b912cd7bfc9b10f1163a34d09be4f5e0 (commit)
via b0cb7f44ef80d5f6a3d45ce87543a27637c68c6f (commit)
via 0e45263492dbd8123bf2507aad6dc45d95c4902c (commit)
via 302224798333eee6a67822f994474a2263a75de9 (commit)
via 505630ca081c93fa81f1f6b85573374be8ee1009 (commit)
via 0cf594c3ad0b1e3aae2af14cbfe16bdbd2462318 (commit)
from 1f818e67387488e06a106398994bccca2fadc698 (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 68ff8702e09be9879d508ea82c0ef7fab53c0ee9
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 2 15:30:57 2018 -0300
Bug 19617: (QA follow-up) Fix typo for type
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3f85c9b16b43a98c75f7344cfa389b38c56be022
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Mon Apr 30 12:47:26 2018 -0400
Bug 19617: Allow 'writeoff of selected'
This patch adds a writeoff equivilent to 'Pay selected'
Test Plan:
1) Apply this patch
2) Find a patron with fines
3) On the "Pay fines" tab, select one or more fines and use the
"Write off selected" button.
4) Note the fine amount you used was written off for those fines.
Signed-off-by: Kyle M Hall <kyle at bywatetsolutions.com>
Signed-off-by: Martha Fuerst <mfuerst at hmcpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit aabb3350cad7873b4d83240f7a07ab410fb3d9f2
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 6 14:25:20 2018 +0000
Bug 12395: (RM follow-up) Make updatedatabase statements idempotent
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fba064838403961cffaaaa95bd7c41bd4c98c678
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 6 14:19:22 2018 +0000
Bug 12395: DBRev 18.06.00.005
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 200a468a9c4a75f48ef2fbe77af03c497347c79f
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Fri Jun 8 10:24:19 2018 +0200
Bug 12395: Add FK constraint and use patron-title.inc
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8e58b0396676ee2690857a00aeb786cf64657a52
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Apr 16 21:10:15 2018 +0000
Bug 12395: (QA follow-up) Change wording for consistency and fix use CGI;
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4967a3150a65b9b8dbff5352eb837442b951a9bf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Dec 3 13:01:46 2015 -0500
Bug 12395: Use standard <fieldset> + <ol> markup for showorder.tt
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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6403070e63c80624c17d1e90557b4d0f2c078c6b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Oct 25 12:32:45 2015 +0100
Bug 12395: (QA follow-up) Add class/id to body tag
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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 32fd93ed6f11b371f3d6efa780b4f36644629837
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Jun 16 10:05:16 2015 +0200
Bug 12395: Make received orders table consistent with pending orders table
(links of More column)
Also change "Created by" with "Ordered by" in receive page.
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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e1c9386bd8a7b9e5e124525c7df9612e2cde5adf
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Fri Feb 20 11:31:52 2015 +0100
Bug 12395: Display created_by even if firstname is missing on receiving
On receiving orders, "no name" was displayed if the firstname of creator
was not filled.
The surname should be displayed.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit adfdd3b21f821953d4f07145ef3a1e9ab79be0cf
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Tue Feb 10 10:23:25 2015 +0100
Bug 12395: Add unit test to check created_by is correctly set
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 948704964073dd8dea146d959ad5ed690ccafe67
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Mon Jun 9 16:15:17 2014 +0200
Bug 12395: Save order line's creator
New MySQL column: aqorders.createdby
Creator's name is displayed on order's receive pages (acqui/orderreceive.pl
and acqui/parcel.pl)
On acqui/orderreceive.pl it replace the name of basket's creator
On acqui/parcel.pl, to avoid adding more data in the table of pending
orders, it is shown in a popup like MARC and Card views
Test plan:
1/ Run updatedatabase.pl
2/ Create a new order and go to the receipt page (acqui/parcel.pl)
3/ Click on "Order" link in column "More" (previously "View record")
4/ A javascript popup should appear with your name in it. Close the
popup.
5/ Click on "Receive" link
6/ Your name should appear in front of "Created by" label, to the right
of the page.
Patch updated with use of atomic update.
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: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 46b09129c0e0df801d0dd6f526911506a0d36f93
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 19 10:02:26 2018 -0300
Bug 20650: Remove unused virtualshelves/merge.tt
Committed by Jonathan Druart, get out from first patch of this patchset.
It's a follow-up of bug 4019 which removed virtualshelves/merge.pl
Moving this change to its own commit to make it clear in the git log and
easier to backport if needed.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fcd3965fb5f6a5fb0d8830e884dd0ecf5de75af5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 19 12:45:07 2018 +0000
Bug 20650: (follow-up) Add missing include file
This patch adds a missing include of doc-head-open.inc.
To test, apply the patch and export a batch of patron cards. The modal
view for downloading the card batch PDF should work correctly.
Validating the iframe's source should show no relevant errors.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 95d8ceef98f5c1242a54dd701c49e7a41bd34721
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 24 13:37:07 2018 +0000
Bug 20650: Switch single-column templates to Bootstrap grid: Various, part 3
This patch updates various unrelated templates to use the Bootstrap
grid. In each case, confirm that the indicated page looks correct.
This patch also corrects a couple of capitalization errors and removes
an unused template: virtualshelves/merge.tt.
- Tools -> Patron card creator -> Manage -> Card batches
- Export a batch
- The pages inside the modal window should look correct: Both the "X
batch(es) to export" screen and the "download exported batch(es)"
one.
- Tools -> Patron lists -> Edit list
- The patron list add/edit form should look correct.
- Disable plugins in koha-conf.xml.
- Tools -> Plugins
- The "Plugins disabled" page should look correct.
- Enable plugins in koha-conf.xml
- Tools -> Plugins -> Upload plugins.
- This page should look correct.
- Tools
- The tools home page should show three columns: Patrons and
Circulation, Catalog, Additional tools.
- At viewport width below 768 pixels content should reflow into one
column.
- virtualshelves/merge.tt has been removed as it is unused. Search the
codebase for references to it. There should be none.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cdd956bc5fbabd9fe5bd79aa1d57a9acf1ba3753
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Apr 23 18:26:14 2018 +0000
Bug 20641: Switch single-column templates to Bootstrap grid: Various, part 2
This patch updates various unrelated templates to use the Bootstrap
grid. In each case, confirm that the indicated page looks correct.
- Acquisitions -> Vendor -> Add to basket -> From a staged file.
- Logged-in user menu (in the upper right) -> Search history.
- With plugins disabled in koha-conf.xml, go to Tools -> Tools plugins.
- With the EasyAnalyticalRecords system preference set to 'Display,'
view a bibliographic record.
- Choose Edit -> Link to host item.
- Submit a barcode to be linked.
- Configure a MARC subfield (e.g. 100$a) to use the
unimarc_field_225a_bis 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.
- Administration -> Funds -> Edit a fund.
- Click 'Select owner.'
- Search for a patron.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 175a4037f72186d9b422e2b9ab4b4224df006f7e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Apr 25 18:07:42 2018 +0000
Bug 20220: Move template JavaScript to the footer: Holds
This patch modifies the holds template so that JavaScript is included in
the footer.
To test, apply the patch and initiate the process of placing a hold.
Throughout the process JavaScript-based interactions should work: Patron
autocomplete, datepickers, DataTables, cancel confirmations, etc.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3c887b4e07acf9459767a7b934aa4f6c16cae534
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 8 13:45:37 2018 +0000
Bug 19709: Move template JavaScript to the footer: Labels
This patch modifies the staff client label creator templates so that
JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
This patch also modifies the templates to use the Bootstrap grid instead
of YUI, and removes obsolete "text/javascript" attributes from
<script> tags and "text/css" attributes from <style> tags in the
modified templates.
To test, apply the patch and test the following interactions:
- Creating and managing layouts
- Creating and managing batches
- Creating and managing templates
- Creating and managing printer profiles
- Creating quick spine labels
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 18c0eb1301440c20acb657ef553beed0feaf5d0e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Apr 26 18:54:44 2018 +0000
Bug 20668: Update two-column templates with Bootstrap grid: Acquisitions part 2
This patch modifies several acquisitions templates to use the Bootstrap
grid instead of YUI.
This patch also removes obsolete "text/javascript" attributes from
<script> tags in the modified templates.
Staff client CSS is modified in this patch so that elements which were
styled based on the sidebar's "yui-b" class will work with <aside>.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- I don't have EDI set up, so to test acqui/edi_ean.tt I navigate
directly to /cgi-bin/koha/acqui/edi_ean.pl. It's only the page
structure we're worried about.
- Acquisitions -> Orders search
- Acquisitions -> Vendor -> Invoices -> Invoice search
- View an invoice
- Manage invoice files (Preference AcqEnableFiles must be enabled).
- Acquisitions -> Late orders
Patch applies and operates as described.
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 60e40ba573b9ea5b7db3fe2a3fed31a2d3991849
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Apr 26 18:34:31 2018 +0000
Bug 20667: Update two-column templates with Bootstrap grid: Acquisitions part 1
This patch modifies several acquisitions templates to use the Bootstrap
grid instead of YUI.
This patch also removes obsolete "text/javascript" attributes from
<script> tags.
To test, apply the patch and view the following pages, confirming that
they look correct at various browser widths:
- Acquisitions -> Home page
- Acquisitions -> Vendor search results
- Acquisitions -> Vendor -> Basket groups
-> Edit
- Acquisitions -> EDIFACT messages
-> View EDIFACT message
Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a943a924edff7db28495b0c92341f5357ad952ce
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jan 3 17:41:09 2018 +0000
Bug 20731: Move template JavaScript to the footer: Call number browser MARC plugin
This patch modifies the call number browser plugin so that JavaScript is
in the footer instead of the header.
This patch also makes some unrelated changes: The page title has been
corrected; DataTables code has been removed as it was unused.
To test, apply the patch and configure a MARC framework to use
cn_browser.pl as the plugin for tag 952 subfield o.
Open an item for editing. The "Full call number" field should have an
active "..." link next to it. Clicking this should trigger a popup
window with the Call number browser. Confirm that submitting a new
search from this window works correctly.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 64761e56ccfbf98844d2fc8c7aa68ee608a2b162
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 6 12:56:54 2018 +0000
Bug 20980: DBRev 18.06.00.004
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8a83f1e1a975368c006c698f94357975333fd2d6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 6 09:22:29 2018 -0300
Bug 20980: (QA follow-up) Do not delete existing data on tests fix
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 65aacc1b1ded569a259f45c3abd5d1a73c3f37e6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Jun 23 07:41:15 2018 -0300
Bug 20980: (follow-up) Offset name consistency
This patch makes 'credit' account types generate 'Manual Credit' offset.
The original patch used 'Payment' but I think the code wants to
distinguish between payments and manually added credits (otherwise they
would've picked the same accounttype value, and they don't.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7b6c242d972e3edf5b4d75d6023a0ae1dc9d1f9d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 22 12:24:33 2018 -0300
Bug 20980: (follow-up) Only use UpdateStats for 'payment' and 'writeoff'
This patch makes Koha::Account::add_credit record statistics logs
(through C4::Stats::UpdateStats) only for the 'payment' and 'writeoff'
credit types.
Both credit types are whitelisted in UpdateStats, so we keep the current
behaviour. Another option would've been to add new account types to the
white list, but with the account offsets it seems that using the
statistics table for account changes won't be useful for too long, as
offsets contain the same (and more) information.
To test:
- Apply the patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cc30dc39bf3c8f627865c1a4891fac534266dc03
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jun 22 12:23:47 2018 -0300
Bug 20980: Make mancredit.pl use Koha::Account::add_credit
This patch makes creating a manual credit from the UI record the account
offset as 'Manual Credit', and properly set account_offsets.credit_id
instead of account_offsets.debit_id.
To test:
- Create a manual credit (of 'Credit' type) for a known patron (acevedo?)
- Run:
$ sudo koha-mysql kohadev
> SELECT * FROM account_offsets;
=> FAIL: The account offset for the manual credit has type=Manual Debit,
credit_id=NULL and debit_id=accountlines_id
- Run the atomic update:
$ updatedatabase
- Run:
$ sudo koha-mysql kohadev
> SELECT * FROM account_offsets;
=> SUCCESS: The account offset has been corrected and now has
type=Manual Credit, credit_id=accountlines_id and debit_id=NULL
- Create a new manual credit (of 'Forgiven' type) for a known patron
- Run:
$ sudo koha-mysql kohadev
> SELECT * FROM account_offsets;
=> SUCCESS: The account offset has been stored correctly as a credit!
- Sign off :-D
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f7ed22d25372bb7a68dcbf1a744b81aeb8657b0a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 21 14:43:34 2018 -0300
Bug 20980: Add 'Manual Credit' and fix existing offsets
This patch adds a new offset type 'Manual Credit'. And adds an atomic
update for fixing existing offsets.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b8cae8e5b85aa0bdef7783e39343eedf5a123e9f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 6 09:11:32 2018 -0300
Bug 20978: (QA follow-up) Do not delete existing data on tests
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 59a9e5502dd18db47333fa304ba5c11df32b807f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jun 27 10:37:24 2018 -0300
Bug 20978: (follow-up) POD completeness
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a13061ee4b1f515bc91b6842773d0d9bae6be461
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 21 13:33:46 2018 -0300
Bug 20978: (follow-up) Another use case from C4::Circulation
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a66542d67ba2cd6edb582055d38b1d577dd1be32
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 21 13:04:01 2018 -0300
Bug 20978: Add Koha::Account::add_credit
This patch adds:
- Koha::Account::add_credit
- A single source of truth for accounttype and offset_type values
To test:
- Apply the first patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> FAIL: Tests fail!
- Apply this patch
- Run:
k$ prove t/db_dependent/Koha/Account.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 04cc45bb520b4621af84d3d13b7933f91222c1e4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Jun 21 13:03:13 2018 -0300
Bug 20978: Unit tests
This patch adds unit tests for Koha::Account::add_credit.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1a41e5ef14c9b706ddad3afaddcc6a5f5242ba35
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 26 13:40:22 2018 +0000
Bug 20969: (follow-up) Move focus to textarea whe modal is shown
This follow-up adds code to move the mouse cursor to the modal window's
textarea when the modal is displayed.
To test, apply the patch and test the process of adding/editing notes on
an order. Confirm that the focus moves to the textarea when the note
editor modal window is shown.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f69e62ff9fbe2958fbb9720a8d914df4566244ab
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jun 20 12:39:05 2018 +0000
Bug 20969: Use modal to add and edit notes from basket
This patch modifies the acquisitions basket page so that links to add or
edit vendor or internal notes trigger a modal with the notes edit form
instead of redirecting to a different page. This is a markup change only
-- The form still submits to modordernotes.pl.
To test, apply the patch and view a basket in acquisitions which has
multiple orders. Test various note controls: Add internal note, Add
vendor note, Edit internal note, edit vendor note.
Confirm that the operations work correctly with multiple orders in the
basket.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Charles Farmer <charles.farmer at inLibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 977c1a73e883b5e9ed1c6fe33eb26f33c439b3b5
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Fri May 4 19:49:07 2018 -0300
Bug 20710: Update MARC21 frameworks to Update 26 (April 2018)
This bug add update 26 changes.
Update 26
http://www.loc.gov/marc/bibliographic/bdapndxg.html
New subfields 377$3, 380$3, 381$3, 383$3, 730$4
Codes
Map 007/04 'x' new
Map 007/06 'c' renamed
No auth changes
To test:
1) Apply Bug 19835
2) Apply this patch
3) Reload marc21 bibliografic frameworks, check loads ok
4) Clean your browser cache
5) Edit a new bib record, fire 007 plugin,
for Map, 04 position, check new 'x'
for Map, 06 position, check renamed 'c'
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2c5413f36a353fbacdfdd7ce17f5b294fa026207
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Wed Dec 20 17:13:40 2017 +0100
Bug 19849: Make a string translatable again after a rebase error
Bug 16621 reverted part of bug 12509
1. Log in the OPAC and staff interface
2. Restrict the user logged in the OPAC (restricting yourself works)
Staff interface → Patron page → Restrictions → Add manual restriction
Put this comment the "OVERDUES_PROCESS Give the books back or we're comming!"
3. Install the fr_FR locale and switch the interface to it
4. Go to OPAC: /cgi-bin/koha/opac-user.pl
5. Then you should see the ugly comment with "OVERDUES_PROCESS"
6. Apply this patch
7. Update the translation: ./translate update or equivalent
8. Open misc/translator/po/fr-FR-opac-bootstrap.po
9. Find the string containing "Restriction added by overdues process"
10. Remove the fuzzy flag
11. Install the language
12. Refresh the page in the OPAC
13. Then you should see the translation + the comment instead of "OVERDUES_PROCESS" + the comment
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9864b805f4986b439551d10e45b8673d2e4c487e
Author: Victor Grousset <victor.grousset at biblibre.com>
Date: Wed Dec 20 15:15:49 2017 +0100
Bug 19849: Minor fixes & refactor of opac-reserve.tt & opac-user.tt
- make next patch easely reviewable.
- fix lone quote. (Replace by <strong>
- add forgotten condition for 9999-12-31
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e9f12b6baac366195a7666bf2d521c61a2851131
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Wed May 16 02:25:38 2018 +0000
Bug 7136: Correct description of Grace period for subscriptions
The grace period is used with the serialsUpdate.pl cronjob. It will
generate the next issue and set the one before to 'Late' with
an optional note.
There is on trace of a 'waiting' status for serials.
To test:
- check help file on the subscription edit form for
the description of the 'Grace period'.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2479a70a810973ddec2ad67f4638cb9273829912
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 26 13:05:42 2018 +0000
Bug 20507: Shelf browser does not update image sources when paging
This patch updates the shelfbrowser include so that the system
preference check for Coce will function correctly.
To test, apply the patch and test the OPAC shelf browser with each of
the enhanced content options enabled: Coce, Amazon, Google. In each
case, page through the shelf browser to confirm that covers load
correctly.
Signed-off-by: Cab Vinton <bibliwho at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8c5fd0dec1a0802c8714cb9ecc966f481fe45d7e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 6 11:13:49 2018 +0000
Bug 20703: (RM follow-up) Remove the word 'Payment' from void
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 455c254ee01095d574ff1a26171ec4cca251b7b5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue May 22 11:46:10 2018 -0300
Bug 20703: Add confirmation modal when making a credit void
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 462ec9601a43c31ccb12f010b4bddc80dcb71344
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Thu May 3 09:17:06 2018 -0400
Bug 20703: Add ability to void any credit
At this time, only payments may be voided. There is no reason to have this limitation. There are situations where a librarian may need to void an accidental writeoff, or perhaps void an automatic credit that was created by Koha. For illustration, this is directly from a partner library:
"For example a lost book refund becomes a credit on account. Presently the credit may be applied to a fine for a different item charged to patron. We perform a write off to clear the remaining credit, then add the fine back to the account and give the patron a refund for the lost/refunded amount. Our accounting system ask that we keep the Lost funds/refunds separate from all fines."
Test Plan:
1) Create a fine and write it off
2) Note there is no 'void' button for the writeoff
3) Apply this patch
4) Note the buttons now show
5) Test each button on a writeoff
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 72058d27415a82799d9f6acac693e94dc7bf9309
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 2 12:05:55 2018 -0300
Bug 20946: (QA follow-up) make outstanding_debits return the account lines only
This patch was discussed with Jonathan on a QA conversation. It is
better to keep this simpler and more reusable. And is the right approach
in this case.
This patch makes Koha::Account::outstanding_debits return the account
lines, and a method is added to Koha::Account::Lines so the outstanding
amount is calculated on the resultset. This is done the dame way it was
done before, and the tests got adjusted.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 158e50d0bcf214932fb1ca037049e6515fbbd80c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Jun 27 03:53:27 2018 +0000
Bug 20946: (RM follow-up) Additional tests and fix addition to undef
Added a few tests with credit lines and found we got warnings, adjusted
the routine to avoid this
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d212eb4026c8543c6f1adc9871d96233618173bf
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 26 13:20:26 2018 +0000
Bug 20946: Additional unit tests for 0 lines edge case
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b3cd3855b912cd7bfc9b10f1163a34d09be4f5e0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jun 26 13:08:36 2018 +0000
Bug 20946: Reduce number of db calls
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b0cb7f44ef80d5f6a3d45ce87543a27637c68c6f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Jun 16 09:44:19 2018 -0300
Bug 20946: Use K::Account->outstanding_debits in pay.pl and paycollect.pl
This patch changes the how account lines are fetched (using
Koha::Account->outstanding_debits) so credits are not picked.
To test:
- Add a $5 credit to a patron
- Add a $1 fine
- Go to the 'Pay fines' tab
=> FAIL: Credit is displayed
- Try to pay all fines
=> FAIL: You are told to enter a value less than or equal to -4.00
(Observe you cannot do that)
- Apply this patch
- Reload
=> SUCCESS: Credit is not displayed
=> SUCCESS: You are able to pay all fines
- Sign off :-D
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0e45263492dbd8123bf2507aad6dc45d95c4902c
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Jun 23 05:41:00 2018 -0300
Bug 20946: Add Koha::Account::outstanding_debits
This patch adds a handy method that returns the total for outstanding
debits (i.e. those that haven't been canceled with credits), and the
corresponding Koha::Account::Line objects.
Unit tests are added.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account.t
=> SUCCESS: tests pass!
- Sign off :-D
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 302224798333eee6a67822f994474a2263a75de9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 4 14:55:14 2018 -0300
Bug 21029: Make "Suspend until:" translatable
The label was part of the holds.js file. As .js files are never
translatable it needs to be moved to template level.
Test plan:
- Place a hold on an item
- Go to the patron account
- Click on the Suspend button on the holds tab
- View the modal, the label before the date field "Suspend until:" is
now translatable.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 505630ca081c93fa81f1f6b85573374be8ee1009
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 29 10:06:31 2018 -0300
Bug 21020: Fix return branch on transfer - SIP
Caused by
commit 546379cc92b733cb29a0b70247a72c770afdad26
Bug 17680: C4::Circulation - Remove GetItemIssue, simple calls
Since this commit AddReturn return a Koha::Issue object, not a hashref
with item's info.
Test plan:
1 - Enable SIP server on your test instance
For kohadevbox:
cp /etc/koha/SIPConfig.xml /etc/koha/sites/kohadev/
create patron with user/pass term1/term1 and grant circulation
privileges
2 - enable AutomaticItemReturn
3 - Checkin an item which will generate a transfer via SIP2:
perl /home/vagrant/kohaclone/misc/sip_cli_emulator.pl -a localhost -p
6001 -su term1 -sp term1 -l LPL --item {BARCODE} -m checkin -t
CR
4 - Note no CT field
5 - Apply patch
6 - Repeate checkin via SIP2
7 - Transfer destination is correctly returned in CT
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0cf594c3ad0b1e3aae2af14cbfe16bdbd2462318
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jun 29 15:39:19 2018 -0300
Revert "Bug 20864: Only set bibs_selected cookie when BrowseResultSelection is activated"
This reverts commit ce6ec1e7faef217950e3450788ea444dad26d7c0.
https://bugs.koha-community.org/show_bug.cgi?id=21024
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/SIP/ILS/Transaction/Checkin.pm | 4 +-
Koha.pm | 2 +-
Koha/Account.pm | 160 ++++++++
Koha/Account/Line.pm | 4 +-
Koha/Account/Lines.pm | 22 +-
Koha/Acquisition/Order.pm | 7 +
Koha/Schema/Result/Aqorder.pm | 32 +-
Koha/Schema/Result/Borrower.pm | 19 +-
acqui/orderreceive.pl | 10 +-
Koha/SMS/Provider.pm => acqui/showorder.pl | 70 ++--
installer/data/mysql/account_offset_types.sql | 1 +
.../marc21/mandatory/authorities_normal_marc21.sql | 2 +-
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 7 +-
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/updatedatabase.pl | 49 +++
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 44 +-
.../prog/en/includes/account_offset_type.inc | 1 +
.../intranet-tmpl/prog/en/includes/accounttype.inc | 2 +-
.../intranet-tmpl/prog/en/includes/js_includes.inc | 4 +-
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
.../prog/en/modules/acqui/acqui-home.tt | 34 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 14 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 55 ++-
.../prog/en/modules/acqui/basketgroup.tt | 41 +-
.../prog/en/modules/acqui/booksellers.tt | 33 +-
.../intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 23 +-
.../prog/en/modules/acqui/edifactmsgs.tt | 28 +-
.../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 22 +-
.../prog/en/modules/acqui/histsearch.tt | 26 +-
.../prog/en/modules/acqui/invoice-files.tt | 25 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 33 +-
.../prog/en/modules/acqui/invoices.tt | 25 +-
.../prog/en/modules/acqui/lateorders.tt | 26 +-
.../prog/en/modules/acqui/orderreceive.tt | 7 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 16 +-
.../prog/en/modules/acqui/showorder.tt | 33 ++
.../prog/en/modules/catalogue/search-history.tt | 16 +-
.../prog/en/modules/cataloguing/linkitem.tt | 7 +-
.../cataloguing/value_builder/cn_browser.tt | 37 +-
.../cataloguing/value_builder/marc21_field_007.tt | 15 +-
.../value_builder/unimarc_field_225a_bis.tt | 12 +-
.../prog/en/modules/common/patron_search.tt | 5 +-
.../en/modules/help/serials/subscription-add.tt | 2 +-
.../prog/en/modules/labels/label-edit-batch.tt | 361 +++++++++--------
.../prog/en/modules/labels/label-edit-layout.tt | 94 +++--
.../prog/en/modules/labels/label-edit-profile.tt | 107 ++---
.../prog/en/modules/labels/label-edit-template.tt | 114 +++---
.../prog/en/modules/labels/label-home.tt | 37 +-
.../prog/en/modules/labels/label-manage.tt | 194 ++++-----
.../prog/en/modules/labels/label-print.tt | 44 +-
.../intranet-tmpl/prog/en/modules/labels/result.tt | 100 ++---
.../intranet-tmpl/prog/en/modules/labels/search.tt | 11 +-
.../prog/en/modules/labels/spinelabel-home.tt | 33 +-
.../prog/en/modules/labels/spinelabel-print.tt | 39 +-
.../prog/en/modules/members/boraccount.tt | 20 +-
.../prog/en/modules/members/mancredit.tt | 4 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 1 +
.../prog/en/modules/members/paycollect.tt | 40 +-
.../prog/en/modules/patron_lists/add-modify.tt | 8 +-
.../prog/en/modules/patroncards/print.tt | 18 +-
.../prog/en/modules/plugins/plugins-disabled.tt | 12 +-
.../prog/en/modules/plugins/plugins-upload.tt | 19 +-
.../prog/en/modules/reserve/request.tt | 424 ++++++++++----------
.../prog/en/modules/tools/tools-home.tt | 16 +-
.../prog/en/modules/virtualshelves/merge.tt | 15 -
koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 23 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 19 +-
.../bootstrap/en/modules/svc/shelfbrowser.tt | 1 +
members/boraccount.pl | 6 +-
members/mancredit.pl | 32 +-
members/pay.pl | 34 +-
members/paycollect.pl | 7 +-
t/db_dependent/Accounts.t | 13 +-
t/db_dependent/Acquisition/NewOrder.t | 7 +-
t/db_dependent/Koha/Account.t | 160 ++++++++
t/db_dependent/Koha/Account/Lines.t | 127 ++++--
77 files changed, 1928 insertions(+), 1192 deletions(-)
copy Koha/SMS/Provider.pm => acqui/showorder.pl (53%)
mode change 100644 => 100755
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt
create mode 100755 t/db_dependent/Koha/Account.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list