]> git.koha-community.org Git - koha.git/log
koha.git
5 years agoBug 21832: Restore is_expired in ILS-DI GetPatronInfo service
Fridolin Somers [Wed, 14 Nov 2018 10:18:58 +0000 (11:18 +0100)]
Bug 21832: Restore is_expired in ILS-DI GetPatronInfo service

Since Bug 17578 removed C4::Member::GetMemberDetails, the information "is_expired" disappeared from ILS-DI service GetPatronInfo.

I propose to restore in by adding the code that exisited in C4::Member::GetMemberDetails directly in C4::ILSDI::Services.

Test plan :
1) Enable ILS-DI webservice
2) Choose a patron not expired
3) Call web-service (replace X with patron's borrowernumber) :
   /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=X
4) You see : <is_expired>0</is_expired>
5) Choose a patron expired
6) Call web-service (replace X with patron's borrowernumber) :
   /cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=X
7) You see : <is_expired>1</is_expired>

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0748911eb26f2a35d8ba881dcb92e37a979fc9a9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 531040897b2c02114fe51a6c8de338f8bb61c3cb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit ec1145c148aefc5ea37a9dfbb5827da14e1d839d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoUpdate release notes for 17.05.01 release v17.11.17
Fridolin Somers [Tue, 26 Mar 2019 06:48:33 +0000 (07:48 +0100)]
Update release notes for 17.05.01 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoMerge remote-tracking branch 'translate/17.11.17-translate-20190326' into 17.11.x
Fridolin Somers [Tue, 26 Mar 2019 06:41:46 +0000 (07:41 +0100)]
Merge remote-tracking branch 'translate/17.11.17-translate-20190326' into 17.11.x

5 years agoIncrement version for 17.11.17 release
Fridolin Somers [Tue, 26 Mar 2019 06:40:07 +0000 (07:40 +0100)]
Increment version for 17.11.17 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoIncrement version for 17.11.16 release
Fridolin Somers [Tue, 26 Mar 2019 06:38:48 +0000 (07:38 +0100)]
Increment version for 17.11.16 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoTranslation updates for Koha 17.11.17
Koha translators [Tue, 26 Mar 2019 06:36:50 +0000 (03:36 -0300)]
Translation updates for Koha 17.11.17

5 years agoBug 21560: (follow-up) move use at the top
Fridolin Somers [Tue, 5 Mar 2019 14:51:15 +0000 (15:51 +0100)]
Bug 21560: (follow-up) move use at the top

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 639ad97d844f2774f49881174b559293edd6baa4)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 30c9167dd48d1631f2554fa7897638ae4f4f5186)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 9918ef23a39ff5f69ba60c4fcacc5b830a00773c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21560: Unit test for Koha::Util::OpenDocument
Fridolin Somers [Tue, 19 Feb 2019 11:01:16 +0000 (12:01 +0100)]
Bug 21560: Unit test for Koha::Util::OpenDocument

Run prove t/Koha/Util/OpenDocument.t

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 99ea714345a6278d68e2abb0d182d8b495cf2950)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 31ebb5abd003f41576febe7a53c27046236e9653)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 13cdadbe8f13f81e4774403b09c4abd1d27a6c6a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21560: create Koha::Util::OpenDocument with subroutine for ODS generation
Fridolin Somers [Mon, 18 Feb 2019 16:33:37 +0000 (17:33 +0100)]
Bug 21560: create Koha::Util::OpenDocument with subroutine for ODS generation

There is nearly the same code in misc/cronjobs/gather_print_notices.pl and reports/guided_reports.pl.
This patch creates a new module with subroutine called by both scripts.

If file path or content is undefined, subroutine will just return undef.
If content is an empty arrayref, empty ods file is still generated.

Unicode encoding is kept outisde because it may not be necessary.

Note that for print notices the first line of message is always the column names so it is extracted only from first message.

Test plan :
Run previous patches test plans and check ODS files are the same.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ffb40290f88380418635a951dbb0788bf7b7e3ce)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit c2531f6fef7f741f6557add3f8981148c55c15ce)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 3f68db17b9e2b5e6ece289a312f1a53f8d9a3d53)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21560: Optimize ODS export of gather_print_notices.pl
Fridolin Somers [Fri, 7 Dec 2018 09:30:30 +0000 (10:30 +0100)]
Bug 21560: Optimize ODS export of gather_print_notices.pl

Like previous patch, the call on OpenOffice-OODoc lib can be optimized.
Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table

Test plan inspired from Bug 11679.

Test plan:
- define your ODUE notice for the print template as:
cardnumber:patron:email:item
<<borrowers.cardnumber>>:<<borrowers.firstname>> <<borrowers.surname>>:<<borrowers.email>>:<item><<items.barcode>></item>
- define overdues rules for a patron category
- check-out 2 items using a due date in order to generate the overdue notices
- check-in these 2 items
- launch the script /misc/cronjobs/overdue_notices.pl
- the 'message_queue' table should now contain 2 new entries
- launch the gather_print_notices cronjob :
  perl misc/cronjobs/gather_print_notices.pl /tmp/test --ods --letter_code=OVERDUE -d=:
- A ods file should be generated in your /tmp/test directory
- Compare times with and without patch

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5d4f80feac811a9d6e177975b50c57ba85e3434d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4bc7751e4abe80973e991fbd80506c23f39910d8)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit ef6d4aef4b34fa22a8850146615adf70411065ea)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21560: report ODS export optimization
Fridolin Somers [Fri, 12 Oct 2018 12:09:54 +0000 (14:09 +0200)]
Bug 21560: report ODS export optimization

SQL reports can be exported with CSV, TSV of ODS format.
When report has thousands of rows, using ODS format is around 10 times longer than other formats.
It also loads CPU and RAM a lot.

The longest call is expandTable().
I found that the call on OpenOffice-OODoc lib can be optimized.
Based on https://grep.metacpan.org/search?qci=&q=expandTable&qft=&qd=OpenOffice-OODoc&f=examples%2Ftext2table

Test plan :
1) Don't apply patch yet
2) Create a new SQL report : Home > Reports > Create from SQL
3) Enter a SQL that will return thousands of results
4) Run report
5) Click Download > Semicolon separated text (.csv), look execution time
6) Click Download > Open Document Spreadsheet, look execution time
7) Apply patch
8) Redo 5) and 6) and compare times, CSV export should be the same but ODS export should be better

My tests shows 1,5 seconds for CSV export.
And for ODS export : 18 seconds without patch and 8 seconds with patch.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 28edd8848320fd0f0f284245f2f0567a5907619a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 0014f64348ea171300afce604cd7ec4f9a0444a7)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit ba64a98d076f46e9355818efc278ed3c531d0e00)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22429: Infinite loop in patron card printing
David Cook [Mon, 4 Mar 2019 06:43:29 +0000 (17:43 +1100)]
Bug 22429: Infinite loop in patron card printing

Text fields in Patron Card Text Layouts can contain regular
expression metacharacters, which - instead of being treated as
literal values - are interpreted and prevent line wrapping. This
causes the process to get stuck in an infinite loop, which keeps
running even after the web server has timed out (at least when
using CGI).

This patch escapes the relevant input from the text field so the
regular expression substitution treats characters as literals
instead of as metacharacters.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3bd900496690375b2b711743ffaa57371388f687)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 296f6756ab51103d0e104e16cff312d28a8fd165)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit d272137c4f764f8a21f02f56c4dba0ad315ec4aa)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 16251: Fix value of material select for Rancor 008 widget
Julian Maurice [Wed, 6 Mar 2019 07:58:03 +0000 (08:58 +0100)]
Bug 16251: Fix value of material select for Rancor 008 widget

The material type is selected in accordance with the leader (06-07)

Test plan:
1. Create a new record using the advanced editor
2. Set the leader 6th position to 'c'
3. Save the record and reload the page
4. 'Music' should be automatically selected for 008
5. Try other values for the leader 6th and 7th positions

See comment 0 of this bug for the complete mapping

Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 926d7c4ba11ad6cd768c884ec4b2dc71d864b64c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit d7988f672f68e0cc875eedce6bad0b634df8941c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 5f858a9746c3210dacc7a3546409ef619379e854)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 18723: Change dot into comma
Jose-Mario Monteiro-Santos [Thu, 17 Jan 2019 21:41:58 +0000 (16:41 -0500)]
Bug 18723: Change dot into comma

This fixes the regression that multiplies the amount entered by 100
when CurrencyFormat is set to FR. It replaces the last dot with a
comma before dealing with the value of ActualCost and ReplacementCost.

