[koha-commits] main Koha release repository branch master updated. v18.05.00-336-g574cc2f
Git repo owner
gitmaster at git.koha-community.org
Thu Jul 19 19:46:49 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 574cc2f787d0456ddd035dc5911be9192b09f758 (commit)
via 7d7cd25f4c2f0077c18a1904cb77f1479bff8e2b (commit)
via 5bd7acfbb096a63df1d806c41a6af7b51954beb6 (commit)
via 8a7b35de6c18b52ed8056cb2553fff947eeeb1b2 (commit)
via 0766610f86417cf4a08cec7dad0f2e09376cb13a (commit)
via d6006b0b99b64f1e0859adcafeb375e0e1049031 (commit)
via 7465acb98b76db04a7058ccc3fe48b96e3ceb1a8 (commit)
via 92db008d0e040c1a0f0229c028ce105b8808dcc3 (commit)
via 2d99b467159c8d1c28c7d6300bcf6698dec2e76b (commit)
via 26bf5e3f8799165aaca550c571a60b51fbeca171 (commit)
via 1abee30bb8bd786d9523bf75594f3aae9a37d3d5 (commit)
via 96e768eb43a1555ae2f03b098edddbd051e8ae80 (commit)
via 7eceade7daf2943f6112291a8bfd6aa754ffaa5c (commit)
via f983c1e3f7404c60143d595ba5824f5324829723 (commit)
via 3286bead8e60fbcf8b2a76685b03c7cf6712da5e (commit)
via 284226a4966520eb0f1e784310bbc87ed3e59334 (commit)
via c20fbda4611e68d3935d078be0be5254563ee077 (commit)
via 715bc0f96dd1749c7a417c8d091f6c5326b3089d (commit)
via ad34ef74cdee0f204c03cdf88b1db775768a44fe (commit)
via 3c034dcc3afef792e89935a7854304d82d15c022 (commit)
via 367f47c416fa9164ccb8d9e5f50772e5a516d6b7 (commit)
via bfdf896111849454ade806bf49f48f1de5f626be (commit)
via 5a9bad787458411c790d26b3b115fe3e7e2e0ab2 (commit)
via c02543baaab99841405ba9a47d894e54e7a8a27a (commit)
via a9836864dcbe4c11d370c245511ee4b9d6bd33f3 (commit)
via c95f5c17a6b1e41be28819f79ebb0e6fa8f015e8 (commit)
from 090677333353268ed48c4d474b20e38a2a296f2e (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 574cc2f787d0456ddd035dc5911be9192b09f758
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 19 17:33:55 2018 +0000
Bug 19166: DBRev 18.06.00.009
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7d7cd25f4c2f0077c18a1904cb77f1479bff8e2b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 16 14:08:17 2018 +0000
Bug 19166: (follow-up) Adjust table and files and QA issues
Move to aqinvoice_adjustment
Move to Koha::Acquisition::Invoice::Adjustments
Test if variable exists before count
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5bd7acfbb096a63df1d806c41a6af7b51954beb6
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jul 16 13:06:27 2018 +0000
Bug 19166: (follow-up) Reformat the new adjustments markup
This follow-up makes some changes to the way invoice adjustments are
displayed and added:
- Move this section into a <fieldset> to set it off visually from the
other sections of the page.
- Take the "add adjustment" fields out of the table and display them in
a standard way.
- Hide the "add adjustment" fields by default, shown via "add an
adjustment" link.
- Add deletion confirmation to adjustment deletions.
To test, add, delete, and change invoice adjustments as instructed in
the original test plan.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8a7b35de6c18b52ed8056cb2553fff947eeeb1b2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Apr 25 09:55:48 2018 -0300
Bug 19166: Correct charset collate
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0766610f86417cf4a08cec7dad0f2e09376cb13a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Mar 30 13:35:12 2018 +0000
Bug 19166: (follow-up) Add ADJ_REASON auhtorised value category and minor fixes
This patch adds the ADJ_REASON authorised value category tot he atomic
update, and fixes code to display a hint of no reasons are defined
other minor updates to remove warns in logs
To test:
Apply patches
Run updates
Check authorised value categories to see ADJ_REASON exists
Add an adjustment, not you have no reaosn drop down
Note there is a hint if you hover
Add a value to ADJ_REASON
add another adjustment, note you can now add reasons (or not)
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: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit d6006b0b99b64f1e0859adcafeb375e0e1049031
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Mar 15 16:21:42 2018 +0000
Bug 19166: (follow-up) Shipment cost is always added to 'spent'
Two koha professionals agreed, also it is current behvaiour so this
patch removes a change
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7465acb98b76db04a7058ccc3fe48b96e3ceb1a8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Mar 13 09:17:24 2018 +0000
Bug 19166: Get correct value for encumbering when open for new lines
https://bugs.koha-community.org/show_bug.cgi?id=19166
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 92db008d0e040c1a0f0229c028ce105b8808dcc3
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 4 13:22:21 2017 +0000
Bug 19166: Unit tests for GetBudgetSpent and GetBudget ordered
To test:
1. prove -v t/db_dependent/Budgets.t
2. Should return green
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2d99b467159c8d1c28c7d6300bcf6698dec2e76b
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Aug 23 16:13:39 2017 +0000
Bug 19166: Add the ability to add adjustments to an invoice
This patchset adds the ability to add adjustments to an invoice, one can
provide a reason, an adjustment amount, select a budget, and choose
whether to encumber the funds before the invoice is closed or not
To test:
1 - Create a new invoice with or without a shipping cost
2 - Note there are no existing adjustments
3 - Add an adjustment
4 - Submit the form withno changes, nothing happens
5 - Update the adjustment you created, ensure changes are saved but no
extra adjustment created
6 - Add another invoice prodiving only reason or amount (you can have 0
value adjustments)
7 - Verify the adjustment total at bottom is correct
8 - Recieve some orders
9 - Verify totals are correct
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 26bf5e3f8799165aaca550c571a60b51fbeca171
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Aug 23 16:12:25 2017 +0000
Bug 19166: Database changes
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: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 1abee30bb8bd786d9523bf75594f3aae9a37d3d5
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu May 3 09:38:19 2018 +0000
Bug 20273: (follow-up) Autocomplete use start instead of contains
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 96e768eb43a1555ae2f03b098edddbd051e8ae80
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Feb 22 15:35:11 2018 +0000
Bug 20273: Use compat routines for autocomplete in auth_finder.pl
Test plan:
- Context: Koha working with elasticsearch,
- Apply BZ 19582 (that make auth_finder.pl works again),
- apply this patch,
- go to cgi-bin/koha/authorities/auth_finder.pl,
- type at least 3 chararcters in a search field and
check that the autocomplete returns results
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7eceade7daf2943f6112291a8bfd6aa754ffaa5c
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Nov 17 14:07:41 2017 +0000
Bug 19604: Unit tests
1 - Apply previous patches
2 - prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
3 - Should be green
4 - high fives!
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f983c1e3f7404c60143d595ba5824f5324829723
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 9 16:23:57 2017 +0000
Bug 19604: Elasticsearch Fixes for build_authorities_query for auth searching
To test:
1 - Do some authority searches in Zebra
2 - Switch to ES and repeat, results will vary and some may fail
3 - Apply patch and dependencies
4 - Reindex ES
5 - Repeat searches, they should suceed and results should be similar to
Zebra
6 - Slight differences are okay, but results should (mostly) meet
expectations
A few notes:
We add a 'normalizer' to ensure we get a single token from the heading
indexes, this makes 'starts with' work as expcted
We switch to 'AND' for fields searched from cataloging editor - this
matches Zebra results
We force the '__sort' fields for sorting - if sorting looks wrong try
reducing the heading field to a single subfield - this will need to be
addressed on a future bug (multiple subfields create an array, ES sorts
those randomly)
Signed-off-by: Nicolas Legrand <nicolas.legrand at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3286bead8e60fbcf8b2a76685b03c7cf6712da5e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 19 17:19:38 2018 +0000
Bug 13560: DBRev 18.06.00.008
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 284226a4966520eb0f1e784310bbc87ed3e59334
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jan 16 16:16:40 2018 +0000
Bug 13560: Add an 'Add' option for marc modification templates
Add/Update would update a field or create new if it existed, but didn't
allow for creating new if the field existed.
This patchset splits the options to 'Add & Update' so that 'Add' will always
add a field and 'Update' will operate as it always has
To test:
1 - Have a record with a known existing field (make a copy)
2 - Define a marc modification template that 'Add/update' on that field
3 - Define an 'Add/Update' on a field that doesn't exist
4 - Batch modify the copy of record using the above template
5 - Verify the existing field was updated
6 - Verify the non-existing field was updated
7 - Apply patch and update database
8 - Make another copy
9 - Modify the copy with the same template as above
10 - Should match initial modification
11 - Add a new rule to add a new field
12 - Modify using the updated template
13 - Ensure your new field is created
14 - Test various options in the modification tool
15 - prove t/db_dependent/MarcModificationTemplates.t
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c20fbda4611e68d3935d078be0be5254563ee077
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jan 16 16:15:26 2018 +0000
Bug 13560: Unit tests
To test:
1 - apply all patches
2 - update database
3 - prove t/db_dependent/MarcModificationTemplates.t
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 715bc0f96dd1749c7a417c8d091f6c5326b3089d
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jan 16 16:14:49 2018 +0000
Bug 13560: Database changes
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ad34ef74cdee0f204c03cdf88b1db775768a44fe
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 21 13:37:35 2018 +0000
Bug 20974: Remove files left behind after removing Solr
Some files were left behind when Bug 12538 removed support for Solr.
This patch removes them.
To test, apply the patch and fail to observe the existence of these
files:
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
Perform a search in the OPAC to confirm that nothing broke.
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 3c034dcc3afef792e89935a7854304d82d15c022
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 18 18:12:17 2018 -0300
Bug 21086: Fix wrong mock of DateTime->now
prove t/db_dependent/DecreaseLoanHighHolds.t
t/db_dependent/DecreaseLoanHighHolds.t .. 1/17 Can't locate object method
"truncate" via package "80" (perhaps you forgot to load "80"?) at /home/vagrant/kohaclone/C4/Circulation.pm line 3497.
What is happening:
We mock DateTime->now in the script to avoid the date comparaisons to fail on
slow servers (see bug 19705).
my $now_value = DateTime->now();
my $mocked_datetime = Test::MockModule->new('DateTime');
$mocked_datetime->mock( 'now', sub { return $now_value; } );
Since bug 20287, we have the following calls:
Koha::Patron->store => Koha::Patron::Category->get_expiry_date
which does:
221 return $date->add( months => $self->enrolmentperiod, end_of_month => 'limit' );
as enrolmentperiod is generated by t::lib::TestBuilder, it can be quite big, and so
the date change from one call to the others.
The failure is actually coming from the date becoming > 9999, which is not handled correctly,
on purpose, by Koha::DateUtils (infinite)
On the way this patch fixes the other occurrence, in Sitemapper.t (just in case)
Test plan:
Make sure the tests pass now.
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 367f47c416fa9164ccb8d9e5f50772e5a516d6b7
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jul 12 10:18:10 2018 +0000
Bug 21064: Use undefined instead of undef
To test:
1 - Load the advanced cataloging editor
2 - Refresh the page several times
3 - Check the JS console, you shoudl see an error:
'undef is not defined'
4 - Apply patch
5 - Try again, should be no error
Signed-off-by: Pierre-Luc Lapointe <pierreluc.lapointe at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bfdf896111849454ade806bf49f48f1de5f626be
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 11 18:55:06 2018 -0300
Bug 21053: Encode URI characters in plugin 008
A # (or &) at any position in 008 field of a bib record causes
all subsequent data in field to be overwritten with default values when
record is saved.
These characters need to be correctly encoded before being passed as
parameters of the url
To reproduce:
1. Find and edit a bib record which has an 008 which differs from the
default values for the MARC framework
2. Choose 008 helper
3. Add # in any position before the end of the field noting the current
values of the data
4. Save record
5. Edit record and select 008 helper
6. Review characters after #
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5a9bad787458411c790d26b3b115fe3e7e2e0ab2
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jul 13 17:49:14 2018 +0000
Bug 21076: Don't call autocomplete code after patron found
To test:
1 - Enable article requests
2 - Search on staff client
3 - Click 'Request article'
4 - Find a patron
5 - View error in console
6 - Apply patch
7 - Reload
8 - Not error is gone
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Followed the test plan and it works.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c02543baaab99841405ba9a47d894e54e7a8a27a
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jul 15 20:00:44 2018 +0200
Bug 16575: (follow-up) Compiled CSS
This patch contains the compiled CSS for the OPAC print stylesheet.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a9836864dcbe4c11d370c245511ee4b9d6bd33f3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 30 14:15:19 2018 +0000
Bug 16575: Irregular behaviour using window.print() followed by window.location.href
This patch updates the OPAC and staff client carts to use CSS to
control print output, removing a print parameter which was passed to the
script.
Currently, when you click "Print" on the OPAC basket, it navigates to
a new page and initiates window.print() followed by a
window.location.href change again. Unfortunately, due to differences in
IE, Chrome, and FF, it will either show the print options, navigate away
without showing them, or refuse to navigate away after printing. By
changing to using print CSS, we don't navigate away from the basket in
the first place, so we prevent this irregular behavior.
TEST PLAN
1) Apply the patch
2) Create an OPAC basket by clicking "Add to cart" on multiple items
3) Using Chrome, IE, and Firefox (of any version), click the "Print"
button
4) You should see the relevant print menu without the OPAC basket
re-loading in any way.
5) After printing is complete, you should still be on the OPAC basket
pop-up
6) Perform the same tests in the staff client
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 c95f5c17a6b1e41be28819f79ebb0e6fa8f015e8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jul 18 18:24:50 2018 -0300
Bug 21085: Fix add/edit of patrons when HouseboundModule is set
This script takes all the parameters then set it to create/edit the
patron. We must list housebound_chooser and housebound_deliverer as not
part of patron's attributes
Test plan:
- Enable HouseboundModule
- Create a patron
=> When you save, if the patch is not applied, you will get:
No property housebound_deliverer for Koha::Patron
- Edit a patron
=> When you save, if the patch is not applied, you will get:
Patron creation failed! - DBIx::Class::Row::store_column(): No such column 'housebound_chooser' on Koha::Schema::Result::Borrower at /home/vagrant/kohaclone/Koha/Object.pm line 75
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>
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 15 +-
C4/MarcModificationTemplates.pm | 9 +
Koha.pm | 2 +-
.../Invoice/Adjustment.pm} | 6 +-
.../Invoice/Adjustments.pm} | 11 +-
Koha/Schema/Result/Aqbudget.pm | 19 ++-
Koha/Schema/Result/Aqinvoice.pm | 19 ++-
.../{AccountOffset.pm => AqinvoiceAdjustment.pm} | 116 +++++++------
.../Result/MarcModificationTemplateAction.pm | 7 +-
Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 55 +++----
Koha/SearchEngine/Elasticsearch/Search.pm | 1 +
Koha/SimpleMARC.pm | 40 +++++
acqui/invoice.pl | 51 +++++-
acqui/ordered.pl | 8 +
acqui/spent.pl | 7 +
admin/searchengine/elasticsearch/field_config.yaml | 3 +
admin/searchengine/elasticsearch/index_config.yaml | 3 +
authorities/ysearch.pl | 16 +-
basket/basket.pl | 2 -
cataloguing/value_builder/marc21_field_008.pl | 2 +-
installer/data/mysql/kohastructure.sql | 21 ++-
installer/data/mysql/updatedatabase.pl | 29 ++++
koha-tmpl/intranet-tmpl/prog/css/print.css | 30 +++-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 9 +
.../prog/en/includes/cateditor-ui.inc | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 174 +++++++++++++++++++-
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 10 ++
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 13 +-
.../intranet-tmpl/prog/en/modules/basket/basket.tt | 55 ++-----
.../prog/en/modules/circ/request-article.tt | 38 +++--
.../modules/tools/marc_modification_templates.tt | 6 +-
.../intranet-tmpl/prog/js/auth-finder-search.js | 8 +-
koha-tmpl/intranet-tmpl/prog/js/basket.js | 3 +-
.../prog/js/marc_modification_templates.js | 6 +
koha-tmpl/opac-tmpl/bootstrap/css/print.css | 2 +-
.../bootstrap/en/includes/search/facets.inc | 56 -------
.../bootstrap/en/includes/search/page-numbers.inc | 18 --
.../bootstrap/en/includes/search/resort_form.inc | 23 ---
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 4 +-
koha-tmpl/opac-tmpl/bootstrap/less/print.less | 17 +-
members/memberentry.pl | 3 +-
t/db_dependent/Budgets.t | 118 ++++++++++++-
t/db_dependent/DecreaseLoanHighHolds.t | 2 +-
.../Koha/Acquisition/Invoice/Adjustments.t | 67 ++++++++
.../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 56 ++++++-
t/db_dependent/MarcModificationTemplates.t | 75 +++++++--
t/db_dependent/Sitemapper.t | 2 +-
tools/marc_modification_templates.pl | 1 +
48 files changed, 920 insertions(+), 320 deletions(-)
copy Koha/{BiblioFramework.pm => Acquisition/Invoice/Adjustment.pm} (85%)
copy Koha/{Biblio/Metadatas.pm => Acquisition/Invoice/Adjustments.pm} (76%)
copy Koha/Schema/Result/{AccountOffset.pm => AqinvoiceAdjustment.pm} (50%)
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
create mode 100644 t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list