[koha-commits] main Koha release repository branch master updated. v18.05.00-1135-g679cb39
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 24 19:37:31 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 679cb3999f01dda76c168bde4e37c5d203348518 (commit)
via 777e29e420b96ed7e6d63aff7c6b69ecc9c1d2ee (commit)
via 008112025520ba05c162493a55f2f88e70db74d5 (commit)
via 85da34c94a5a92df78e03a505054a241dc797877 (commit)
via 461e7375cd9841f6d43e11c273998c3006f04abf (commit)
via f4b7e470e774c43d9b9771f103cefc53d5ecc71f (commit)
via ba8ec9bfe2c538f4b586f30426e2dffb10b814ae (commit)
via 39772eca518512ce631ccc22c11d377df82901c4 (commit)
via 4a34d9ec0611bb48373809f5c88863a952a62fb0 (commit)
via 5a4f7c6c0e0d4a6e518415a673abd3c406c89b36 (commit)
via 023ab5845ac53c9f80ee69562d6c26f85b8b00f4 (commit)
via 8960cee9abc3f6a7bd2ffce89a204f273d508926 (commit)
via 95917f384175008aa67bd87c378f7d469d61219e (commit)
via 0c4ed27244323f970b8b1e2411844ed85511f01b (commit)
via c5641af82a0ac943bea6439a87c5b9b619bf45cf (commit)
via e530107595e1c64a2073ff36a7fc94e07dcc8779 (commit)
via 1596818ff6433825cd6071fb692bc508773bbd97 (commit)
via fb0ab55fd09457a4d7559d2af9774de9456bb2f2 (commit)
via dad1324b1b25ac018dad84176537c298edffa75d (commit)
via 0d68871836554cf4eb7dd2c1f44aa136fb041157 (commit)
via dd717e81e41da67e64132e51b2100efb65d71e1c (commit)
via ff0619e4dce087711ebef40e2ea3c9566f37f120 (commit)
via 8f0de95804f9a7159c5d1d8a7b109ed0bbcf0aaa (commit)
via c300d83edbdc6c232f7d6c51237415e7b3f1a67b (commit)
via 44b4e453095e96d46447ea9c1cf010ab5f567d4d (commit)
via 9d0fc26c4335fc9be7a01e3069c458e9397fc94f (commit)
via bcf7fb4a1ee8be03aaa704eec2653e292746df4e (commit)
via ac0999433920b9fd00f446604ee51305e4ce12bd (commit)
via 87c2b4644745b0333fc8211ce89899784dfa6a5e (commit)
via 8746ca21a271daf78cb6f4b5062323885e538801 (commit)
from df91e14135454825d1ffdf504d072973efbeeedc (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 679cb3999f01dda76c168bde4e37c5d203348518
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 23 13:17:06 2018 +0000
Bug 21511: (RM follow-up) Use orders.count instead of new variable
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 777e29e420b96ed7e6d63aff7c6b69ecc9c1d2ee
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Oct 9 17:19:09 2018 +0000
Bug 21511: Don't show acquisition details on subscription detail when there is no acq data
This patch modifies the subscription detail page so that acquisitions
details section is not shown when there is no acquisitions data.
The acquisitions details are moved into a new tab similar to how it
appears on the bibliographic details page. A count of orders is now
passed to the template so that the check for existing acquisitions data
will work correctly.
To test, apply the patch and view the detail page for subscriptions.
- When viewing a subscription for which there are orders you should see
an "Acquisitions details" tab containing the acquisitions data.
- When viewing a subscription with no orders the tab should not appear.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 008112025520ba05c162493a55f2f88e70db74d5
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 24 17:19:19 2018 +0000
Bug 15766: DBRev 18.06.00.044
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 85da34c94a5a92df78e03a505054a241dc797877
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 24 11:51:12 2018 -0300
Bug 15766: Fix incorrect GROUP BY
'koha_kohadev.creator_batches.description' isn't in GROUP BY
Fix t/db_dependent/Creators/Lib.t if strict sql modes is on
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 461e7375cd9841f6d43e11c273998c3006f04abf
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Jun 6 01:48:33 2018 +0000
Bug 15766: (follow-up) Fixing layout of description button
This patch moves the 'Save' button to the toolbar as suggested. The
description textbox and 'Save' button are hidden if the batch is new and
appears when items are added.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f4b7e470e774c43d9b9771f103cefc53d5ecc71f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu May 31 16:54:43 2018 +0000
Bug 15766: (follow-up) Correct merge errors
This patch corrects some problems applying this on current master and
removes an old merge conflict marker.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ba8ec9bfe2c538f4b586f30426e2dffb10b814ae
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Wed Oct 18 22:40:13 2017 +0000
Bug 15766: (follow-up) Hide description field if the batch is empty
Because if it's empty, it hasn't actually been created yet. Hiding the
field prevents a lot of errors
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 39772eca518512ce631ccc22c11d377df82901c4
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Tue Oct 10 03:21:33 2017 +0000
Bug 15766: (follow-up) Save description link as button on patroncard side
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4a34d9ec0611bb48373809f5c88863a952a62fb0
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Fri Sep 22 02:29:54 2017 +0000
Bug 15766: (follow-up) Making 'Save description' link a button
For consistency's sake in response to Comment 17.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5a4f7c6c0e0d4a6e518415a673abd3c406c89b36
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Sun Aug 27 21:48:06 2017 +0000
Bug 15766: Adding descriptions to patron card batches
This patch adds a 'description' column to the creator_batches table. The
description for a batch can be added and updated using ajax.
To test:
1) Apply patch and update database (you will have to restart memcached)
2) Go to Tools -> Patron card creator -> Manage batches
3) There should now be a Description column next to Batch ID. This
will be empty (as none of the batches have descriptions yet)
4) Click Edit for any batch
5) Notice new Batch description text field. Enter a description for
the batch in here and click Save description. Some text should show
saying the description was saved.
6) If you go back to the manage batches page, the description should
now show under the Description column.
7) Go to Tools -> Label Creator -> Manage labels
8) Repeat steps 3 to 6
Sponsored-by: Catalyst IT
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 023ab5845ac53c9f80ee69562d6c26f85b8b00f4
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Sep 24 13:37:16 2018 +0000
Bug 21216: (follow-up) Exclude some columns from export
This patch adds a custom buttons configuration to the Notices table so
that columns with form controls are not included in copy/print/export
operations.
The DataTables columns settings include file has been modified
to check for an existing buttons export columns configuration before
applying the default.
To test, apply the patch and clear your browser cache if necessary.
Go to Tools -> Notices & slips. The table of notices should have a
DataTables toolbar with a filter form, column visibility, and export
buttons. Test the functionality of all these tools. Only the first four
columns of the table should be included in printouts and exported files.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8960cee9abc3f6a7bd2ffce89a204f273d508926
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sun Aug 19 15:19:49 2018 -0400
Bug 21216: Add filter/search options to notices table
This patch adds a DataTables toolbar to the Notices & slips table,
including a filter field, column visibility, and data export options.
To test, apply the patch and clear your browser cache if necessary.
- Go to Tools -> Notices & slips
- Confirm that there is a table toolbar with a filter, a "Column
visibility" button, and "Excel," "CSV," "Copy," and "Print" buttons.
- Confirm that showing and hiding columns via the button is working
correctly.
- Confirm that only the first four columns are sortable.
Go to Administration -> Columns settings.
- Expand the "Tools" section.
- Find "id=lettert."
- Make some selections to configure default settings of the reports
table.
- Return to reports and confirm that these defaults are applied.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 95917f384175008aa67bd87c378f7d469d61219e
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Oct 24 15:09:07 2018 +0200
Bug 20554: (follow-up) KOHA_VERSION is not needed in opaclayoutstylesheet
SET opaclayoutstylesheet does not need KOHA_VERSION, its defined by Asset.css()
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Fix a bad resolution conflict
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0c4ed27244323f970b8b1e2411844ed85511f01b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 24 13:22:46 2018 +0000
Bug 15486: DBRev 18.06.00.043
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c5641af82a0ac943bea6439a87c5b9b619bf45cf
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Sep 24 12:56:07 2018 -0300
Bug 15486: (follow-up) Default to unlimited
While it doesn't have a practical effect (the variable is reset several
lines below) I agree this should be explicitly set to its default.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e530107595e1c64a2073ff36a7fc94e07dcc8779
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Feb 7 16:10:28 2018 -0300
Bug 15486: Make circ rules UI handle holds_per_day
This patch makes the staff UI correctly handle the holds_per_day
configuration.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1596818ff6433825cd6071fb692bc508773bbd97
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jul 19 19:32:09 2017 -0300
Bug 15486: Modify request.tt to handle the new error string
This patch makes reserve/request.pl display a convenient error
description when a hold cannot be placed due to the new daily limit
configuration.
To test:
- Apply this patchset
- Upgrade
- Configure your circulation rules so there's a daily limit for holds
- Place holds so the patron reaches the maximum
- Place one more hold
- Notice the hold cannot be placed and a convenient error message is
displayed.
- Sign off :-D
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit fb0ab55fd09457a4d7559d2af9774de9456bb2f2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jul 19 18:14:19 2017 -0300
Bug 15486: Extend CanItemBeReserved so it handles daily holds limits
This patch implements the required changes in
C4::Reserves::CanItemBeReserved so it implements a daily limit on holds.
It returns the 'tooManyReservesToday' string if the policy doesn't allow
placing the hold. It returns 'OK' (current behaviour) otherwise.
To test:
- Run:
$ sudo koha-shell kohadev
k$ cd kohaclone
k$ prove t/db_dependent/Holds.t
=> FAIL: Tests fail because the error condition is not making
CanItemBeReserved return the desired error code.
- Apply this patch
- Run:
k$ prove t/db_dependent/Holds.t
=> SUCCESS: Tests pass!
- Sign off :-D
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dad1324b1b25ac018dad84176537c298edffa75d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jul 19 16:30:24 2017 -0300
Bug 15486: Unit tests
This patch introduces unit tests for the new circulation rules option
that allows setting a max holds per day limit.
To test:
- Apply the patch
- Run:
$ sudo koha-shell kohadev
k$ cd kohaclone
k$ prove t/db_dependent/Holds.t
=> FAIL: CanItemBeReserved doesn't check the amount of holds per day
and the introduced error code is not returned. OK is returned
instead.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0d68871836554cf4eb7dd2c1f44aa136fb041157
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 7 15:13:00 2017 -0300
Bug 15486: DB structure change
This patch adds a new column __max_holds_per_day__ to the issuingrules table.
It's going to be used to set a daily limit for holds.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit dd717e81e41da67e64132e51b2100efb65d71e1c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 3 14:37:09 2018 +0000
Bug 20044: (follow-up) Add min-width to .input_marceditor
This patch adds a min-width property to the first .input_marceditor rule
in order to prevent <selects> styled by Select2 from collapsing at
narrower browser widths.
To reproduce the bug, apply all patches on Bug 20044 except this one.
Open the MARC editor and narrow the browser width to below 768 pixels.
Reload the page and view a tab which contains a <select> styled by
Select2 (942c is often an example). The <select> will have narrowed to
be almost invisible.
Apply the patch and reproduce the steps above. The <select>s should be
fully visible.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ff0619e4dce087711ebef40e2ea3c9566f37f120
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 1 16:18:04 2018 -0300
Bug 20044: Fix input_marceditor selectors
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I can't reproduce the problem this patch is intended to fix, but the
changes are sensible either way.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8f0de95804f9a7159c5d1d8a7b109ed0bbcf0aaa
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 13 09:02:51 2018 +0000
Bug 20044: (follow-up) Improve responsive behavior of MARC editor
This patch makes some changes to addbiblio.css in order to improve
responsive changes to the MARC editor.
Note: This patch does not make changes affecting narrow browser widths.
The changes are focused on adapting to larger layouts affected by the
switch to the Bootstrap grid.
To test, apply the patch and clear your cache if necessary. Open an
existing record for editing in the standard MARC editor. View the page
at various browser widths and confirm that it looks correct.
Note: Because of the way the floating toolbar is displayed it does not
dynamically resize when you resize the browser. Reload the page after
resizing the browser window to confirm that the toolbar adapts at
different widths.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c300d83edbdc6c232f7d6c51237415e7b3f1a67b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jan 19 15:10:18 2018 +0000
Bug 20044: Switch single-column templates to Bootstrap grid: Cataloging
This patch updates several cataloging module templates to use the
Bootstrap grid.
- cataloguing/addbooks.tt - Cataloging - The main page and the
cataloging search results page should look correct.
- cataloguing/addbiblio.tt - Cataloging -> New record - The record edit
page should look correct.
- cataloguing/merge.tt - Cataloging -> Search -> Select two records to
merge. The merge reference selection page should look correct, as well
as the source/destination selection page.
- cataloguing/moveitem.tt - Catalog -> Search -> View record -> Edit ->
Attach item. The barcode submit form and confirmation screens should
look correct.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 44b4e453095e96d46447ea9c1cf010ab5f567d4d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 10 13:32:29 2018 +0000
Bug 21492: Show subscriptions count in the sidebar menu
This patch modifies the include file for the sidebar menu of
bibliographic views so that a count of subscriptions is shown on the
subscriptions tab.
To test you should have bibliographic record with one or more
subscriptions. View that bibliographic record and confirm that the
sidebar menu tab shows the count of subscriptions.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
https://bugs.koha-community.org/show_bug.cgi?id=21291
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9d0fc26c4335fc9be7a01e3069c458e9397fc94f
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Oct 21 02:34:25 2018 +0000
Bug 21625: Fix wording and typo in SMSSendDriver system preference description
SMSSendDriver was missing an S.
Koha is sending not receiving messages, so I think switching
that will be a little more clear.
To test:
Verify that the system preference description reads correctly.
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bcf7fb4a1ee8be03aaa704eec2653e292746df4e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Oct 16 15:15:10 2018 -0300
Bug 21584: Wrong offset type for Lost Item
Bug 2696 introduced account_offset_type.inc but 'Lost Item Return' doesn't match what is added on the database. Moreover, bug 20978 added references to this wrong value too in Koha::Account
This patch performs a trivial fix for this.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Patch matches what was outlined in test plan, also passes qa test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ac0999433920b9fd00f446604ee51305e4ce12bd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Oct 19 11:50:06 2018 +0000
Bug 21614: Search bar on Stock rotation page displays both [-] and [+] simultaneously
This patch modifies the stock rotation template so that it include the
catalog search bar include instead of the patrons one.
To test, apply the patch and enable the StockRotation system preference.
- Go to Tools -> Stock rotation.
- Confirm that the search boxes at top are 'Check out,' 'Check in,'
'Renew,' and 'Search the catalog.' 'Search the catalog' should be
selected.
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 87c2b4644745b0333fc8211ce89899784dfa6a5e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Oct 17 12:32:11 2018 -0300
Bug 21486: Only fetch the items' barcodes
and avoid unecessary processing
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Tested and found correct AU data is returned, and passes QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8746ca21a271daf78cb6f4b5062323885e538801
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 12 12:47:04 2018 -0300
Bug 21486: Fix 'AU' for SIP
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Creators/Batch.pm | 7 +-
C4/Creators/Lib.pm | 4 +-
C4/Reserves.pm | 18 ++-
C4/SIP/ILS/Patron.pm | 9 +-
Koha.pm | 2 +-
Koha/Account.pm | 2 +-
Koha/Schema/Result/Issuingrule.pm | 11 +-
admin/columns_settings.yml | 18 +++
admin/smart-rules.pl | 11 +-
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 22 ++++
koha-tmpl/intranet-tmpl/prog/css/addbiblio.css | 38 +++++-
.../prog/en/includes/account_offset_type.inc | 2 +-
.../prog/en/includes/biblio-view-menu.inc | 2 +-
.../prog/en/includes/columns_settings.inc | 19 ++-
.../prog/en/modules/admin/columns_settings.tt | 6 +
.../prog/en/modules/admin/preferences/patrons.pref | 2 +-
.../prog/en/modules/admin/smart-rules.tt | 26 +++-
.../prog/en/modules/cataloguing/addbiblio.tt | 9 +-
.../prog/en/modules/cataloguing/addbooks.tt | 7 +-
.../prog/en/modules/cataloguing/merge.tt | 15 +--
.../prog/en/modules/cataloguing/moveitem.tt | 11 +-
.../prog/en/modules/labels/label-edit-batch.tt | 43 ++++++-
.../prog/en/modules/patroncards/edit-batch.tt | 83 ++++++++++--
.../prog/en/modules/reserve/request.tt | 2 +
.../prog/en/modules/serials/subscription-detail.tt | 7 +-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 4 +
.../prog/en/modules/tools/stockrotation.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/js/letter.js | 20 ++-
.../bootstrap/en/includes/doc-head-close.inc | 2 +-
labels/label-edit-batch.pl | 3 +
labels/label-manage.pl | 1 +
patroncards/edit-batch.pl | 3 +
patroncards/manage.pl | 1 +
svc/creator_batches | 73 +++++++++++
t/db_dependent/Holds.t | 135 +++++++++++++++++++-
36 files changed, 540 insertions(+), 84 deletions(-)
create mode 100755 svc/creator_batches
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list