Test Plan:
a)Replicate the issue:
    0- Set CurrencyFormat to FR
    1- Go to Acquisitions
    2- Search for a Vendor
    3- Click on "New basket"
    4- Give basket a name and click "Save"
    5- Click on "Add to basket"
    6- Add an order through preferred method
    7- In Accounting details, enter a vendor price with dot decimal (i.e. 19.44)
    8- Save your order line
    9- Click on "Close this basket"
    10- Confirm closing of basket by clicking on "Yes, close"
    11- Click on "Receive shipment"
    12- Enter an invoice number and click "Next"
    13- Click on "Receive" to the right of your order
    14- In Accounting details, notice the Actual cost is written with a decimal dot.
    15- Change the Actual cost, using a dot decimal (i.e 20.99)
    16- Receive the order
    17- Click on "Save"
    18- In "Already received" notice the price is multiplied by 100 (i.e. 2099,00)
    19- Click on "Cancel receipt"
    20- Click on "Receive" to the right of your order
    21- In Accounting details, change the Actual cost, using a comma decimal (i.e. 20,99)
    22- Receive the order
    23- Click on "Save"
    24- In "Already received", notice the price is correct.
b)Apply the patch
c)Test the patch:
    1- Click on "Cancel receipt"
    2- Click on "Receive to the right of your order
    3- Change the Actual cost/Replacement cost, using a dot decimal (21.99)
    4- Receive the order
    5- Click on "Save"
    6- Notice that the Actual cost and the Replacement cost use commas
    7- Change the Actual cost, using a comma decimal (21,99)
    8- Click on "Save"
    9- In "Already received", notice the price is still correct.

Signed-off-by: Victor Grousset <victor.grousset@biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c7f47ea36a8992356c6c055a22891ea168cbdc9c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit bf7524f0b1cebb68584eebf2d3acaec44126355d)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 126d7bcbe183c8de98fc6c59cb15874430a38c3e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 18143: Silence ods MARC framework export flood
Mark Tompsett [Sun, 19 Feb 2017 00:50:32 +0000 (19:50 -0500)]
Bug 18143: Silence ods MARC framework export flood

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5b0eb51c8066abbd645731593572277ca5b46715)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 854f1ca17a78c5b73c63cfd0b57bcf89108778b2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit e448cb9042e1b449ca64ee99f1ac2576126e2f6d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 18143: Silence XML MARC Framework export flood
Mark Tompsett [Sun, 19 Feb 2017 00:21:59 +0000 (19:21 -0500)]
Bug 18143: Silence XML MARC Framework export flood

TEST PLAN
---------
1) Log in to staff client
2) Click Koha administration
3) Click MARC bibliographic framework
4) export default as xml
5) Read the error log
   -- it's floody and export is default framework
6) export another framework as xml
7) Read the error log
   -- it's floody and export is the correct framework
8) apply the patch
9) repeat steps 4-7
   -- expected frameworks exported, and no flooding.
10) run koha qa test tools

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 719153455c8c58fb8b1a8e9123acef5052dbd462)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 65a6cd355ef227ab4e11b620f485f010b611e115)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit e6bfbc6832fb5a4b87f7e12f6e45e6d814f5b311)

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22323: cronjob runreport.pl CSV add encoding
Fridolin Somers [Wed, 13 Feb 2019 12:25:20 +0000 (13:25 +0100)]
Bug 22323: cronjob runreport.pl CSV add encoding

Cronjob runreport.pl runs SQL reports and can export as CSV.
This export needs to be UTF-8 encoded.

This pathes replaces use of Text::CSV_XS by Text::CSV::Encoded like in other places like tools/viewlog.pl.
It adds a decode of headers bcause they will be encoded lika other lines.

Test plan:
1) Create a new item with itemnotes 'accentué'
2) Create a SQL report with :
SELECT barcode,itemnotes AS itè FROM items WHERE itemnotes LIKE 'accenté'
3) Run this report
4) You see well encoded header and content
5) Run from command line (replace X by report number) :
misc/cronjobs/runreport.pl X --format=csv --csv-header --store-results
6) You well encoded header and content
7) Go to saved reports table
8) Look at saved results of report
9) You well encoded header and content

Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois@inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 83fe95d0c5d404a2ffc6ed35e822ff0f5ee8b6e6)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 0ad76960cd24b3f12eb5c0e7058f02cd13ba1ac0)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit bde83720d4f1995bf5047f9429545a56bda3eddc)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21587: [17.11.x] correct rebase
Fridolin Somers [Tue, 26 Feb 2019 06:42:56 +0000 (07:42 +0100)]
Bug 21587: [17.11.x] correct rebase

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoRevert "Bug 21986: Do not escape quotation marks when cataloguing" v17.11.16
Fridolin Somers [Wed, 27 Feb 2019 08:43:28 +0000 (09:43 +0100)]
Revert "Bug 21986: Do not escape quotation marks when cataloguing"

This reverts commit 7e21b1fd2d9e72d3b5f94bd111f0f8f2d8d7e104.

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22254: Correction to datehandling in test
Martin Renvoize [Fri, 1 Feb 2019 09:55:54 +0000 (09:55 +0000)]
Bug 22254: Correction to datehandling in test

Adding 13 months is not always the same as adding 1 month and then
adding 12 months in DateTime maths.  This patch rectified the test
to match the correct behaviour in koha.

Test plan.

1) Modify the test (around line 268) to test against the suspect
   leap date of 2019-01-31 and watch the test fail.
2) Apply the patch (which also adds this modification to test
   for such a leap date) and watch the test now pass.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1da0ba48b6fdf38cfd3d3ea63ec076b15995610f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 413f34ba244af3560861785f5aa74ab457f00b02)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 60f8ca789f713c3a5c7e3478bac7132165b9092d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoUpdate release notes for 17.11.15 release v17.11.15
Fridolin Somers [Mon, 25 Feb 2019 06:27:59 +0000 (07:27 +0100)]
Update release notes for 17.11.15 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoMerge remote-tracking branch 'translate/17.11.15-translate-20190225' into 17.11.x
Fridolin Somers [Mon, 25 Feb 2019 06:22:52 +0000 (07:22 +0100)]
Merge remote-tracking branch 'translate/17.11.15-translate-20190225' into 17.11.x

5 years agoTranslation updates for Koha 17.11.15
Koha translators [Mon, 25 Feb 2019 06:10:23 +0000 (03:10 -0300)]
Translation updates for Koha 17.11.15

5 years agoIncrement version for 17.11.15 release
Fridolin Somers [Mon, 25 Feb 2019 06:08:26 +0000 (07:08 +0100)]
Increment version for 17.11.15 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21441: Fix wrong reference to a 'holds' table on system information tab
Katrin Fischer [Mon, 4 Feb 2019 23:42:34 +0000 (00:42 +0100)]
Bug 21441: Fix wrong reference to a 'holds' table on system information tab

It looks like a typo snuck in on the about page, listing a holds
table instead of reserves.

To test:
- Manually create the same PK (reserve_id) in reserves and old_reserves
- Verify that the message on about > system information now
  correctly lists those tables (not holds and old_reserves)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cfea47cb064362bbb1fc93769be4b7df3a8e2fae)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit d7c112bc0ecc380fa8621842bc02ff30d8e3c68c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 3947327b65dc25a5430271c8ef2bd9b792a35df9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21829: (QA follow-up) - Update the number of unit tests
Kyle M Hall [Mon, 11 Feb 2019 12:15:11 +0000 (07:15 -0500)]
Bug 21829: (QA follow-up) - Update the number of unit tests

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f3f5b98fd909f9e13aa4e45a16dc275ef4ee8489)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 60b1a4f83611414a042651bea757dc7e96fde6f9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 81ae463c1e7b67bff388ec0f4b33e0d9dd9a3139)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21829: Correctly format dateexpiry in notices (date only)
Jonathan Druart [Wed, 14 Nov 2018 12:38:01 +0000 (09:38 -0300)]
Bug 21829: Correctly format dateexpiry in notices (date only)

dateexpiry is a date, we should not display the time
part in notice.

Test plan:
Create a notice with borrowers.dateexpiry, generate this notice.
The value should be displayed without the time part

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5b160af2a051dc3693f04dabf320d0995cf26160)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ecb86a84c13e4e5661f4c6683b7755c21d607bbe)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 5493a99486b4c3398f440d36c417d62e315fd5eb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21829: Add tests for dateexpiry format in notices
Jonathan Druart [Wed, 14 Nov 2018 12:37:58 +0000 (09:37 -0300)]
Bug 21829: Add tests for dateexpiry format in notices

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 04e121a741a442f5b557e11864eb69be9d0c3ded)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1106c0fa595c8378807bc955b29c2f83c2af5ba9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit f7bcb149d57cf55ff075d6f41cbecbb310218c9e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 17347: Ignore whitespace before and after on renewing
Katrin Fischer [Mon, 14 Jan 2019 05:41:48 +0000 (05:41 +0000)]
Bug 17347: Ignore whitespace before and after on renewing

When an item is checked out, Koha ignores whitespace
at the beginning and the end of the entered barcode.
This makes life easier, if a barcode is C&P from another
page. This patch makes the renewal page behave the same.

