[koha-commits] main Koha release repository branch master updated. v17.11.00-741-g45bb8a8
Git repo owner
gitmaster at git.koha-community.org
Mon Feb 26 15:26:16 CET 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 45bb8a8225d88f43125803c0994245915cd4b3cc (commit)
via 3d2e91a5730c1916a05134fa56e7557d4fc51f36 (commit)
via efa894e625b4097ca0c1b41380a8d8afec5dc273 (commit)
via d81f371e2dfacb4da9eecdb4ed521af581c67fc4 (commit)
via 0e83779f2f68a16f72f5e3ffa5494424c4e182db (commit)
via 1d9245d7b21f1bd0b403940e12156ff364a8f6e8 (commit)
via 2410aaca23548be9817dfcec9f66d8999390cd67 (commit)
via dcd495de24dd2bca4079a25e6b0a968b3b40f899 (commit)
via 4e479921bfdd0983e76c3c0d7f2e4bb568aa299e (commit)
via 6355791848585f7ef490b1c63f64790b9a783e73 (commit)
via d9558f77866fa3fd530eb615b8f5d277d1b8c608 (commit)
via 51aa6db46c604aa202a3d8f8e5028557480efbd5 (commit)
via 4609e95f9d9f8bd2a773522d67d7cd6126c9120a (commit)
via ca32f936576e07909d7d5468f8eaa470221de6a1 (commit)
via f1b6feb20f19492f4848c939566472f33bd621c9 (commit)
via 78cd06a0f67f2f5eb09a9cf9441e4619856ac407 (commit)
via fc02e92d107750d624bf8121ca48a3c63eee9e21 (commit)
from 673a40d2acc5c8c58b7f3e7e6d11c329d0587fc6 (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 45bb8a8225d88f43125803c0994245915cd4b3cc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 15 15:27:31 2017 +0000
Bug 19823: Move template JavaScript to the footer: MARC21 editor plugins
This patch modifies the templates for MARC21 editor plugins so that
JavaScript is included in the footer.
To test, you must link the plugins to their corresponding tag +
subfield (if they aren't already):
In a bibliographic framework:
000 -> marc21_leader.pl
006 -> marc21_field_006.pl
007 -> marc21_field_007.pl
008 -> marc21_field_008.pl
773$t -> marc21_linking_section.tt
In an authorities framework:
000 -> marc21_leader_authorities.tt
008 -> marc21_field_008_authorities.tt
-> marc21_field_008_classifications.tt
For each field, trigger the plugin by clicking the plugin link. Test
JavaScript-driven functionality in each plugin window and confirm that
your selections are correctly saved to the editor.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Edit: Fix for QA, add KOHA_VERSION variables to js includes
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3d2e91a5730c1916a05134fa56e7557d4fc51f36
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 5 17:17:15 2017 +0000
Bug 19754: Move template JavaScript to the footer: Acquisitions, part 2
This patch modifies some staff client acquisitions 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 the
modified templates: All button controls, DataTables functionality, tabs,
etc.
- Acquisitions -> Invoices
- Datepickers
- Search for invoices
- Datatable
- Acquisitions -> Late orders
- Datepickers, datatables, selection controls (when searching by
vendor)
- Acquisitions -> Vendor -> Basket -> Add to basket -> From an existing
record -> Search
- Datatables, View MARC modal
- Acquisitions -> Vendor -> Basket -> Add to basket -> From a new
(empty) record
- Form validation, inactive fund control, add users to notify on
receiving.
- Acquisitions -> Vendor -> Basket -> Add to basket -> From a
subscription -> Search
- Datatables, show only renewed, show/hide search form
- Acquisitions -> Vendor -> Basket -> Add to basket -> From a suggestion
- Datatables, "Show" controls
- Acquisitions
- "Ordered" link in table of funds
- Datatables
- Acquisitions -> Vendor -> Receive shipment -> Invoice -> Receive
- Datepickers, item add form plugins (test with AcqCreateItem set to
'receiving an order.'
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit efa894e625b4097ca0c1b41380a8d8afec5dc273
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Feb 19 22:43:32 2018 +0000
Bug 12001: (QA follow-up) Fix showing links to items on boraccount page
Test plan:
Go to the Fines -> Account page of a patron with fees linked to items
--> without patch there is no link to related item
--> with patch the link is presented in description column
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d81f371e2dfacb4da9eecdb4ed521af581c67fc4
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Feb 19 22:31:54 2018 +0000
Bug 12001: (QA follow-up) Fix patron account summary print
Test plan:
Try to print patron account summary
--> without patch it explodes
--> with patch it works, and if there is a fee related to item, the title should be printed out
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 0e83779f2f68a16f72f5e3ffa5494424c4e182db
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Feb 19 21:24:32 2018 +0000
Bug 12001: (QA follow-up) Add test for Koha::Account::Lines object
Test plan
prove t/db_dependent/Koha/Account/Lines.t
--> should be green
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1d9245d7b21f1bd0b403940e12156ff364a8f6e8
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Feb 19 20:49:02 2018 +0000
Bug 12001: (QA follow-up) Fix printinvoice page
Test plan:
Try to print a fee
--> without patch it explodes
--> with patch it works and the date is formatted according to
system wide date format setting
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2410aaca23548be9817dfcec9f66d8999390cd67
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Feb 16 15:05:30 2018 -0300
Bug 12001: (QA follow-up) Explicit return
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit dcd495de24dd2bca4079a25e6b0a968b3b40f899
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Jan 7 13:41:07 2018 -0300
Bug 12001: Format DEBT correctly
Before this patchset, DEBT was formatted in the module, now it should be
done template-side.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4e479921bfdd0983e76c3c0d7f2e4bb568aa299e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 5 18:00:24 2018 -0300
Bug 12001: Prove that result are the same \o/
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6355791848585f7ef490b1c63f64790b9a783e73
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 5 17:25:41 2018 -0300
Bug 12001: Move GetMemberAccountBalance to Koha::Account->non_issues_charges
As said previously, GetMemberAccountBalance returns ( the balance, the
non issues charges, the other charges)
The other charges are the balance - the non issues charges.
In this patch we remove the subroutine from C4::Members and use the
new Koha::Account->non_issues_charges subroutine instead
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d9558f77866fa3fd530eb615b8f5d277d1b8c608
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 5 17:46:51 2018 -0300
Bug 12001: Add tests
Yes, we need tests to make sure we understand what is going on in this
subroutine.
The different combination of HoldsInNoissuesCharge,
RentalsInNoissuesCharge and ManInvInNoissuesCharge are tested here with
the subroutine we are going to remove (GetMemberAccountBalance).
In one of the next patches the new methods will be used to make sure we
are not modifying the calculated values (except the formatting).
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 51aa6db46c604aa202a3d8f8e5028557480efbd5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 5 16:18:37 2018 -0300
Bug 12001: Move GetMemberAccountRecords to the Koha namespace
The GetMemberAccountRecords may be a perf killer, it retrieves all the
account lines of a patron and then the related item and biblio
information.
Most of the time we only want to know how much the patron owns to the
library (sum of amountoutstanding). We already have this information in
Koha::Patron->account->balance.
This patch replaces the occurrences of this subroutine by fetching only
the information we need, either the balance, the detail, or both.
It removes the formatting done in the module, to use the TT plugin
'Price' instead.
There is a very weird and error-prone behavior/feature in
GetMemberAccountBalance (FIXME): as the accountlines.accounttype is a
varchar(5), the value of the authorised value used for the
ManInvInNoissuesCharge pref (category MANUAL_INV) is truncated to the 5
first characters. That could lead to unexpected behaviors.
On the way, this patchset also replace the GetMemberAccountBalance
subroutine, which returns the balance, the non issues charges and the
other charges. We only need to have the balance and the non issues
charges to calcul the third one.
Test plan:
Add several fees for a patron and play with HoldsInNoissuesCharge,
RentalsInNoissuesCharge and ManInvInNoissuesCharge.
The information (biblio and item info, as well as the account line) must
be correctly displayed on the different screens: 'Fines' module, fine
slips, circulation module
Note that this patchset could introduce regression on price formatting,
but will be easy to fix using the TT plugin.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4609e95f9d9f8bd2a773522d67d7cd6126c9120a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Feb 21 17:40:06 2018 +0000
Bug 20240: Remove space before : when searching for a vendor in serials (Vendor name :)
This patch removes the space before the colon in the "vendor" label in
the vendor search pop-up window.
To test, apply the patch and go to Serials -> New subscription.
- Click the "Search for a vendor" link next to the vendor form field.
- In the pop-up window, confirm that there is no space before the colon
in the "vendor" label.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ca32f936576e07909d7d5468f8eaa470221de6a1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Feb 21 17:59:49 2018 +0000
Bug 20239: Fix spelling on authority linker plugin
This patch corrects the capitalization of the "Choose" link in the
pop-up window for selecting an authority record to link to a MARC field.
This patch also converts the link, and the "Edit authority" link, to
Bootstrap buttons.
To test:
- Create a new record
- Go to the 100 field
- Click on plugin link behind $a
- Look for an existing authoriy in your system
- In the table of search results, confirm that the "Choose" and "Edit
authority" links look correct and work correctly.
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
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 f1b6feb20f19492f4848c939566472f33bd621c9
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Fri Feb 23 13:36:02 2018 +0100
Bug 20061: koha-common is not pulling libsearch-elasticsearch-perl / d/control
update debian/control. this file is auto generated. no testing required.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 78cd06a0f67f2f5eb09a9cf9441e4619856ac407
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date: Fri Feb 23 13:10:51 2018 +0100
Bug 20061: koha-common is not pulling libsearch-elasticsearch-perl
Adds Search::Elasticsearch to Perldependencies.pm
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit fc02e92d107750d624bf8121ca48a3c63eee9e21
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 20 14:14:56 2018 -0300
Bug 7143: Update about page for new dev - Pongtawat Chippimolchai
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 35 +-
C4/Installer/PerlDependencies.pm | 7 +
C4/Members.pm | 94 +-
C4/SIP/ILS/Patron.pm | 2 +-
Koha/Account.pm | 56 +-
Koha/Account/Line.pm | 15 +-
circ/circulation.pl | 2 +-
debian/control | 2 +
docs/history.txt | 4 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
.../prog/en/modules/acqui/invoices.tt | 161 +-
.../prog/en/modules/acqui/lateorders.tt | 128 +-
.../prog/en/modules/acqui/neworderbiblio.tt | 57 +-
.../prog/en/modules/acqui/neworderempty.tt | 389 +-
.../prog/en/modules/acqui/newordersubscription.tt | 67 +-
.../prog/en/modules/acqui/newordersuggestion.tt | 49 +-
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 33 +-
.../prog/en/modules/acqui/orderreceive.tt | 237 +-
.../modules/authorities/searchresultlist-auth.tt | 12 +-
.../cataloguing/value_builder/marc21_field_006.tt | 89 +-
.../cataloguing/value_builder/marc21_field_007.tt |18912 ++++++++++----------
.../cataloguing/value_builder/marc21_field_008.tt | 91 +-
.../value_builder/marc21_field_008_authorities.tt | 69 +-
.../marc21_field_008_classifications.tt | 44 +-
.../cataloguing/value_builder/marc21_leader.tt | 51 +-
.../value_builder/marc21_leader_authorities.tt | 43 +-
.../value_builder/marc21_linking_section.tt | 220 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 2 +-
.../prog/en/modules/members/boraccount.tt | 2 +-
.../prog/en/modules/members/moremember-print.tt | 5 +-
.../prog/en/modules/members/printinvoice.tt | 3 +-
.../prog/en/modules/serials/acqui-search.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 +-
members/boraccount.pl | 21 +-
members/moremember.pl | 16 +-
members/pay.pl | 3 +-
members/paycollect.pl | 2 +-
members/printfeercpt.pl | 74 +-
members/printinvoice.pl | 72 +-
members/summary-print.pl | 13 +-
opac/opac-account.pl | 39 +-
opac/opac-main.pl | 24 +-
opac/opac-reserve.pl | 2 +-
opac/opac-user.pl | 47 +-
opac/sco/sco-main.pl | 9 +-
reserve/request.pl | 3 +-
t/db_dependent/Accounts.t | 178 +-
t/db_dependent/ILSDI_Services.t | 13 +-
t/db_dependent/Koha/Account/Lines.t | 65 +
t/db_dependent/Koha/Patrons.t | 20 +-
t/db_dependent/Members.t | 68 +-
52 files changed, 10880 insertions(+), 10678 deletions(-)
create mode 100755 t/db_dependent/Koha/Account/Lines.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list