[koha-commits] main Koha release repository branch master updated. v16.05.00-707-g28a4d14
Git repo owner
gitmaster at git.koha-community.org
Thu Sep 8 18:19:33 CEST 2016
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 28a4d1414a49ac0313b3171c0e7b38fbadc530f1 (commit)
via 62f4186f881e8eb08373d51e06c45769b41856b5 (commit)
via 632c78c073cc7f658442252e9d69cd689bcb2730 (commit)
via 0079ca7c72403059ca89f564cd6814c6dfb4312a (commit)
via f435d83c0c5283f49cf4089b17c298860e6168ac (commit)
via f1e5d61b461b1569399742bd491996f672ba293b (commit)
via 9d49e0d2c874292b553d7e0e0a878cd48ee75e09 (commit)
via c840c9383558db8ebabfb9b84efccf72904ac061 (commit)
via 6b95cb48b30a3e128d7b41ef1756efc12cd823ba (commit)
via df97814f3034a3d5015546c4eca21f08ae951e37 (commit)
via 79f4afe26a54061eb74d97e4753f6b73cb9e703e (commit)
via 9b9803b69c8bde879768ccfa3cc4688ef46b7799 (commit)
via 19a977dc7b779173c4a3e96b6b06dc35db663601 (commit)
from 9b8b18151d7773fe811742cdbf7998a15b70bf27 (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 28a4d1414a49ac0313b3171c0e7b38fbadc530f1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Aug 31 14:20:34 2016 +0200
Bug 15758: [QA Follow-up] Final touch?
From qa tools:
reports/cat_issues_top.pl: pod: =over on line 39 without closing =back
Note: qa tools does also report "options_for_libraries: not found" on two
template includes. Considering this as a false alarm, since the block is
defined in another include loaded in doc-head-open.
[1] koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
[2] koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc
Found a template where a USE Branches was missing:
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
Easy to spot since the libraries combo was empty.
Tried to find similar occurrences with few greps, but couldn't find any.
I did find duplicate USE Branches though in:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
This patch removes them.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 62f4186f881e8eb08373d51e06c45769b41856b5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Aug 26 14:05:42 2016 +0100
Bug 15758: Fix variable name, it's a branchcode
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 632c78c073cc7f658442252e9d69cd689bcb2730
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 26 13:22:31 2016 +0200
Bug 15758: [QA Follow-up] Corrections related to GetBranches
[1] C4/Search
A call to Koha::Libraries is added to routine pazGetRecords, but the
results of that call are not used. So removing it again.
[2] catalogue/itemsearch.pl
Although A=>B=>C=>D works, we'd better use here A=>B, C=>D.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 0079ca7c72403059ca89f564cd6814c6dfb4312a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 26 09:02:04 2016 +0200
Bug 15758: [QA Follow-up] Some corrections related to GetBranchName
[1] Acquisition.pm
The lines filling $row in GetBasketGroupAsCSV may have side-effects when
the library name is not found. This change restores former behavior. Just
theoretically more safe.
Note that it also contained a typo: $row->{deliveryplace} should have been
$row->{$place}.
[2] Auth.pm
checkauth: $branchname = Koha::Libraries->find($branchcode)->branchname;
Should normally be fine, but I rather have an empty string here than
crashing on "Can't call method branchname on undefined value".
Same for sub check_api_auth.
Note that this holds for a larger number of calls, but I am adding a check
here because it is checkauth.
Also removed a duplicate use Koha::Libraries-statement.
[3] Search.pm
Also removed a duplicate use statement for Libraries.
[4] svc/holds
Added an (explicit) use statement for Koha::Libraries.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit f435d83c0c5283f49cf4089b17c298860e6168ac
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 26 08:01:07 2016 +0200
Bug 15758: [QA Follow-up] Remove onlymine from Plugin/Branches.pm
Hard to miss that one:
Template process failed: plugin error - Bareword "C4::Branch::onlymine" not allowed while "strict subs" in use at Koha/Template/Plugin/Branches.pm line 59.
Compilation failed in require at /usr/lib/perl5/Template/Plugins.pm line 206.
Removed OnlyMine from Plugin/Branches. Replaced by a template var in
cleanborrowers; it was used only once.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit f1e5d61b461b1569399742bd491996f672ba293b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 8 17:17:31 2016 +0000
Bug 15758: Koha::Libraries - Do not select an option if selected is defined
This will certainly need a few more tweaks.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 9d49e0d2c874292b553d7e0e0a878cd48ee75e09
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 8 15:20:18 2016 +0000
Bug 15758: Koha::Libraries - Add tests for the Branches TT plugin
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit c840c9383558db8ebabfb9b84efccf72904ac061
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 5 12:34:08 2016 +0000
Bug 15758: Koha::Libraries - Ultimate duel for C4::Branch
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6b95cb48b30a3e128d7b41ef1756efc12cd823ba
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 5 12:30:29 2016 +0000
Bug 15758: Koha::Libraries - Move onlymine to C4::Context::only_my_library
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit df97814f3034a3d5015546c4eca21f08ae951e37
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 4 15:24:23 2016 +0000
Bug 15758: Koha::Libraries - Remove GetBranches
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 79f4afe26a54061eb74d97e4753f6b73cb9e703e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Feb 4 15:24:12 2016 +0000
Bug 15758: Koha::Libraries - Move mybranch to C4::Context
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 9b9803b69c8bde879768ccfa3cc4688ef46b7799
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Feb 3 15:58:08 2016 +0000
Bug 15758: Koha::Libraries - Remove GetBranchesLoop
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 19a977dc7b779173c4a3e96b6b06dc35db663601
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 2 17:28:30 2016 +0000
Bug 15758: Koha::Libraries - Remove GetBranchName
This is the fourth and last patch set to remove C4::Branch.
The real purpose of this patch is to standardise and refactor some code
which is related to the libraries selection/display.
Its unconfessed purpose is to remove the C4::Branch package.
Before this patch set, only 6 subroutines still existed in the C4::Branch
package:
- GetBranchName
- GetBranchesLoop
- mybranch
- onlymine
- GetBranches
- GetBranch
GetBranchName basically returns the branchname for a given branchcode.
The branchname is only used for a display purpose and we don't need to
retrieve it in package or pl scripts (unless for a few exceptions).
We have a `Branches` template plugin with a `GetName` method which does
exactly this job.
To achieve this removal, we will use this template plugin and delete the
GetBranchName from pl and pm files.
The `Branches.all()` will now select the library of the logged in user
if no `selected` parameter has been passed.
This new behavior could cause regressions, for instance there are some
places where we do not want an option preselected (batch item
modification for instance), keep that in mind when testing.
GetBranchesLoop took 3 parameters: $branch and $onlymine.
The first one was used to set a "selected" flag, for a display purpose:
select an option in the libraries dropdown lists.
The second one was useless: If not passed or set to 0, the
`C4::Branch::onlymine` subroutine was called.
This onlymine flag was use to know if the logged in user was able to see
other libraries infos.
A patron can see the infos from other libraries if IndependentBranches
is not set OR if he has the superlibrarian permission.
Prior to this patch set, the "onlymine test" was done on different
places (neworderempty.pl, additem.pl, holidays.pl, etc.), including the
Branches TT plugin. In this patch set, this test is only done on one
place (C4::Context::only_my_library, code moved from
C4::Branch::onlymine).
To accomplish the same job as this subroutine, we just need to call the
`Branches.all()` method from the `Branches` TT plugin. It already
accepts a `selected` parameter to set a flag on the option to select.
To avoid the repetitive
[% IF selected %]<option selected="selected">[% ELSE %]<option>[% END %]
pattern, a new `html_helpers` TT include file has been created, it
defines an `options_for_libraries` block, which takes a `selected`
parameter. We could imagine to use this include file for other
selects.
The 'mybranch` and `onlymine` subroutines of the C4::Branch package have
been moved to C4::Context. onlymine has been renamed with
only_my_library. There are only 4 occurrences of it, against 11 before
this patch set.
There 2 subroutines are Context-centric and it makes sense to put them
in `C4::Context` (at least it's the least worst place!)
GetBranches is the tricky part of this patch set: It retrieves all the
libraries, independently of the value of IndependentBranches.
To keep the same way as the existing calls of `Branches.all()`, I have
added a `unfiltered` parameter. If set, the `Branches.all()` will call
a usual Koha::Libraries->search method, otherwise
Koha::Libraries->search_filtered will be called. This new method will
check if the logged in user is allowed to see other libraries or only
its library.
Note that this `GetBranches` subroutine also created a `category` key:
it allowed to get the list of groups (of libraries) where this library
existed. Thanks to a previous patch set (bug 15295), this value was
not used anymore (I may have missed something!).
Note that the only use of `GetBranch` was buggy (see bug 15746).
Test plan (for the whole patch set):
The best way to test this whole patch set is to test with 2 instances: 1
with the patch set applied, 1 using master, to be sure there is no
regression.
It would be good to test the same with `IndependentBranches` and the
without `IndependentBranches`.
No difference should be found.
The tester must focus on the library dropdowns on as many forms as
possible.
You will notice changes in the order of the options: the libraries will
now be ordered by branchname (instead of branchcode in some places).
A special attention will be given to the following page:
- acqui/neworderempty.pl
- catalogue/search.pl
- members/members-home.pl (header?)
- opac/opac-topissues.pl
- tools/holidays.pl
- admin/branch_transfer_limits.pl
- admin/item_circulation_alerts.pl
- rotating_collections/transferCollection.pl
- suggestion/suggestion.pl
- tools/export.pl
Notes for QA:
- There are 2 FIXMEs in the patch set, I have kept the existing behavior,
but I am not sure it's the good one. Feel free to open a bug report and
I will fill a patch if you think it's not correct. Otherwise, remove the
FIXME lines in a follow-up patch.
- The whole patch set is huge and makes a lot of changes.
But it finally will tremendously reduce the number of lines:
716 insertions for 1910 deletions
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 22 +-
C4/Auth.pm | 17 +-
C4/Biblio.pm | 3 +-
C4/Branch.pm | 191 ------------------
C4/Circulation.pm | 24 ++-
C4/Context.pm | 24 +++
C4/HoldsQueue.pm | 1 -
C4/ILSDI/Services.pm | 30 +--
C4/Items.pm | 15 +-
C4/Koha.pm | 1 -
C4/Labels/Label.pm | 7 +-
C4/Letters.pm | 1 -
C4/Overdues.pm | 4 +-
C4/SIP/ILS/Patron.pm | 5 +-
C4/Search.pm | 23 +--
C4/ShelfBrowser.pm | 5 +-
C4/Utils/DataTables/Members.pm | 3 +-
C4/Utils/DataTables/VirtualShelves.pm | 1 -
C4/XSLT.pm | 8 +-
Koha/Libraries.pm | 17 +-
Koha/Template/Plugin/Branches.pm | 40 ++--
acqui/acqui-home.pl | 8 -
acqui/add_user_search.pl | 5 -
acqui/addorderiso2709.pl | 1 -
acqui/basket.pl | 26 +--
acqui/basketgroup.pl | 7 +-
acqui/basketheader.pl | 12 +-
acqui/histsearch.pl | 1 -
acqui/invoices.pl | 21 --
acqui/lateorders.pl | 1 -
acqui/neworderempty.pl | 19 --
acqui/newordersubscription.pl | 14 --
acqui/orderreceive.pl | 7 -
acqui/pdfformat/layout3pages.pm | 12 +-
acqui/pdfformat/layout3pagesfr.pm | 10 +-
admin/add_user_search.pl | 5 -
admin/aqbudgetperiods.pl | 3 -
admin/aqbudgets.pl | 19 +-
admin/aqplan.pl | 2 -
admin/authorised_values.pl | 15 +-
admin/branch_transfer_limits.pl | 22 +-
admin/categories.pl | 12 +-
admin/clone-rules.pl | 6 -
admin/item_circulation_alerts.pl | 16 --
admin/patron-attr-types.pl | 14 +-
admin/smart-rules.pl | 18 +-
admin/transport-cost-matrix.pl | 9 +-
catalogue/detail.pl | 9 +-
catalogue/getitem-ajax.pl | 6 +-
catalogue/itemsearch.pl | 11 +-
catalogue/moredetail.pl | 3 -
catalogue/search.pl | 24 +--
cataloguing/addbiblio.pl | 18 +-
cataloguing/additem.pl | 22 +-
cataloguing/linkitem.pl | 1 -
cataloguing/moveitem.pl | 1 -
.../value_builder/marc21_linking_section.pl | 1 -
cataloguing/value_builder/unimarc_field_4XX.pl | 1 -
circ/bookcount.pl | 21 +-
circ/branchoverdues.pl | 3 +-
circ/branchtransfers.pl | 14 +-
circ/circulation.pl | 2 -
circ/overdue.pl | 11 -
circ/returns.pl | 24 +--
circ/selectbranchprinter.pl | 14 +-
circ/transferstoreceive.pl | 12 +-
circ/view_holdsqueue.pl | 2 -
circ/waitingreserves.pl | 4 +-
course_reserves/add_items.pl | 2 -
debian/templates/plack.psgi | 1 -
.../prog/en/includes/branch-selector.inc | 6 +-
.../prog/en/includes/budgets-admin-search.inc | 9 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../prog/en/includes/doc-head-close.inc | 1 +
.../prog/en/includes/html_helpers.inc | 9 +
.../prog/en/includes/subscriptions-search.inc | 9 +-
.../prog/en/modules/acqui/acqui-home.tt | 5 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 13 +-
.../prog/en/modules/acqui/basketgroup.tt | 24 +--
.../prog/en/modules/acqui/basketheader.tt | 21 +-
.../prog/en/modules/acqui/invoices.tt | 12 +-
.../prog/en/modules/acqui/orderreceive.tt | 5 +-
.../prog/en/modules/admin/aqbudgets.tt | 13 +-
.../en/modules/admin/branch_transfer_limits.tt | 17 +-
.../prog/en/modules/admin/clone-rules.tt | 70 +++----
.../en/modules/admin/item_circulation_alerts.tt | 12 +-
.../prog/en/modules/admin/smart-rules.tt | 29 +--
.../prog/en/modules/admin/transport-cost-matrix.tt | 5 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 5 +-
.../prog/en/modules/catalogue/advsearch.tt | 10 +-
.../prog/en/modules/catalogue/detail.tt | 13 +-
.../prog/en/modules/catalogue/moredetail.tt | 5 +-
.../prog/en/modules/circ/bookcount.tt | 19 +-
.../prog/en/modules/circ/branchoverdues.tt | 5 +-
.../prog/en/modules/circ/branchtransfers.tt | 17 +-
.../prog/en/modules/circ/circulation.tt | 6 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 25 +--
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 20 +-
.../prog/en/modules/circ/selectbranchprinter.tt | 9 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 14 +-
.../prog/en/modules/circ/waitingreserves.tt | 6 +-
.../prog/en/modules/common/patron_search.tt | 8 +-
.../en/modules/course_reserves/add_items-step2.tt | 8 +-
.../prog/en/modules/members/discharge.tt | 1 +
.../prog/en/modules/members/discharges.tt | 1 +
.../prog/en/modules/members/member-flags.tt | 1 +
.../prog/en/modules/members/member-password.tt | 1 +
.../prog/en/modules/members/member.tt | 8 +-
.../prog/en/modules/members/memberentrygen.tt | 13 +-
.../prog/en/modules/members/moremember.tt | 1 +
.../prog/en/modules/members/notices.tt | 1 +
.../intranet-tmpl/prog/en/modules/members/pay.tt | 1 +
.../prog/en/modules/members/paycollect.tt | 1 +
.../en/modules/members/purchase-suggestions.tt | 1 +
.../prog/en/modules/members/routing-lists.tt | 1 +
.../prog/en/modules/members/statistics.tt | 1 +
.../prog/en/modules/reports/bor_issues_top.tt | 4 +-
.../prog/en/modules/reports/borrowers_stats.tt | 13 +-
.../prog/en/modules/reports/cat_issues_top.tt | 13 +-
.../prog/en/modules/reports/catalogue_out.tt | 8 +-
.../prog/en/modules/reports/catalogue_stats.tt | 9 +-
.../prog/en/modules/reports/issues_avg_stats.tt | 5 +-
.../modules/reports/issues_by_borrower_category.tt | 5 +-
.../prog/en/modules/reports/issues_stats.tt | 15 +-
.../prog/en/modules/reports/itemslost.tt | 7 +-
.../prog/en/modules/reports/itemtypes.tt | 11 +-
.../prog/en/modules/reports/reserves_stats.tt | 15 +-
.../prog/en/modules/reports/serials_stats.tt | 8 +-
.../prog/en/modules/reserve/request.tt | 36 +---
.../rotating_collections/transferCollection.tt | 11 +-
.../prog/en/modules/serials/checkexpiration.tt | 18 +-
.../prog/en/modules/serials/serials-search.tt | 18 +-
.../prog/en/modules/serials/subscription-add.tt | 11 +-
.../prog/en/modules/suggestion/suggestion.tt | 19 +-
.../prog/en/modules/tools/cleanborrowers.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/export.tt | 3 +-
.../prog/en/modules/tools/holidays.tt | 20 +-
.../prog/en/modules/tools/import_borrowers.tt | 7 +-
.../prog/en/modules/tools/inventory.tt | 8 +-
.../prog/en/modules/tools/koha-news.tt | 31 +--
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 12 +-
.../prog/en/modules/tools/modborrowers.tt | 3 +-
.../prog/en/modules/tools/overduerules.tt | 8 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 +
.../bootstrap/en/includes/doc-head-close.inc | 1 +
.../bootstrap/en/includes/html_helpers.inc | 9 +
.../bootstrap/en/includes/item-status.inc | 4 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 10 +-
.../bootstrap/en/includes/opac-topissues.inc | 11 +-
.../bootstrap/en/modules/opac-advsearch.tt | 9 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 +-
.../bootstrap/en/modules/opac-memberentry.tt | 9 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 23 +--
.../bootstrap/en/modules/opac-suggestions.tt | 11 +-
.../bootstrap/en/modules/opac-topissues.tt | 3 +-
members/boraccount.pl | 2 -
members/deletemem.pl | 2 -
members/files.pl | 2 -
members/guarantor_search.pl | 5 -
members/mancredit.pl | 2 -
members/maninvoice.pl | 2 -
members/member-flags.pl | 2 -
members/member-password.pl | 2 -
members/member.pl | 3 +-
members/memberentry.pl | 12 +-
members/members-home.pl | 30 +--
members/members-update-do.pl | 1 -
members/members-update.pl | 1 -
members/moremember.pl | 2 +-
members/notices.pl | 2 -
members/pay.pl | 2 -
members/paycollect.pl | 2 -
members/printfeercpt.pl | 2 -
members/printinvoice.pl | 2 -
members/purchase-suggestions.pl | 2 -
members/readingrec.pl | 4 -
members/routing-lists.pl | 4 -
members/statistics.pl | 2 -
misc/plack/koha.psgi | 1 -
offline_circ/list.pl | 1 -
opac/opac-basket.pl | 6 +-
opac/opac-detail.pl | 18 +-
opac/opac-discharge.pl | 1 -
opac/opac-memberentry.pl | 2 -
opac/opac-messaging.pl | 1 -
opac/opac-reserve.pl | 20 +-
opac/opac-search.pl | 14 +-
opac/opac-suggestions.pl | 5 +-
opac/opac-topissues.pl | 6 +-
opac/opac-user.pl | 19 --
patroncards/add_user_search.pl | 5 -
reports/acquisitions_stats.pl | 8 +-
reports/bor_issues_top.pl | 12 --
reports/borrowers_stats.pl | 15 +-
reports/cat_issues_top.pl | 4 -
reports/catalogue_out.pl | 2 -
reports/catalogue_stats.pl | 2 -
reports/guided_reports.pl | 10 +-
reports/issues_avg_stats.pl | 2 -
reports/issues_by_borrower_category.plugin | 4 -
reports/issues_stats.pl | 2 -
reports/itemslost.pl | 7 +-
reports/itemtypes.plugin | 7 -
reports/reserves_stats.pl | 5 +-
reports/serials_stats.pl | 3 +-
reserve/request.pl | 35 +---
rotating_collections/transferCollection.pl | 13 --
serials/add_user_search.pl | 5 -
serials/checkexpiration.pl | 8 +-
serials/claims.pl | 3 -
serials/routing-preview.pl | 4 +-
serials/serials-home.pl | 1 -
serials/serials-search.pl | 15 --
serials/subscription-add.pl | 24 +--
suggestion/suggestion.pl | 34 +---
svc/cataloguing/framework | 8 +-
svc/holds | 4 +-
t/Branch.t | 14 --
t/db_dependent/Branch.t | 210 --------------------
t/db_dependent/Circulation.t | 1 -
t/db_dependent/Circulation/GetIssues.t | 8 +-
t/db_dependent/Circulation/TooMany.t | 1 -
t/db_dependent/Circulation/transfers.t | 1 -
t/db_dependent/Holds.t | 1 -
t/db_dependent/Holds/LocalHoldsPriority.t | 4 -
t/db_dependent/Holds/RevertWaitingStatus.t | 8 +-
t/db_dependent/HoldsQueue.t | 1 -
t/db_dependent/Holidays.t | 1 -
t/db_dependent/NewsChannels.t | 4 +-
t/db_dependent/Overdues.t | 5 +-
t/db_dependent/Reserves.t | 9 +-
t/db_dependent/Template/Plugin/Branches.t | 85 +++++---
t/db_dependent/Template/Plugin/Categories.t | 1 -
tools/batchMod.pl | 19 +-
tools/cleanborrowers.pl | 1 +
tools/export.pl | 53 ++---
tools/holidays.pl | 29 ---
tools/import_borrowers.pl | 7 +-
tools/inventory.pl | 12 --
tools/koha-news.pl | 4 -
tools/letter.pl | 23 +--
tools/modborrowers.pl | 5 +-
tools/newHolidays.pl | 11 +-
tools/overduerules.pl | 5 +-
tools/viewlog.pl | 2 -
246 files changed, 792 insertions(+), 1974 deletions(-)
delete mode 100644 C4/Branch.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc
delete mode 100755 t/Branch.t
delete mode 100644 t/db_dependent/Branch.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list