To test:
- Checkout an item
- Renew the item from the renew tab or renewal page
  entering the barcode with leading and trailing
  whitespace
- "Barcode not found"
- Apply patch
- Try again
- Barcode should be found now

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Devinim <kohadevinim@devinim.com.tr>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0e220869f5a3327eee8f9426d648fbcaaa0fd7fa)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 7c881b32b5f7bfca6ccb17b8ddc8045ad37a3524)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 3c9af06611d0642ab96d51ca1c249a8e14a52805)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22282: Fix PDF issue when exporting PDF in French format.
Liz Rea [Thu, 31 Jan 2019 22:41:29 +0000 (22:41 +0000)]
Bug 22282: Fix PDF issue when exporting PDF in French format.

Fixing up QA comments, keeping 1st instance and removing the 2nd.
Original test plan by Christophe Croullebois.

To test :
Without the patch :

1° select in Acquisitions preferences/OrderPdfFormat French 3-page
2° restart plack if needed
3° In acqui/basketgroup.pl select closed tab
4° Click on "Export as PDF" button
5° You should see a blank page saying "Internal Server Error"

With the patch :

Do the same

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0844f2c174c83ce3da11be07511730b0c220e5ad)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 981670c68cb3d12b30c410c12ed6488f5a555117)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 25111a3182504b712d60f9b39097bdda00c78632)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21808: Field 711 is not handled correctly in showAuthor XSLT for relator term...
Marcel de Rooy [Mon, 12 Nov 2018 10:48:23 +0000 (11:48 +0100)]
Bug 21808: Field 711 is not handled correctly in showAuthor XSLT for relator term or code

The test should check $4 or $e for fields ne 111,711.
And should check $4 or $j for 111,711.

Test plan:
Edit a record, add a meeting in 711 without $4 but with $j.
Without this patch the term is not visible, with this patch it is.

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 6179f23dd8b4ed24add2e76c7b8e193372052201)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 9199083de8637d96148b873cc745c1a81fe78d01)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 7ce9ac1f7deb6ab016256be3f068ffd342b84eef)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22242: Javascript error in value builder cased by Select2
Fridolin Somers [Thu, 31 Jan 2019 08:12:13 +0000 (09:12 +0100)]
Bug 22242: Javascript error in value builder cased by Select2

Same as Bug 17780 but in value builders.

Select2 (Bug 13501) introduced divs and inputs that broke some
assumptions about the expected HTML structure. This patch checks if
input has name attribute, because some inputs in Select2 have not.

It brakes value builders marc21_linking_section.tt and
unimarc_field_4XX.tt.

Test plan :
1)  On a MARC21 database
2)  Define 774$0 as a regular subfield
3)  Define 774$4 with an authorised value category
4)  Define 774$t with value builder marc21_linking_section
5)  Create a new record
6)  Use value builder in 774$t
7)  Search for a record and click choose
8)  Without patch : a popup window does not close and show a blank
    screen
9)  With patch : popup windows get close and you see in field 774 $0 and
    $t field with values
10) Same tests with a UNIMARC database on field 461 with value builder
    unimarc_field_4XX.tt

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested successfully with MARC21

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3ca0234d34ac9708a8335cfa97805fb7498201bf)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 55b20ad1a7b8afa5c385bd3f9825014d40936ba1)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 800e3ae8eb0cc58bea1f58690ba3683e730fa764)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21290: Updating documentation for ModItem
helene hickey [Wed, 16 Jan 2019 23:20:38 +0000 (23:20 +0000)]
Bug 21290: Updating documentation for ModItem

To test:
Review the patch and check it is now updated correctly

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9a5bfee706f85bc5fd53a9c2d0616c2e1186379a)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit e96eed9b841394353cc5c4484ddc608432e22d29)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit 3ea009bcc33656e3644ff71cd1fae086bdf3a529)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 20679: Removed 'rows per page' from report print layout
Jasmine Amohia [Wed, 16 Jan 2019 20:53:40 +0000 (20:53 +0000)]
Bug 20679: Removed 'rows per page' from report print layout

Test plan:
1. Create a report or view an existing report
2. Notice that 'Rows per page:' is visible
3. Print report (Ctrl+P)
4. Confirm that on printed report, 'Rows per page:' is no longer visible

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 65b64bcafacf983a101f263e554b6d7274567bb9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ba8cd76c6239ed71246c26666f16f07f56b731b7)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit cd7e62f06b2e494de2895bc276371062c6827795)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22083: Typo in circulation_batch_checkouts.tt
Caroline Cyr La Rose [Tue, 8 Jan 2019 14:28:35 +0000 (09:28 -0500)]
Bug 22083: Typo in circulation_batch_checkouts.tt

There is a typo in circulation_batch_checkouts.tt that makes Koha skip
a warning if the user cannot borrow due to circulation rules.

This patch corrects this typo.

To test:

1. In Administration > Global system preferences, 'Allow'
   BatchCheckouts and enter patron categories in
   BatchCheckoutsValidCategories
2. Go to Administration > Circulation and fines rules
3. Enter a rule where a certain category of patrons (that is in
   BatchCheckoutsValidCategories) cannot take out a particular item type
4. Search the catalog for an item of that item type
5. Copy the barcode
6. Go into patrons and find a patron of that category
7. Click on the Batch checkout tab
8. Paste the barcode in the box and click Check out
9. It should say 'Too many checked out'
10. Apply the patch
11. Try the check out again, it should show both warnings ('Too many
    checked out' and 'This patron can't check out this item per library
    circulation policy')

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3ee95bd0213943b625ea5a35eb04e45835cf6f65)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4c928041f1ee5ec4c21aab24dfd7f69399ae330f)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit c641fb1b0840b30f189a16693ffe4306e009aaff)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22207: course reserves page does not have unique <body> id
Lucas Gass [Fri, 25 Jan 2019 15:37:21 +0000 (15:37 +0000)]
Bug 22207: course reserves page does not have unique <body> id

Test plan: Go to cgi-bin/koha/opac-course-reserves.pl in the OPAC and
make sure the body id is opac-course-reserves

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Mikaël Olangcay Brisebois <mikael.olangcay-brisebois@inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 358adce2e75bdd317165c86a9b5064bc52d9e2ad)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a4345d8af3b6e30d21d7cd310dc144fd50d04b8e)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit da0de43d4bd3ac3028f7d3032e028ee1228505a0)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21877: (RM follow-up) Move space into conditional
Nick Clemens [Mon, 28 Jan 2019 11:32:55 +0000 (11:32 +0000)]
Bug 21877: (RM follow-up) Move space into conditional

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 582a84a6c7328efe78bbacaad293e4e21e6785ca)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit a93fca9b201d37b5887444cf23b169ea2516f923)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout
Fridolin Somers [Tue, 22 Jan 2019 08:45:02 +0000 (09:45 +0100)]
Bug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout

Using only TT plugin for authorised value description is a better code.

Test plan :
Part 1:
1.1) On a catalog with items.notforloan defined with authorized values category NOT_LOAN
1.2) Define in NOT_LOAN an authorized values 1 with description 'at the beach'
1.3) Define in NOT_LOAN an authorized values 2 with description empty
Part 2:
2.1) Set preference 'AllowNotForLoanOverride' to 'Don't allow'
2.2) Edit an item with notforloan=1
2.3) Checkout this item => You see 'Item not for loan (at the beach)'
2.4) Edit an item with notforloan=2
2.5) Checkout this item => You see 'Item not for loan'
Part 3:
3.1) Set preference 'AllowNotForLoanOverride' to 'Allow'
3.2) Edit an item with notforloan=1
3.3) Checkout this item => You see 'Item is normally not for loan (at the beach)'
3.4) Edit an item with notforloan=2
3.5) Checkout this item => You see 'Item is normally not for loan'

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 36df53ad8d4987e938e478d934d553b73e7450f2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 30895e2c561215fa7c094c9838021a0095a578ba)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 11abf890e9b0d4843b5594060987028817104589)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21877: Show authorized value description for withdrawn in checkout
Fridolin Somers [Tue, 22 Jan 2019 08:47:22 +0000 (09:47 +0100)]
Bug 21877: Show authorized value description for withdrawn in checkout

During checkout the withdrawn information is displayed in a message :
"Item has been withdrawn".

Like in other pages and like notforloan, we should display the withdrawn authorized value description.

This patch adds this display.
Add <span> so that translation does not change.
Also adds class 'co-withdrawn' (like in checkin 'ci-*' classes) to ease hidding this new information via CSS.

Test plan :
1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN
2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash'
3) Define in WITHDRAWN an authorized values 2 with description empty
4) Edit an item with withdrawn=1
5) Checkout this item => You see 'Item has been withdrawn (dropped in trash)'
6) Edit an item with withdrawn=2
7) Checkout this item => You see 'Item has been withdrawn'

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit cfd59672bb09c4766632de4c6f11cf9cf4bea3f9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit c22928630ac2c00501b2bb17d60a3b2ba99481c5)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit ea3972c08090619c462354cb1c37bdd2947bd0ad)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22111: Format amount shown on place holds when maxoutstanding is reached (staff)
Katrin Fischer [Sat, 5 Jan 2019 03:50:36 +0000 (03:50 +0000)]
Bug 22111: Format amount shown on place holds when maxoutstanding is reached (staff)

Displays amount outstanding correctly when holds are blocked
by maxoutstanding.

To test:
- Check maxoutstanding system preference value
- Add a fine to a patron account exceeding maxoutstanding
- Try to place a hold for this patron from staff
- Verify this message is shown:

     Patron has outstanding fines: 6.00

- Toggle CurrencyFormat system preference and verify display
  changes according to setting

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Mikael Olangcay Brisebois <mikael.olangcay-brisebois@inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c37ded96714409cd572c79f3c9cd69694e0e71de)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 78e617b201402b5e551ba79131b362b2ef7f0bee)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 2f918ab38d22047a8cd180aa16248f41ffc10329)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22113: Add price formatting on item lost report
Katrin Fischer [Sat, 5 Jan 2019 05:41:48 +0000 (05:41 +0000)]
Bug 22113: Add price formatting on item lost report

The item lost report displays the price and replacement
price for lost items. With the patch they will display
according to the CurrencyFormat system preference.

To test:
- Mark 1 or more items lost
- Make sure that replacement cost and purchase price are set
- Go to Reports > Items lost
- Search for your lost items
- Verify price and replacement price display
- Apply patch and toggle CurrencyFormat to different settings
- Refresh lost items report
- Verify prices are always displayed according to syspref setting

Signed-off-by: Olivia Lu <olivialokm@gmail.com>
Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c3fb484fe2922d2a97053b3fde4fb433c5aa0c4f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit da8e5fcd2447aad751e511adac4d29bac7cec82c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 9ad483b2040ca1fa322ef0af7abe211817d84926)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22118: Format hold fee when placing holds in OPAC
Katrin Fischer [Sat, 12 Jan 2019 08:21:38 +0000 (09:21 +0100)]
Bug 22118: Format hold fee when placing holds in OPAC

When Koha charges for holds, a message with the fee is
shown before the patron places the hold. The amount needs
to be formatted according to CurrencyFormat system preference.

To test:
- Add a hold fee to your patron category
- Log into the OPAC
- Search for a record to place a hold on
- Click Place hold
- Verify there is a note showing about the hold fee
- Toggle CurrencyFormat and HoldFeeMode and verify
  that the formatting is always correct

Signed-off-by: Jack Kelliher <jke0429@stacmail.net>
Signed-off-by: Mikael Olangcay Brisebois <mikael.olangcay-brisebois@inlibro.com>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4f0618a8888dff72b15dfe9193259c1bc5d06b5f)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b8527c5057ddac6f956d102efa27ef95cd5d3051)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 9880c7d852358cdabaa37348dd67af57613a53e7)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 11922: Add SHOW_BCODE patron attribute for Norwegian web installer
Jasmine Amohia [Thu, 17 Jan 2019 02:32:08 +0000 (02:32 +0000)]
Bug 11922: Add SHOW_BCODE patron attribute for Norwegian web installer

Test plan:
1. Notice that /patron_attributes.sql and /patron_attributes.txt can be
located in 2-Valgfritt
2. Confirm that the SHOW_BCODE patron attribute in the English web
installers .sql and .txt file is also in the Norwegian web installers
.sql and .txt file

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 495619649b329ce52b86998668461ca72827c6ab)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 9f2110cbbedb2c5f13f915fc496bc2156a08d0ac)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 0451ac7f66cd775baa202c7106fa8bdaa819c7b1)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 19920: Removed unnecessary code from C4/Members.pm
Jasmine Amohia [Wed, 16 Jan 2019 02:11:42 +0000 (02:11 +0000)]
Bug 19920: Removed unnecessary code from C4/Members.pm

A seperate bug (Bug 16853) removed the subroutine used in this file. I removed the code as it had become unnecessary.

Test plan:
1. Confirm that &changepassword can't be found in C4/Members.pm

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9f446de79128352fe5138bb22260a49254c65450)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a41ee8ad18acafde0a045b4908ecfc90118bdf0a)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 2ec9cb5e9450a3906558b6b5d1cadd7eea2c010c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 20491: Updating the MARC subfield desciption of 952q
helene hickey [Wed, 16 Jan 2019 22:06:15 +0000 (22:06 +0000)]
Bug 20491: Updating the MARC subfield desciption of 952q

Test plan:
1) Go to admin, then to MARC frameworks, then to default
frameworks structure, then subfield stucture for 952
2) Verify that 'q'
is described as 'checked out'
3) Go to <intranet>/cgi-bin/koha/cataloguing/additem.pl?biblionumber=x
4) Verify
that 'q' is also descirbed as 'Checked out' in
5) Apply patch and update
your database
6) Verify that the description of 'q' has changed to 'Date
due'
7) Go to <intranet>/cgi-bin/koha/cataloguing/additem.pl?biblionumber=x
6) Verify that it has changed to 'Date due'

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Bug 20491: (QA follow-up) Remove atomic update

We should not update existing installations, especially
since this would not work for translated frameworks.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 6e4e4c9cbc04b42653599b4ddea35cbaa57e42f3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit cabf7be3246fcd2248fcbbed497524c3cfa07980)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit a93a7422ca42baff5124499f7e2d94d34832913a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 20274: Itemtypes report gives zero results if item-level_itypes set to bibliograp...
helene hickey [Tue, 15 Jan 2019 23:07:34 +0000 (23:07 +0000)]
Bug 20274: Itemtypes report gives zero results if item-level_itypes set to bibliographic records

1) Go to reports then catalog by item types
2) Pick a location and look at table
3) Change the system prefernce of item-level_itypes
4) Verify a zero result
5) Apply patch and retry
6) Verify that result does not change to zero on either preference

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8ad2c206cba1b737e69393e2e3cd92076fb94e17)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit d8194f17e43da3b17a6b9dc3c8643a471a748c36)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit da94385c99d547cf995f5a779e48208e1f53d539)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22122: Rearranged inputs from a patrons basket in Acquisitions.
Ethan Amohia [Wed, 16 Jan 2019 03:26:36 +0000 (03:26 +0000)]
Bug 22122: Rearranged inputs from a patrons basket in Acquisitions.

Test Plan:
1. From home page, go to "Acquisitions"
2. Add a test vendor under "New vendor"
3. Give the vendor any name and click "Save"
4. Click "New Basket"
5. Give the basket a name and click "Save"
6. Click on "Add to basket"
7. Click on "From an external source"
8. Note the order of inputs (ISBN, ISSN, Title...)
9. Go back to the homepage
10. Go to "Cataloging"
11. Click on "New from Z39.50/SRU" button. A new window should open
12. The order of inputs under 'Z39.50/SRU Search' should all match the
order of inputs from step 8. (Except "Select MARC framework)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 03e5ec617070fdc31829f04612c821e4f83facc1)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 16ad847fa68f64c29d7e10c75a00c163ad81ffff)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 2fffaf647fe545e742c7f8aa6b7cf94d915595ed)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22101: Ill Requests missing in menu on advanced search page
Owen Leonard [Fri, 11 Jan 2019 16:27:17 +0000 (16:27 +0000)]
Bug 22101: Ill Requests missing in menu on advanced search page

This patch adds [% USE Koha %] to header.inc so that Koha.Preference
calls will work correctly.

To test, apply the patch and log in to the staff client as a user who
has permission to access the ILL module.

- Go to the catalog's advanced search page
- Cnfirm there is a header menu item under "More" for
  "ILL requests."

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 45deff8b43d32865cfeeb516c8ffc1140f294c22)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 7b456961a667ec7a8dbed0176ef6aebb942988e2)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 807e473fbbd1cab47561ecbb8b80e3545160f90e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21192: Do not pick SelfRegistration hidden fields for SelfModification
Jonathan Druart [Mon, 13 Aug 2018 15:55:55 +0000 (12:55 -0300)]
Bug 21192: Do not pick SelfRegistration hidden fields for SelfModification

There was a mix up between "modification" and "edit" for $action in
opac-memberentry.pl.

If a patron is logged into the OPAC and they attempt to submit changes to their
personal details without having actually changed anything, the page reloads with
a message stating 'No changes were made.' However, the fields that now appear
are those that have been allowed/hidden according to the preferences set for
patron self registration, even if patron self registration is disabled. This can
lead to problems if there are discrepancies between the fields allowed for self
register settings and those allowed for patron self modification settings.

To replicate:

1.) In Administration › System preferences > OPAC, set PatronSelfRegistration to
'don't allow'

2.) Modify the unwanted fields for PatronSelfModificationBorrowerUnwantedField
and PatronSelfRegistrationBorrowerUnwantedField so that at least one field is
different between the two settings and save (for example, specify 'mobile' to be
hidden in the former, but don't include in the list of fields to be hidden in
the latter).

3.) Log into the OPAC and navigate to the 'your personal details' tab. Notice
that the editable fields correspond to those not hidden by
PatronSelfModificationBorrowerUnwantedField

4.) Without making any changes, click on 'Submit update request'.

5.) Note that on this page the fields correspond to those not hidden by
PatronSelfRegistrationBorrowerUnwantedField and are now editable (including any
fields that would otherwise be hidden by the Self Modification settings).

Reported-By: Chris Slone <cslone@camdencountylibrary.org>
Signed-off-by: Devinim <kohadevinim@devinim.com.tr>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e0b1f945f9cdb4efd8b4403855cdc995023dc8be)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 63ebdb815987f0072587b7e3df5dc54cada1accd)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 70e95a7dc6fd2b45dbebfc3427b9101414c6546d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21170: Remove "isn't numeric in numeric eq (==)" warnings in MARCdetail
Jonathan Druart [Mon, 17 Dec 2018 15:55:34 +0000 (12:55 -0300)]
Bug 21170: Remove "isn't numeric in numeric eq (==)" warnings in MARCdetail

Easily removed switching the two conditions.

Test plan:
Hit catalogue/MARCdetail.pl?biblionumber=1
=> Without this patch you will see in the log warnings like
  Argument "ddc" isn't numeric in numeric eq (==) at /home/vagrant/kohaclone/catalogue/MARCdetail.pl line 277.
=> With this patch applied the warnings do no longer appear

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit b608f548a894cb433c4218b94a33d6b8a824a4c4)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 2cceecd43866efd56d84ab45c6b4e9f10895533f)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 3dc0aa4293c8997d4660c710727ea0e2235887f4)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22082: ambiguous column in patron stats
Fridolin Somers [Tue, 8 Jan 2019 13:32:19 +0000 (14:32 +0100)]
Bug 22082: ambiguous column in patron stats

In Reports > Patrons statistics, the combination of activity and extended attributes generates an invalid SQL query with error :
ERROR 1052 (23000): Column 'borrowernumber' in IN/ALL/ANY subquery is ambiguous

This is because FROM contains tables borrowers and borrower_attributes both containing borrowernumber column.

Test plan :
1) Be sure to have a patron extended attribute
2) Be sure you have some recent circulation activity
3) Go to Reports > Patrons statistics
4) Select 'active' in 'Patron activity' and 1 years of activity
5) Check 'Row' in 'Patron category'
6) Check 'Columns' in a extended attribute
7) Submit
8) Without patch you have no results, with patch you have exepected results

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8d2324e6de6f639904d188cd432e14add4874779)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit bccbb54491d3722411cee786000959abade33aa7)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit cf3df9058af418d70b02085f8bf724989567cee1)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21491: Display 'Yes' as selected if no refundlostitemfee rules are set
Nick Clemens [Wed, 21 Nov 2018 13:40:35 +0000 (13:40 +0000)]
Bug 21491: Display 'Yes' as selected if no refundlostitemfee rules are set

To test:
1 - Delete all refund_lost_item_fee_rules form the db
    delete from refund_lost_item_fee_rules;
2 - View the Standard circ rules - Default lost item fee refund shows as
'No'
3 - View circ rules for a single library, shows as 'Default (Yes)'
4 - Return a lost item, it actually does refund (this is in the
        LostItemFeeRules code, default 1 if not set)
5 - Apply patch
6 - Rule shows as 'Yes'
7 - View a specifc rule, still says Default (Yes)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7028cb8aea3f03f120c54269554953ec7475cdd8)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit b940797800ae4546c455aba7fa6570918a97b6af)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit 86cc395636c2f45e214c9fbae70d244b4bf6f338)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22054: Updated the error message for attempting to renew an onsite checkout
helene hickey [Tue, 15 Jan 2019 03:47:58 +0000 (03:47 +0000)]
Bug 22054: Updated the error message for attempting to renew an onsite checkout

To test:

1) Enable OnSiteCheckouts system preference
2) Checkout an item checking the onsite checkout checkbos in more
options
3) Go to circulation > pending on-site checkouts
4) Verify the checkout shows
5) Go to circulation > renew
6) Try to renew the on-site checkout using the barcode
7) Verify display:

onsite_checkout  Continue without renewing

8) apply the patch and reload page with error message
9) verify display:

Item cannot be renewed because it's an onsite checkout

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4eab8308353948c81d9a05978584073354cb43e5)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 3dd7d9dfad0052761e4a3e7a93fce6e7d8055c93)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit c0b2ad7da5a7ea79dbb79ad1b57c96a01431bb3a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22095: Replaced dead links with working links
Ethan Amohia [Tue, 15 Jan 2019 21:45:01 +0000 (21:45 +0000)]
Bug 22095: Replaced dead links with working links

I have updated the broken link everywhere it occurs.

Confirm that the new link works in the installer.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit dc8e663c9eeb54ebd26ecf9c7d5ef7c953db283c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 726c0e4bc4216c3c53780169635987bdc1071720)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit d82228876363bbfa461f84b70a9078c48d292bb8)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21866: Changed "report" to "plugins" for the warning "This report was written...
Olivia Lu [Tue, 15 Jan 2019 03:52:30 +0000 (03:52 +0000)]
Bug 21866: Changed "report" to "plugins" for the warning "This report was written for an older version of Koha. Run at your own risk"

To find this change:

1. Enable use plugins in global system preferences
2. Go to tools then click tool plugins
3. Verify that this string now says plugins

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5e2e101037bb2bfb8579fcee331388e56658db84)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 2c6b8230b8fa7dd0a7746327c126565fc8b47dc9)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit c6762426d47e1249c8707db0daab39bf5eca8439)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21912: (QA follow-up) Do not delete existing patrons
Tomas Cohen Arazi [Wed, 26 Dec 2018 17:55:53 +0000 (14:55 -0300)]
Bug 21912: (QA follow-up) Do not delete existing patrons

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8e6c789255a60958ed12eb399b1acd21819fd40c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 9b6b80488a6b9315b201a3f6d11d0341e58122b5)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit 91fbe63d18c7370a1105c21de890fc81c7583f3f)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21912: Add tests for Koha::Objects->search
Tomas Cohen Arazi [Thu, 29 Nov 2018 14:59:05 +0000 (11:59 -0300)]
Bug 21912: Add tests for Koha::Objects->search

This patch adds simple tests for the current behaviour. Specifically the
return values in both scalar and list context.

To test:
- Apply this patch
- Run:
  $ prove t/db_dependent/Koha/Objects.t
=> SUCCESS: Tests pass
- Sign off :-D

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7669697732e3abf3b2c5a32446115d277be7342e)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 464dcd7d9e2e7ba4e604ef0e7b5665dd8cd8b9b3)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit dc096dafe6453bbb7412da799f5acc0fff5da781)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoUpdate release notes for 17.11.14 release v17.11.14
Fridolin Somers [Tue, 22 Jan 2019 09:55:07 +0000 (10:55 +0100)]
Update release notes for 17.11.14 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoMerge remote-tracking branch 'translate/17.11.14-translate-20190122' into 17.11.x
Fridolin Somers [Tue, 22 Jan 2019 09:08:27 +0000 (10:08 +0100)]
Merge remote-tracking branch 'translate/17.11.14-translate-20190122' into 17.11.x

5 years agoIncrement version for 17.11.14 release
Fridolin Somers [Tue, 22 Jan 2019 09:07:51 +0000 (10:07 +0100)]
Increment version for 17.11.14 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoTranslation updates for Koha 17.11.14
Koha translators [Tue, 22 Jan 2019 09:07:03 +0000 (06:07 -0300)]
Translation updates for Koha 17.11.14

5 years agoBug 22073: Add to diacritics mappings for Ž and ž
Nick Clemens [Wed, 31 Oct 2018 12:50:27 +0000 (12:50 +0000)]
Bug 22073: Add to diacritics mappings for Ž and ž

To test:
1 - Find or add a record by author Slavoj Žižek
2 - Search for 'Zizek'
3 - No results
4 - Apply patch
5 - Reindex
6 - Search again
7 - Success!

https://bugs.koha-community.org/show_bug.cgi?id=22073

Signed-off-by: Eric Phetteplace <ephetteplace@cca.edu>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5c313bc554a857da29f124957d58459c0ed4c03b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit aee127e6397db9594c97d06b684cdeabf6f50e0d)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit 85374828e93d5b978cd13bbbdc583ea2a077a3b3)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22052: Refactor DeleteExpiredOpacReigstrations
Nick Clemens [Fri, 28 Dec 2018 18:48:25 +0000 (18:48 +0000)]
Bug 22052: Refactor DeleteExpiredOpacReigstrations

This patch changes the sub to use Koha::Objects and updates the tests.
Previously the sub would die on borrowers with checkouts and would
delete borrowers if they had fines

To test:
 1 - prove -v t/db_dependent/
 2 - Set your selfreg preferences:
    PatronSelfRegistration: Allow
    PatronSelfRegistrationDefaultCategory: SELFREG (or of your choice)
    PatronSelfRegistrationExpireTemporaryAccountsDelay: 30
 3 - Register a patron into SELFREG or how you set above
 4 - Set their date enrolled to two months ago
 5 - Checkout an item to the patron
 6 - Issue a fine to that patron
 7 - perl misc/cronjobs/cleanup_database.pl --del-exp-selfreg -v
 8 - The job should die with an error
 9 - Check in the item
10 - run the corn again - patron is deleted, oops
11 - Apply patch
12 - Create another patron in the same way
13 - Checkout and fine the patron
14 - run the cron
15 - they are not deleted, and no error
16 - checkin the item
17 - run the cron
18 - they are not deleted and no error
19 - clear the fine
20 - run the cron
21 - patron is deleted, huzzah

Signed-off-by: Charles Farmer <charles.farmer@inLibro.com>
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit b32756a5d7819e13290c2a145f3f0009280785c4)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 8102f6dc70623786c3247e008a0601cfd234d1e6)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit d95301763e8017d0db18cfd142e2227cbaafaf0c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22052: Unit tests
Nick Clemens [Fri, 28 Dec 2018 18:48:15 +0000 (18:48 +0000)]
Bug 22052: Unit tests

Signed-off-by: Charles Farmer <charles.farmer@inLibro.com>
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f44e37b201d0a8b95b1eee0ac0766bed9c386fc2)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 2bc4f25855819990f5d5fbcd244a0ef6dd3d89e6)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit 054819fb8ef14fd8164953577e562d0bf06da4a6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21605: (follow-up) Simple ternary boolean to number conversion
Marcel de Rooy [Thu, 13 Dec 2018 13:59:38 +0000 (14:59 +0100)]
Bug 21605: (follow-up) Simple ternary boolean to number conversion

Imo it is much easier to do just "$a ? 1 : 0" than testing defined($a) etc.
in the additional loop.
Less code, more readable?

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 482b323da1e18324941963359b9a1bd96f297c44)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit fee85191b0be2690cbfada45f4eba54ef0e75c35)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit e1050653fba9a2eb0af5926b8cc9326ca721f939)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21605: Ensure EDI acct fields set to boolean val
Colin Campbell [Fri, 26 Oct 2018 09:42:13 +0000 (10:42 +0100)]
Bug 21605: Ensure EDI acct fields set to boolean val

Validate the input to the fields indicating account
functionality. The only valid values are 1 and 0
non-integer (or integers other than 0/1) are invalid

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c9c3fc4368ee9d37a45c48167d25d5cee511898b)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ae409c2fb347f7605e20afb34c6e7fe6a04092bb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 4360ba1a247cca6466eb1bcf4e286dd45645d621)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21990: Replace dialog .error with .alert
Jonathan Druart [Wed, 12 Dec 2018 15:22:47 +0000 (12:22 -0300)]
Bug 21990: Replace dialog .error with .alert

<div class="dialog error"> will display a div without background color, the correct class is "dialog alert".

https://wiki.koha-community.org/wiki/Interface_patterns#Error_messages

Test plan:
Hit /cgi-bin/koha/acqui/parcel.pl
Notice the background color change with and without this patch

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit d44a42e417b563f501f038cc5226eda0f5fb3ca5)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1f5aa58a2ce0b6f1bf076a50cbbd2f728b47d0e1)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit 03631164c5d683c92d4728b416e094994c9fc14a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 22034: Handle default framework for MARC view with framework
Jonathan Druart [Thu, 20 Dec 2018 22:55:46 +0000 (19:55 -0300)]
Bug 22034: Handle default framework for MARC view with framework

To test:

- Create a record in any framework that is not default
- Search for the record in your catalog
- Switch to the MARC tab
- Change framework pull down to default on top
- Note the page reloads and the framework stay default
- Verify it works for other frameworks

Also test the "labeled MARC" view (you will need the pref viewLabeledMARC turned on)

Signed-off-by: Nazlı Çetin <nazli@devinim.com.tr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 54e295e4c14e3d2b3959e3185a54447a9b90d945)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 270138aa678e858b835f65f5533e6b182e07ac76)

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit 2c15a838be5a51b82cb866b261836b7586dfa6a2)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21571: Make ACCTDETAILS translatable
Jonathan Druart [Tue, 16 Oct 2018 14:51:40 +0000 (11:51 -0300)]
Bug 21571: Make ACCTDETAILS translatable

This patch makes the notice "ACCTDETAILS" translatable.

Test plan:
1. Switch on TranslateNotices and AutoEmailOpacUser
2. Define templates for different languages for ACCTDETAILS
3. Create a new patron, define an email address, userid and password.
Also pick a different "preferred language" then the default value
4. You should receive the email with the correct, translated, email.

Signed-off-by: Hugo Agud <hagud@orex.es>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a200aafd3b181b736dc288e208730a50372fbfd8)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ddfa48bf7029216051da386d211bbd4327a7453b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 3d3a3bbe92926f61f3b93e6f0bd7e4f6742083fc)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoRevert "Bug 21848: Resolve unac_string warning from Circulation.t"
Fridolin Somers [Wed, 2 Jan 2019 15:21:56 +0000 (16:21 +0100)]
Revert "Bug 21848: Resolve unac_string warning from Circulation.t"

This reverts commit 1d5f4aff2419e1c29a3fcd9ebae6b883916a198a.

5 years agoRevert "Bug 21848: Remove Text::Unaccent from C4::Members"
Fridolin Somers [Wed, 2 Jan 2019 15:21:54 +0000 (16:21 +0100)]
Revert "Bug 21848: Remove Text::Unaccent from C4::Members"

This reverts commit 87a7d26d62f306d21d5e5df2d70c2ee9f81abbb9.

5 years agoBug 21848: Remove Text::Unaccent from C4::Members
Marcel de Rooy [Fri, 16 Nov 2018 08:41:04 +0000 (09:41 +0100)]
Bug 21848: Remove Text::Unaccent from C4::Members

At refactoring time the unac_string call was moved to Koha::Patron.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5e17032700790032088fe3f2209c3d173e77d540)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 7f4a7c42ad23e84e3dab1cffaaa81f7897171758)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 939db7252afc31a4e770d2970d2b0cd94432c0b0)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21848: Resolve unac_string warning from Circulation.t
Marcel de Rooy [Thu, 13 Dec 2018 12:07:48 +0000 (13:07 +0100)]
Bug 21848: Resolve unac_string warning from Circulation.t

Just add "use utf8".

Test plan:
Run Circulation.t; verify there are no warnings.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3e731ce09433cf2121332f5356b27f90ccb34654)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 4dbb5e636093c9145dc3f3d02de4b119d93b13fb)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit f8bebfc09a15a5314d2fcd12208cf23a6b566285)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 14334: Remove AutoCommit from tests
Jonathan Druart [Fri, 7 Dec 2018 17:14:06 +0000 (14:14 -0300)]
Bug 14334: Remove AutoCommit from tests

And use a DBIx transaction instead.

Test plan:
prove that the test files modified by this patch are passing

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 64242cabea21e9ee7673666cad88eb403d1053d6)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 10148dc26ba801d3f86401dc24a3fb5b6618a02b)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 61784f5e2607afaa1a89ee3a4384ea0155bacba0)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21986: Do not escape quotation marks when cataloguing
Jonathan Druart [Wed, 12 Dec 2018 14:05:19 +0000 (11:05 -0300)]
Bug 21986: Do not escape quotation marks when cataloguing

In several places we escape quotation marks using
  $value =~ s/"/&quot;/g;
All the occurrences are wrong and must be removed.
Most of them are leftover of bug 11638 (Remove HTML from
addbiblio.pl), which removes the construction of html from pl scripts.

The problem has been highlighted by bug 13618, I did not track down why
the issue did not exist before (?)

Test plan:
0/ Use strings with quotation marks, like:
'Fiddle tune history : "bad" tunes'
You can also use other html characters to make the tests more complete,
like 'Fiddle tune history : <"bad" tunes>'
1/ authorities/authorities.pl
a. Edit an authority filling different fields with quotation marks
b. Edit it again
=> The display (inputs' values) is wrong, if you save the escaped quotes
will be inserted
2/ cataloguing/addbiblio.pl
Same editing a bibliographic record
3/ cataloguing/additem.pl
Same editing items
4/ members/memberentry.pl
Edit a patron's record and fill some fields with quotation marks
+ fields borrowernotes and opacnotes
=> The quotes are inserted directly in DB (escape is done before the
insert!)
5/ opac/opac-review.pl
For QA only: $js_ok_review is never used
6/ tools/batchMod.pl
For QA only: $value is always undefined at that point

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit d561273ef84f4bc2534ac63d0f8793c9eb2a7fb9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 305729fdc04c723b2eb372441500d3151e1a62d3)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit e2cfc2615c119252e5c317059312c0d020f2924f)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21931: Do not reset the ES mapping on 3.23.00.050
Jonathan Druart [Fri, 7 Dec 2018 19:49:00 +0000 (16:49 -0300)]
Bug 21931: Do not reset the ES mapping on 3.23.00.050

This update DB entry uses DBIx schema which does not make it crashes if
the table structure is changed.
Which happens on 18.06.00.054, that added search_field.weight

The entry 3.23.00.050 fails with
  Unknown column 'me.weight' in 'field list'

This patch removes the reset of the mapping and display a warning to
tell the administrator the mapping must be reset/inserted

Test plan:
Use a 3.22 dump and upgrade it

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e29f0bce403d5d7c1f292d57b105e0a2ab31e01d)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1fdc679955feb2357c8e897040f9d29cc3df930d)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit b89e7f3a2741390ca1acf7f254f058883d7b957c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21908: (QA follow-up) Remove useless parentheses in query
Julian Maurice [Fri, 7 Dec 2018 09:19:44 +0000 (10:19 +0100)]
Bug 21908: (QA follow-up) Remove useless parentheses in query

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 875f3162c8008ef288adfcd18ada490cf06ecc15)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 0c99c3a30a4ebe2ef18db1a6d1e48a99ef7ea0b6)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 247b57388a168b358878c1acd50b8591a3335808)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21908: Add DISTINCT biblionumber to rebuild_zebra.pl
Fridolin Somers [Thu, 29 Nov 2018 09:50:06 +0000 (10:50 +0100)]
Bug 21908: Add DISTINCT biblionumber to rebuild_zebra.pl

Zebra indexing script misc/migration_tools/rebuild_zebra.pl as a table arg to allow filtering.
When using table=items we should use DISTINCT(biblionumber) to avoid indexing several times the same biblio record when it has several items.
This patch adds DISTINCT(biblionumber) in all cases it does not harm if its already unique.

Test plan :
1) Be sur you have a biblio record with biblionumber 1 with 3 items
2) Run misc/migration_tools/rebuild_zebra.pl -v -b --table items --where="biblionumber=1"
3) Without patch you see "Records exported: 3", with patch only one
4) Check indexing works well

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a1b08269a7031417312e6265ace9ef5b995933fa)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 397f2e850ced3acaeb8d0f103694262ba339d63f)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 7008d6ae03a1f5dac6b6c3b7fd42a13d3393abab)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21908: Add biblio_metadata to rebuild_zebra.pl tables
Fridolin Somers [Thu, 29 Nov 2018 09:15:00 +0000 (10:15 +0100)]
Bug 21908: Add biblio_metadata to rebuild_zebra.pl tables

Zebra indexing script misc/migration_tools/rebuild_zebra.pl as a table arg to allow filtering.
It is missing biblio_metadata to allow filtering on MARCXML with ExtractValue.

Test plan :
1) Be sur you have a biblio record with biblionumber 1
2) Run misc/migration_tools/rebuild_zebra.pl -h
3) You see : --table specify a table (can be items, biblioitems, biblio, biblio_metadata) to retrieve biblionumber to index.
4) Run misc/migration_tools/rebuild_zebra.pl -v -b --table biblio_metadata --where="biblio_metadata.biblionumber=1"
5) Check you dont have SQL errors

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c36597bc0c72cc31249c02af5aaaf1c1f977ee50)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 33b8f3ff1df670d4512695213d004b1a189f9c25)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 2f7868e9c6d3a1646b9c0d9e8736301b317750e9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21849: Two useless Koha::Account::Offset->new calls need attention
Kyle M Hall [Fri, 16 Nov 2018 12:01:39 +0000 (07:01 -0500)]
Bug 21849: Two useless Koha::Account::Offset->new calls need attention

Came across those calls in bug 20598 in _FixOverduesOnReturn

        Koha::Account::Offset->new(
            {
                debit_id => $accountline->id,
                type => 'Forgiven',
                amount => $amountoutstanding * -1,
            }
        );

This does nothing if you don't store data.

Test Plan:
1) Apply this patch
2) Set up 2 items with overdue fines
3) Return one with dropbox mode
4) Note the dropbox account offset is created
5) Return one with full fine forgiveness
6) Note the forgiven account offset is created

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a2b5407ba5c74f826c1665c1a2ef1ff6d52689fd)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit ff3d3776a4d9b52da49b6ad4b2a1dde1da9425ee)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 56cbc940acba33003cb49f3edc964976dd2e0340)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21849: Add unit tests
Kyle M Hall [Fri, 16 Nov 2018 14:54:39 +0000 (09:54 -0500)]
Bug 21849: Add unit tests

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2dbaaa300877ff6d96ae84b5a703753d97b6c340)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit aa565b8e9919ee414d0693f391b141985ebacb93)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 0a6c0c32604ebbd89ccff8d2dc0ff4a11bd204dd)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21778: Sort user list by surname,firstname unless user cannot manage patron lists...
Nick Clemens [Wed, 7 Nov 2018 01:32:26 +0000 (01:32 +0000)]
Bug 21778: Sort user list by surname,firstname unless user cannot manage patron lists OR edit patrons

To test:
1 - Create four users:
    1 superlibrarian (or with both edit patrons and manage patron
            lists)
    1 with only edit patrons and catalogue
    1 with only add to list and catalogue
    1 with catalogue but neither edit patrons or manage patron lists
2 - Search patrons signed in as each user
3 - Note different sorting
4 - Apply patch
5 - Try searching with each patron
6 - Results should always be sorted by surname, firstname
7 - Only in the case of neither extra permission should the checkboxes
be absent

Signed-off-by: Devinim <kohadevinim@devinim.com.tr>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 96b3889390f8efe9851aaa9c2cafa9e20bda3f43)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit f228847155bc46433cbad4f834c2df89734b9c5c)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit f0b6ec9e3934badb1a9b6c8a165a3a4012d83186)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21962: (RMaint follow-up) Fixed bad rebase.
Jesse Maseto [Wed, 19 Dec 2018 17:46:58 +0000 (17:46 +0000)]
Bug 21962: (RMaint follow-up) Fixed bad rebase.

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>
(cherry picked from commit b60fa7296b4c54ed30b568cb429a557933c876de)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21962: Fix authority search using 'all'
Nick Clemens [Thu, 6 Dec 2018 12:42:45 +0000 (12:42 +0000)]
Bug 21962: Fix authority search using 'all'

To test:
1 - Set search engine to Zebra
2 - Have some authorities and indexes up to date
3 - Search authorities with option 'search entire record'
4 - No results
5 - Apply patch
6 - Run unit tests, they pass!
7 - Repeat search
8 - Results!

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3adf7708d544338250703165fe7e87f2690d8639)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a110125338202f30cec0bc061141d82c80652f30)
(cherry picked from commit f6f5de147af71d7ff6f8eb505c58c272d26173ee)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21962: Unit tests
Nick Clemens [Thu, 6 Dec 2018 12:41:41 +0000 (12:41 +0000)]
Bug 21962: Unit tests

Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 39c93e87f648978ec7907220710efaf64e556ea0)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit d6b7e00b9cd04e15c472b2f7b075d85886ffa3e5)
(cherry picked from commit f9a4e3656102d982923989ce49641ff0a267322f)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoUpdate release notes for 17.11.13 release v17.11.13
Fridolin Somers [Fri, 21 Dec 2018 08:55:39 +0000 (09:55 +0100)]
Update release notes for 17.11.13 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoIncrement version for 17.11.13 release
Fridolin Somers [Fri, 21 Dec 2018 06:50:04 +0000 (07:50 +0100)]
Increment version for 17.11.13 release

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoTranslation updates for Koha 17.11.13
Koha translators [Fri, 21 Dec 2018 06:45:57 +0000 (03:45 -0300)]
Translation updates for Koha 17.11.13

5 years agoBug 20952 - Automatic debian/control updates (oldoldstable/17.11.x)
Nightly Build Bot [Wed, 19 Dec 2018 15:05:33 +0000 (16:05 +0100)]
Bug 20952 - Automatic debian/control updates (oldoldstable/17.11.x)

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21955: Remove Cache::Memory as fallback for L2 cache
Jonathan Druart [Wed, 5 Dec 2018 19:39:02 +0000 (16:39 -0300)]
Bug 21955: Remove Cache::Memory as fallback for L2 cache

If Plack is running with several workers we must not use Cache::Memory
as L2 cache.

If a value is set from a worker, it will not be available from other
workers as the Cache::Memory instance is not shared (of course!)

Moreover we now have Koha::Cache::Memory::Lite that does the same job,
so we should not expect performance regressions by removing it.

See also the email sent to koha-devel for more info
http://lists.koha-community.org/pipermail/koha-devel/2018-December/045004.html

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 4bf033c6d6b2a8bf4d5597b3fdf6355fb7060b60)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 6039f64e53172a046c5b579271df7cf434b20e81)
(cherry picked from commit 7ffd1602a005310978a8b1e08efc7397826b4668)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21730: DBRev 18.05.06.001
Jesse Maseto [Thu, 13 Dec 2018 20:13:13 +0000 (20:13 +0000)]
Bug 21730: DBRev 18.05.06.001

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit bdbb3103f13561efaf6d6d11db1dbd41221e6810)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21730: Add missing PA_CLASS authorized values categories
Jonathan Druart [Wed, 31 Oct 2018 20:42:43 +0000 (17:42 -0300)]
Bug 21730: Add missing PA_CLASS authorized values categories

PA_CLASS is missing from the list of AV category

Test plan:
Execute the update DB entry
Confirm that you now have PA_CLASS in the AV category list

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit 6ed6c341a72a9852e146ea4fda680319e64b57e2)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21644: better UNIMARC XSLT display of 210 in intranet
Fridolin Somers [Wed, 24 Oct 2018 12:23:02 +0000 (14:23 +0200)]
Bug 21644: better UNIMARC XSLT display of 210 in intranet

In intranet default UNIMARC XSLT display of 210 is tricky.
It tests each subfield with a complex conditional prefix.
In OPAC default UNIMARC XSLT display 210 is simply displayed with a loop on all subfields.

I propose to use the same code as OPAC in intranet.
It allows to display $f and removes strange middle-score character.

Test plan:
1) Doni't apply patch
2) Use an UNIMARC database
3) Use default XSLT in all displays
4) Configure a framework to allow 210 subfields from 'a' to 'h'
5) Edit a record with this framework
6) In each 210 subfield enter its letter : $a a, $b b ...
7) Save record
8) Look at record in OPAC, you see : "Publication: a, b : c, d, e, f : g, h"
9) Look at record in intranet
10) You see : ""Publication: a, b : c, d - e : g, h
11) Apply patch
12) Look at record in intranet
13) You see : "Publication: a, b : c, d, e, f : g, h"

Signed-off-by: Andreas Roussos <arouss1980@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
This patch makes intranet consistent with staff again on this area.
Note that we loose some punctuation like "- e".

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7b16603b310212cc42d2e06e4b9bcaefa4b066ea)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit d6838df1cdc4027a860098f74e616add8377117a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21874: (QA follow-up) Fix intranet sendshelf
Marcel de Rooy [Fri, 23 Nov 2018 11:02:51 +0000 (12:02 +0100)]
Bug 21874: (QA follow-up) Fix intranet sendshelf

Move encode line below regex line.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c1ec452e5ce454b99433972a34ec1154e81a19a3)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit 22b472918026bb0ad8d7fcf693e290f07e85b62c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21874: Fix encoding of cart and list email subjects
Katrin Fischer [Fri, 23 Nov 2018 10:30:49 +0000 (11:30 +0100)]
Bug 21874: Fix encoding of cart and list email subjects

The subject of the cart and list emails is not correctly
encoded and displays incorrectly in some email clients.

To test:

Lists:
- Create a list, name it using umlauts or other diacritics
  Example:  Jugendbücher (books for youths in German)
- Add some items to your list
- Email yourself the list
- Verify that the email subject is broken

Cart:
- Install another language with non-latin characters like Greek
- Fill the cart with some titles
- Send yourself the cart
- Verify that the email subject is broken

Note: Some email clients display correctly, others not.
      It's known to be incorrect in Outlook and web.de,
      displaying nicely in Thunderbird.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested all four scripts by manipulating the cart text too in templates.
Follow-up handles intranet sendshelf.

Note: I asked Katrin to remove the encode UTF-8 statements, since we
convert to MIME and the subject line should never be UTF-8.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e40bb00ab8da87c8c5d6e660de928d24b887df17)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit c58f6e5a12a711fe81e7c4f393f1c04db2eae5bb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21861: (follow-up) replace onchange() with jQuery equivalent
Andreas Roussos [Thu, 22 Nov 2018 13:55:25 +0000 (15:55 +0200)]
Bug 21861: (follow-up) replace onchange() with jQuery equivalent

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f44a4f1d2a13735c52948df29e773728d04ab991)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit cc0833fec6ac0e4f5008c855d8c0034c56870fa4)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 1280bace7d797e49a3bc947f264733625247b25d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21861: The MARC modification template actions editor does not always validate...
Andreas Roussos [Sat, 17 Nov 2018 18:03:36 +0000 (20:03 +0200)]
Bug 21861: The MARC modification template actions editor does not always validate user input

The MARC modification template actions editor does not validate
user input when adding a conditional clause, making it possible
to save a modification action without filling in all necessary
fields.

This patch fixes that.

Test plan:
1) Create a MARC modification template and add a new action,
   e.g. "Copy All field(s) 200$a to field 600$a".
   Add a condition ("if" or "unless") but leave the relevant
   field and subfield textboxes empty.
   Add "matches" or "doesn't match" as a comparison operator.
   Check the "RegEx" checkbox, leave the regex textbox empty.
2) Click on "Add action" and notice how it accepts your input.
   Also notice the extra space in the Action column RegEx.
3) Edit your modification action and notice the missing "m/"
   before the conditional RegEx.

4) Apply the patch and hit CTRL-F5 to reload the relevant JS.

5) Edit the modification action you added previously (or add
   a new one). Try leaving the textboxes mentioned above empty
   and then submit your changes. You should get pop-up windows
   informing you about missing fields.
6) Now try typing a value in the conditional regex textbox and
   Update your action. In the Action column, there should be
   no spaces between the delimiters of the matching operator
   and the value you just entered.
7) Edit your action: notice how the "m/" before the regular
   expression and the "/" after it are now showing correctly.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3e1e1448e9132dce81571a4c3f31eb67816f14f9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a616b9fc0266fdc9a5d299d5927f8b4a2236c559)

Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 4baf83a09a2c1ae8c9def18c967eb256564ef719)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21867: Replace remaining document.element.onchange calls in marc_modification_tem...
Marcel de Rooy [Tue, 20 Nov 2018 15:45:17 +0000 (16:45 +0100)]
Bug 21867: Replace remaining document.element.onchange calls in marc_modification_templates.js

Replace onchange() by jQuery change().

Test plan:
Go to marc mod templates. Add, edit and delete. Check if works and no js
errors.
git grep -l -E "onchange\(" should not have occurrences outside lib.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Andreas Roussos <arouss1980@gmail.com>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit be78d3177e8b9bbf90c7071dc6b6e3385674d106)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit 99436fa499e6f08f4575a4135344a46aa0bb6a94)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21819: (QA follow-up) Replace onchange() in touched code
Marcel de Rooy [Tue, 20 Nov 2018 15:32:46 +0000 (16:32 +0100)]
Bug 21819: (QA follow-up) Replace onchange() in touched code

AFAIK we should not call document...onchange() and assume that it works.
Apparently, it does at least in some browsers. But we are not sure.
We could easily replace them here by the documented jQuery counterpart.

Note: If you try git grep -l -E "onchange\(" you will find some
occurrences in two libraries and only in one js file (this one).
We should replace all occurrences here; will open a new report for that.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Verified that the change event was triggered: span should expand/collapse.

Signed-off-by: Andreas Roussos <arouss1980@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit aeaf74b7cc6608d7b81aaba10defdca6decdaa1d)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit 45b7f1703858a93d563934215326ff97e234abf6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
5 years agoBug 21819: Marc modification templates action always checks Regexp checkbox
Andreas Roussos [Sat, 17 Nov 2018 09:35:00 +0000 (11:35 +0200)]
Bug 21819: Marc modification templates action always checks Regexp checkbox

When editing a MARC modification template action, the 'RegEx'
checkbox to the right of the 'to field' textboxes will always
appear checked, even if no regular expression has been added.

This patch fixes that.

Test plan (steps 1-5 are copied from the original report -- thanks Pasi!):
1) Go to Tools > Marc modification templates, and create a new template
2) Add a new action to the template
3) Edit the action so it's "Move" field to another field.
   Do not check the RegEx checkbox after the "To" field.
4) Save the action.
5) Edit the same action again. The checkbox is now checked.
6) Apply the patch and hit Ctrl-F5 to do a hard refresh in your browser.
7) Edit the action you saved in 4): this time the 'RegEx' checkbox
   should be unchecked.
8) For completeness, add a regular expression to the "Move" action
   created in 3) and click on 'Update action'. When you re-edit this
   action the 'RegEx' checkbox should be checked.

Signed-off-by: Pasi Kallinen <pasi.kallinen@joensuu.fi>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a9fc00db03a8210b3edb69a922209a4e8f6df9a1)

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>
(cherry picked from commit 57e031929df2b061c70341dee5efafb1ebd614f3)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>