]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoMerge branch 'bug_5343' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 03:57:05 +0000 (23:57 -0400)]
Merge branch 'bug_5343' into 3.12-master

11 years agoBug 5343: Increment version number
Jared Camins-Esakov [Sat, 23 Mar 2013 03:56:51 +0000 (23:56 -0400)]
Bug 5343: Increment version number

Database update for bug 5343 has been given version 3.11.00.116

11 years agoBug 5343: Fix non english string
Jonathan Druart [Fri, 22 Mar 2013 10:40:02 +0000 (11:40 +0100)]
Bug 5343: Fix non english string

Replace "Not orderable" with "Cannot be ordered"
and 3 others typos

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Testing notes:
- Ordered same subscription multiple times
- Tried different settings of AcqCreateItem for a full
  workflow from order to receive
- Undid a receipt and checked correct behaviour
- Ordered a book in between, to see item creation and
  receiving still works.

Note for documentation:
Acquisition details on the subscription only show the
last invoice and the last order. You can of course find
all orders/invoices using the acquisition search.

Overall very nice much needed functionality!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Fix non english string
Jonathan Druart [Fri, 22 Mar 2013 10:40:02 +0000 (11:40 +0100)]
Bug 5343: Fix non english string

Replace "Not orderable" with "Cannot be ordered"

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Followup: remove useless string on the serials result page
Jonathan Druart [Fri, 22 Mar 2013 09:46:49 +0000 (10:46 +0100)]
Bug 5343: Followup: remove useless string on the serials result page

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: It is not possible to add a subscription for another supplier
Jonathan Druart [Thu, 21 Mar 2013 14:16:09 +0000 (15:16 +0100)]
Bug 5343: It is not possible to add a subscription for another supplier

If a supplier is defined for a subscription, you cannot order this
subscription to another supplier. If no supplier is defined, you can.

FIX: If a cancelled order is linked to a subscription, you can order it.

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Followup: invoicenumber no longer exists, use invoiceid.
Jonathan Druart [Wed, 20 Mar 2013 12:44:25 +0000 (13:44 +0100)]
Bug 5343: Followup: invoicenumber no longer exists, use invoiceid.

A previous patch replaces invoicenumber with invoiceid.

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Followup FIX quantity received if items are created when receiving
Jonathan Druart [Wed, 20 Mar 2013 09:55:49 +0000 (10:55 +0100)]
Bug 5343: Followup FIX quantity received if items are created when receiving

For subscriptions, if items are created when receiving, the quantity
received is always 1, not 0.

+ UI: Show the subscription search form (instead of hidden)

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Link serial and acqui modules
Jonathan Druart [Tue, 23 Oct 2012 10:13:16 +0000 (12:13 +0200)]
Bug 5343: Link serial and acqui modules

DB changements:
- Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid.
- Removes 2 unused fields: aqorders.serialid and aqorders.subscription.

Main test plan:
1) Create a subscription
2) Create a bookseller and a basket
3) Add a new order 'from a subscription'
4) Search your subscription and check if results are correct
5) Click on the "order" link
6) Check the biblio information are filled in the form
7) Select a budget and fill some price information.
8) retry steps 3 and 4. Verify you cannot order the same subscription.
Message:Outstanding order (only one order per subscription is allowed).
9) click on your subscription (already added) and check you have a new
table "Acquisition details" with your price information in the "Ordered
amount" line.
10) receive this order
11) On your subscription detail page, the "Spent amount" line must be
filled with your price information.
12) Re order the same subscription. Now you are allowed to. Prices
information have to be filled with the previous information.
13) Retry some orders and click on a maximum of links in order to find a
bug :)

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7740' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 03:22:42 +0000 (23:22 -0400)]
Merge branch 'bug_7740' into 3.12-master

11 years agoMerge branch 'bug_9900' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 03:21:57 +0000 (23:21 -0400)]
Merge branch 'bug_9900' into 3.12-master

11 years agoBug 9900 - Plugins should not be enabled by default
Kyle M Hall [Fri, 22 Mar 2013 13:58:53 +0000 (06:58 -0700)]
Bug 9900 - Plugins should not be enabled by default

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple changes, all ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740: Increment version number
Jared Camins-Esakov [Sat, 23 Mar 2013 02:57:53 +0000 (22:57 -0400)]
Bug 7740: Increment version number

Database update for bug 7740 has been given version 3.11.00.115

11 years agoBug 7740 - Followup - Add Non-XSLT Caveaut to system preference
Kyle M Hall [Fri, 22 Mar 2013 10:42:56 +0000 (03:42 -0700)]
Bug 7740 - Followup - Add Non-XSLT Caveaut to system preference

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740 follow-up : removing duplicate declaration
Paul Poulain [Fri, 22 Mar 2013 09:41:11 +0000 (10:41 +0100)]
Bug 7740 follow-up : removing duplicate declaration

the my $branches = GetBranches();
already exist at line 444 (introduced by this patch)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740 follow-up: css additions for ccsr theme
Paul Poulain [Fri, 22 Mar 2013 09:36:27 +0000 (10:36 +0100)]
Bug 7740 follow-up: css additions for ccsr theme

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740 - Highlight items in own library in search results/detail page in OPAC
Kyle M Hall [Thu, 18 Oct 2012 16:40:02 +0000 (12:40 -0400)]
Bug 7740 - Highlight items in own library in search results/detail page in OPAC

This feature enables a particular library's items to be emphasized and moved
to the first position on the search results and details pages of the OPAC.

It is enabled by the sytem preference HighlightOwnItemsOnOPAC.

To choose which branches items are emphasized, use the system preference
HighlightOwnItemsOnOPACWhich. It has two modes.

If set to PatronBranch, the items emphasized will be those of the same
library as the patron's library. If no one is logged into the opac, no
items will be highlighted.

If set to OpacURLBranch, the library is chosen based on the Apache
environment variable BRANCHCODE.

For example, this could be added to the OPAC section of koha-httpd.conf:
SetEnv BRANCHCODE "CPL"

The point of this feature is to allow each library on a given Koha server
to have a specific subdomain for the opac where that library's items are
empasized. That was http://branch1.opac.mylibrary.org will emphasize the
items of branch1, while http://branch2.opac.mylibrary.org will emphasize
the items of branch2.

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Nora Blake <nblake@masslibsystem.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7688' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:23:16 +0000 (22:23 -0400)]
Merge branch 'bug_7688' into 3.12-master

11 years agoBug 7688: Increment version number
Jared Camins-Esakov [Sat, 23 Mar 2013 02:23:00 +0000 (22:23 -0400)]
Bug 7688: Increment version number

Database update for bug 7688 has been given version 3.11.00.114

11 years agoBug 7688: Set firstacquidate in updatedatabase if it's not set
Julian Maurice [Fri, 22 Mar 2013 09:53:51 +0000 (09:53 +0000)]
Bug 7688: Set firstacquidate in updatedatabase if it's not set

firstacquidate is now a mandatory field, so it must be set.
The updatedatabase process set firstacquidate value to one of:
- the planned date of the first serial for this subscription, or if not
  found,
- the subscription start date.

+ auto-select the numbering pattern when modifying a subscription.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Followup FIX perldoc
Jonathan Druart [Tue, 19 Feb 2013 10:02:43 +0000 (11:02 +0100)]
Bug 7688: Followup FIX perldoc

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Fix generating next serial when there is no 'Expected' issue
Julian Maurice [Tue, 11 Dec 2012 10:16:54 +0000 (11:16 +0100)]
Bug 7688: Fix generating next serial when there is no 'Expected' issue

It can happen when the Expected issue is claimed. In this case the
status of the last serial is 'Claimed'

This patch change the API of GetNextSeq and GetSeq

Test plan:
- Create a subscription which starts a long time ago so that serials
  automatically appear in late issues
- Receive the first serial
- Go to claims page and claim the 2nd serial.
- Go back to the subscription page and click on 'Serial collection'
- You should have 2 serials, one 'Arrived' and one 'Claimed'.
- Click on Generate Next. This should fail with a software error message
  ("can't call method output ...")
- Apply this patch and click again on Generate Next. A new issue must be
  created with status 'Expected'.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Translate sample frequencies for french
Julian Maurice [Mon, 17 Sep 2012 10:36:01 +0000 (12:36 +0200)]
Bug 7688: Translate sample frequencies for french

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688 follow-up: Small fixes for QA #2
Julian Maurice [Mon, 17 Sep 2012 10:04:53 +0000 (12:04 +0200)]
Bug 7688 follow-up: Small fixes for QA #2

- "return undef" -> "return"
- ":utf8" -> ":encoding(UTF-8)"
- TAB -> SPACES

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688 follow-up: Small fixes for QA
Julian Maurice [Thu, 2 Aug 2012 14:55:24 +0000 (16:55 +0200)]
Bug 7688 follow-up: Small fixes for QA

- # Subroutines::ProhibitExplicitReturnUndef: Got 1 violation(s) in
  C4::Serials::GetSubscriptionIrregularities
- Bad template constructions fixed in serials/subscription-add.tt

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Change subscription numbering pattern and frequencies
Julian Maurice [Thu, 8 Mar 2012 16:12:55 +0000 (17:12 +0100)]
Bug 7688: Change subscription numbering pattern and frequencies

Serials numbering pattern and frequencies are no more hard-coded. Now
it's possible to create, edit and delete numbering patterns (and
frequencies). This implies new sql tables (subscription_numberpatterns
and subscription_frequencies)

Numbering patterns behave almost as before, there are still the same
values to configure (addX, everyX, settoX, whenmorethanX). lastvalueX
and innerloopX remain in subscription tables.

There is a new value in numbering patterns: numberingX. For each
"column" (X, Y or Z) you can tell how to format the number. Actually
numberingX can be set to:
 - 'dayname' (name of the day) (0-6 or 1-7 depending on which day is the
   first of the week)
 - 'monthname' (name of the month) (0-11)
 - 'season' (name of the season) (0-3) (0 is Spring)

These names are localized by using POSIX::setlocale and POSIX::strftime
and setting a 'locale' value to the subscription. Locale have to be
installed on the system.
Note that season names are not localized using POSIX::strftime (it can't
do this), so names are hardcoded into the code (available languages: en,
fr). This could be fixed in the future by using a Perl localization
framework.

Frequencies can be configured using 3 parameters:
 - 'unit': one of 'day', 'week', 'month', 'year'
 - 'issuesperunit': integer >= 1, the number of received issues per
   'unit'
 - 'unitsperissue': integer >= 1, the number of 'unit' between two
   issues
One of 'issuesperunit' and 'unitsperissue' must be equal to 1.
Examples:
  unit = 'day', issuesperunit=3, unitsperissue=1 => 3 issues per day
  unit = 'week', issuesperunit=1, unitsperissue=3 => 1 issue each 3
  weeks

Prediction pattern is now computed server-side and is more consistent
with what Koha will do. The publication date is displayed alongside the
serial number.
Irregularities can now be checked one by one, in the prediction pattern
table, or if frequency is 'day-based' (unit is 'day'), there is the
possibility to check all issues for a week day at once.

When an irregularity is found, there is the possibility to keep the
serial number unchanged, or to skip it. It is configured at subscription
creation or modification.
For instance, with a daily subscription you can have:
  skip serial number  |  keep serial number
----------------------+----------------------
 2012-01-01  ¦  No 1  | 2012-01-01  ¦  No 1
 2012-01-03  ¦  No 3  | 2012-01-03  ¦  No 2

To lighten the subscription modification page, manual history has been
moved in its own page subscription-history.pl which is accessible on
subscription-detail.pl, tab 'Planning'.

Important note: updatedatabase.pl script takes into account existing
subscriptions and create appropriate numbering patterns for them (it
tries to create as few patterns as possible). Frequency is
mapped to the correct entry in subscription_frequencies table.

This patch includes kohastructure.sql and updatedatabase.pl changes
+ sample frequencies data and sample numberpatterns data for fresh
installs (sample data is included in updatedatabase.pl)

=== TEST PLAN: ===

Create a new subscription:

  - Go to Serials module and click "New subscription" button
  - On the first page, choose a biblio and click next to go to the
    second page
  - Pick a first issue publication date
  - Choose frequency '1/day'
  - Choose a subscription length of 15 issues
  - Choose a subscription start date
  - Choose numbering pattern 'Volume, Number'
  - A table appears, fill 'Begins with' cells with '1'
  - Click on 'Test prediction pattern' button

The prediction pattern is displayed at the right of the page. You can
see in it the serial number, the publication date and a checkbox to
allow you to choose which serials will not be received (irregularities).

You can see that serial number start from "Vol 1, No 1" continue to "Vol
1, No 12" and then restart with "Vol 2, No 1".

Frequency is '1/day' so you can see that publication date is incremented
by one day line after line.

  - Now you can play a little with frequencies and numbering patterns,
    change one of them (or both) and click again on 'Test prediction
    pattern'
  - For example, choose frequency '3/weeks' and click on 'Test
    prediction pattern' button'.

There is a little behaviour change compared with current master.
Publication date will not be guessed within the week. Koha can't know
when you will receive issues. So the publication date stay the same
(monday of each week) for 3 consecutive issues and then jump to the next
week.

  - Now choose frequency '1/3 months' and numbering pattern 'Seasonal'
  - Fill 'Begins with' cells with '2012' for Year and '0' for Season
  - Click on 'Test prediction pattern'
  - You should have something like 'Spring 2012', 'Summer 2012', ...,
    'Winter 2012', 'Spring 2013'
  - Note that you can have seasons for south hemisphere by entering '2'
    in 'Year/Inner counter'
  - 2nd note: if you have some locales installed on your system, you can
    type its name in the 'Locale' field (actually it does not work for
    seasons name, only for month names and day names)

If you want to modify the numbering pattern you can still do it here:

 - Click on 'Show/Hide advanced pattern' link. The advanced pattern
   table is shown but all fields are readonly
 - Click on 'Modify pattern' button. All readonly fields are now
   editable. Note that 'Begins with' and 'Inner counter' line are
   repeated here and any modifications in the small table will be
   replicated in the big table, and vice versa.
 - Pattern name is emptied, if you type a new name, a new pattern will
   be created, and if you type the same name as an existing numbering
   pattern, this one will be modified (with a confirmation message)
 - There is two new lines in this table:
   - Label: it's what is displayed in the smaller table headers above
   - Numbering: used to format numbers in different ways. can be
     'seasons', 'monthname' or 'dayname'. Month name and day name can be
     localized using the 'Locale' field. Seasons can't (values for
     english and french are hard-coded in Serials.pm)
 - You can modify what you want in the table and click on 'Test
   prediction pattern' button each time you want to see your
   modifications. (Note that checkboxes for irregularities aren't displayed
   in this mode, and you can't save the subscription until you have saved
   or cancelled your changes).
 - To cancel your modifications, just click on 'Cancel modifications'
   button.
 - To save them, click on 'Save as new pattern'. If the pattern name is
   already existing, a confirmation box will ask you if you want to
   modify the existing numbering pattern. Otherwise a new pattern will be
   created and automatically selected.

Once you have finished modifying numbering pattern. You can click again
on 'Test prediction pattern' to define irregularities, and then click on
'Save subscription'.

Now you can check the serials module still works correctly:

 - Check the subscription detail page to confirm that nothing is
   missing. Especially the 'Frequency' and 'Number pattern' infos
 - Try to receive some issues. Check that the serial number is correctly
   generated and if irregularities you have defined are taken into
   account (if you have defined some).
 - Check that receiving is blocked once you have reached the number of
   issues you have defined in subscription length (or once you have
   reached the subscription end date)

In serials menu (to the left of almost each page of serials menu) you
have two new links: 'Manage frequencies' and 'Manage numbering
patterns'.

'Manage numbering patterns' lead to a page which list all numbering
patterns and allow you to create, edit or delete them. The interface is
almost the same as numbering pattern modification in subscription-add.pl

'Manage frequencies' lead to a page which list all frequencies and allow
you to create, edit or delete them.

Try to create a new frequency:
 - Click on 'Manage frequencies' link in the serials menu and then click
   on 'New frequency':
 - Fill in the description (mandatory).
 - Unit is one of 'day', 'week', 'month', year' or 'None' ('None' is for
   an irregular subscription)
 - If unit is different from 'None' you have to fill the two following
   fields (Issues per unit, and Units per issue)
 - Note that at least one of those must be equal to 1
 - Issues per unit is the number of received issues by 'unit' and Units
   per issue is the number of 'unit' between two issues
 - Display order is used to build the drop-down list. Leave empty and it
   will be set to 0 (top of the list)
 - Then click on 'Save'
 - Check that this new frequency appears in the frequencies table and in
   the drop-down list in subscription-add.pl

Subscription history has been moved in its own page. To test if it still
works, choose a subscription with manual history enabled (or modify an
existing subscription to turn on manual history).

 - On the detail page, tab 'Planning', you should have a link 'Edit history'.
 - Click on it
 - Modify history and click on Save
 - In tab 'Summary' you should have the infos you just entered

And finally, you can check that old subscriptions (by old I mean
subscriptions that existed before the update) are correctly linked to an
existing numbering pattern and an existing frequency. Numbering patterns
should be named 'Backup pattern X' where X is a number.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Great development! Work as described. No koha-qa errors
(with all patches applied). Please QA this fast.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9068' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:08:15 +0000 (22:08 -0400)]
Merge branch 'bug_9068' into 3.12-master

11 years agoBug 9068: Baebeltheque - add podcast
Jonathan Druart [Wed, 30 Jan 2013 09:33:25 +0000 (10:33 +0100)]
Bug 9068: Baebeltheque - add podcast

Test plan:
check that there is no regression on the opac detail page.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Small patch. No errors

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9604' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:05:42 +0000 (22:05 -0400)]
Merge branch 'bug_9604' into 3.12-master

11 years agoBug 9604 - Follow-up: Changing labels from branch to library
Katrin Fischer [Fri, 22 Mar 2013 15:35:29 +0000 (16:35 +0100)]
Bug 9604 - Follow-up: Changing labels from branch to library

Relabelling the new filters for consistency.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9604: filter overdues with homebranch and holdingbranch
Fridolyn SOMERS [Wed, 13 Feb 2013 08:41:29 +0000 (09:41 +0100)]
Bug 9604: filter overdues with homebranch and holdingbranch

This patch adds in overdues.pl filters on item home branch and holding branch.

Test plan :
Play with item home branch and holding branch filters and check
it filters well results.

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Filters are added to the list of overdues in the circulation module.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7973' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:01:49 +0000 (22:01 -0400)]
Merge branch 'bug_7973' into 3.12-master

11 years agoBug 7973 : Follow up to remove an extraneous my
Chris Cormack [Thu, 21 Mar 2013 21:51:31 +0000 (10:51 +1300)]
Bug 7973 : Follow up to remove an extraneous my

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes problem found by QA scripts.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7973- Allow for new type of LDAP authentication
Rolando Isidoro [Fri, 19 Oct 2012 14:57:36 +0000 (15:57 +0100)]
Bug 7973- Allow for new type of LDAP authentication

This patch aims to solve the LDAP bind authentication method. Here are
some considerations:

- This is a standalone patch, so all the previous submitted ones are
  rendered obsolete;
- LDAP bind authentication is now done in 3 steps:
  1 - LDAP anonymous bind;
  2 - LDAP search entry for the given username;
  3 - LDAP bind with the DN of the found entry + the given password.
- The process fails if none or more than 1 entries are found for the
  given username;
- The <principal_name> setting in koha-conf.xml isn't used anymore;
- The patch is backwards compatible, so users already using the
  previously implemented LDAP bind authentication should be able to use
  it the same.

http://bugs.koha-community.org/show_bug.cgi?id=7973

Signed-off-by: Vitor Fernandes
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script and has 2 solid sign offs.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9909' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 01:53:29 +0000 (21:53 -0400)]
Merge branch 'bug_9909' into 3.12-master

11 years agoBug 9909: Don't install KitchenSink plugin if plugin dir isn't writable
Jared Camins-Esakov [Sat, 23 Mar 2013 01:49:27 +0000 (21:49 -0400)]
Bug 9909: Don't install KitchenSink plugin if plugin dir isn't writable

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9907' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 21:50:17 +0000 (17:50 -0400)]
Merge branch 'bug_9907' into 3.12-master

11 years agoBug 9907 - Plugins test dies early on some servers
Kyle M Hall [Fri, 22 Mar 2013 21:31:15 +0000 (14:31 -0700)]
Bug 9907 - Plugins test dies early on some servers

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9890' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 20:54:11 +0000 (16:54 -0400)]
Merge branch 'bug_9890' into 3.12-master

11 years agoBug 9890 - Fix the new plugin system for package installs
Kyle M Hall [Fri, 22 Mar 2013 13:30:42 +0000 (06:30 -0700)]
Bug 9890 - Fix the new plugin system for package installs

Create the plugins directory in the Makefile

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
One line change, all ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9883' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 13:52:37 +0000 (09:52 -0400)]
Merge branch 'bug_9883' into 3.12-master

11 years agoBug 9883 - Koha::Plugins::* should not require koha-conf to load - Followup - Load...
Kyle M Hall [Fri, 22 Mar 2013 11:40:36 +0000 (04:40 -0700)]
Bug 9883 - Koha::Plugins::* should not require koha-conf to load - Followup - Load C4::Auth at run time

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Unset KOHA_CONF variable and made sure t/00_load.t passed
Also ran Makefile.PL doing an update on my existing installation
and checked koha-conf.xml:

 <pluginsdir>/home/katrin/koha-dev/var/lib/plugins</pluginsdir>
 <enable_plugins>0</enable_plugins>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9883 - Add missing parameter to koha-conf.xml causing Plugins.t to fail
Kyle M Hall [Fri, 22 Mar 2013 09:08:02 +0000 (02:08 -0700)]
Bug 9883 - Add missing parameter to koha-conf.xml causing Plugins.t to fail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9883 - Koha::Plugins::Base should not require koha-conf to load
Kyle M Hall [Thu, 21 Mar 2013 08:35:16 +0000 (01:35 -0700)]
Bug 9883 - Koha::Plugins::Base should not require koha-conf to load

Test Plan:
1) Run t/db_dependent/Plugins.t
2) Apply patch
3) Re-run t/db_dependent/Plugins.t

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
The tests pass both before and after the patch. I can see no
ill effects on the functionality (tried uploading and
accessing the Kitchen Sink plugin).

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After installing libmodule-bundled-files-perl from the
debian.koha-community.org I ran through Makefile.PL
updating my conf file successfully. Also all tests
and QA script pass now.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9257' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 12:25:21 +0000 (08:25 -0400)]
Merge branch 'bug_9257' into 3.12-master

11 years agoBug 9257: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 12:25:15 +0000 (08:25 -0400)]
Bug 9257: Increment version number

Database update for bug 9257 has been given version 3.11.00.113

11 years agoBug 9257 - Add "groups" to normal search pulldown
Kyle M Hall [Mon, 10 Dec 2012 18:58:16 +0000 (13:58 -0500)]
Bug 9257 - Add "groups" to normal search pulldown

This patch adds the ability to add groups to the library select
pulldown on the opac, if it is enabled.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Go to Administration › Libraries and groups
4) Create a new group, or edit an existing one
5) Ensure the 'Show in search pulldown' checkbox is checked
6) Save the group
7) Enable OpacAddMastheadLibraryPulldown if it is not already enabled
8) Load the OPAC, try the group search from the libraries pulldown menu

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Yes! Now this works, and well.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8365' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 11:58:22 +0000 (07:58 -0400)]
Merge branch 'bug_8365' into 3.12-master

11 years agoBug 8365: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 11:58:14 +0000 (07:58 -0400)]
Bug 8365: Increment version number

Database update for bug 8365 has been given version 3.11.00.112

11 years agoBug 8365: FIX Return issue values instead of item values
Jonathan Druart [Tue, 19 Mar 2013 13:41:52 +0000 (14:41 +0100)]
Bug 8365: FIX Return issue values instead of item values

Before this patch, the GetItemIssue routine returns items.renewals
instead of issues.renewals

Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8365: Followup Force DateTime type for the datedue variable
Jonathan Druart [Tue, 19 Mar 2013 13:18:40 +0000 (14:18 +0100)]
Bug 8365: Followup Force DateTime type for the datedue variable

Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr>
I tested one more time on a sandbox but I confirm the problem:
the due date doesn't change when you renew more than one time
with syspref renewalperiodbase turned on: "the old due date of
the checkout". The due date should change any time.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Added signed-off line and problem description from bugzilla.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8365: Add unit tests and fix QA issues
Jonathan Druart [Wed, 13 Feb 2013 14:08:41 +0000 (15:08 +0100)]
Bug 8365: Add unit tests and fix QA issues

This patch adds some unit tests for CalcDateDue and GetLoanLength

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
- Checked update works correctly for existing circulation rules.
- Adding, deleting and overwriting circulation rules works.
- Renewals work for different circulation rules and changes
  to the holiday calendar.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8365: Add a renewal duration in the issuing rules
Jonathan Druart [Fri, 7 Sep 2012 14:31:44 +0000 (16:31 +0200)]
Bug 8365: Add a renewal duration in the issuing rules

Renew an issue for a number of days (filled in the issuing rules).

Test if rules work for any i[item]types and if there is no regression.

- new column issuingrules.renewalperiod
- remove all occurrences of an already removed syspref (globalDueDate)
- remove an unused routine (Overdues::GetIssuingRules)

How it works:
- On existing installations, the issuingrules.renewalperiod =
  issuingrules.loanlength. So the behaviour is the same before and after
  this patch.
- when you add a rule, you can choose a renewal period (the unit value
  is the issuingrules.unit). So you can have a renewal period in hours
  or days.
- The default value for the renewal period is 21 days (same as
  loanlength)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoUpdate history with January and February 2013 releases
Jared Camins-Esakov [Fri, 22 Mar 2013 03:17:02 +0000 (23:17 -0400)]
Update history with January and February 2013 releases

11 years agoMerge branch 'bug_9496' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 02:25:09 +0000 (22:25 -0400)]
Merge branch 'bug_9496' into 3.12-master

11 years agobug 9496: improve error checking in rebuild_zebra.pl
Galen Charlton [Tue, 8 Jan 2013 00:12:57 +0000 (19:12 -0500)]
bug 9496: improve error checking in rebuild_zebra.pl

When using rebuild_zebra to index all records, skip over
bibliographic or authority records that don't come out
as valid XML.  Also, strip extraneous XML declarations when
using --nosanitize.

Test plans
----------
Note that both plans assume that DOM indexing is turned on.

Test plan #1
============

[1] Run rebuild_zebra.pl with the -x -nosanitize options.  Without
    the patch, zebraidx should terminate early and complain
    about invalid XML.
[2] With the patch, the rebuild_zebra.pl should work without
    error.

Test plan #2
============
[1] Intentionally make a MARCXML record invalid, e.g, by running
    the following SQL:

    UPDATE bilbioitems SET marcxml = CONCATENATE(marcxml, 'junk')
    WHERE biblionumber = 123;

[2] Run rebuild_zebra.pl -b -x -r
[3] Without the patch, only part of the database will be indexed.
[4] With the patch, rebuild_zebra.pl will not export the bad
    record and will give an error message saying so, but will
    successfully index the rest of the records.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_5608' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 02:16:16 +0000 (22:16 -0400)]
Merge branch 'bug_5608' into 3.12-master

11 years agobug 5608 follow-up: exit immediately if UNIMARC
Paul Poulain [Thu, 21 Mar 2013 15:55:07 +0000 (16:55 +0100)]
bug 5608 follow-up: exit immediately if UNIMARC

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoAdd license statement to switch_series_info CLI script
Michael Hafen [Mon, 25 Feb 2013 19:43:09 +0000 (12:43 -0700)]
Add license statement to switch_series_info CLI script

License and copyright statement added.
Thanks to Bernardo Gonzalez Kriegel for reminding me about this.

http://bugs.koha-community.org/show_bug.cgi?id=5608
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: add license information. No errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5608 - command-line tool to switch information in 440 and 490 tags
Michael Hafen [Thu, 21 Feb 2013 22:44:00 +0000 (15:44 -0700)]
Bug 5608 - command-line tool to switch information in 440 and 490 tags

With the MARC21 standard moving from the 440 tag to the 490, this tool is
to help libraries make the move.  It switches any information in 440 tags to
490 tags, and any information in 490 tags to 440 tags.  That seemed like the
best way to go to me.  There is also an option to create 830 tags for any 44
information, like authorities, that can't be represented in the 490 tag.

To Test:
locate some biblios with 440 or 490 tags filled.
run bin/migration_tools/switch_marc21_series_info.pl -c
observe that the information in the biblios has switched 4xx tags.

http://bugs.koha-community.org/show_bug.cgi?id=5608
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5608 - command-line tool to switch information in 440 and 490 tags
Michael Hafen [Wed, 20 Feb 2013 21:32:06 +0000 (14:32 -0700)]
Bug 5608 - command-line tool to switch information in 440 and 490 tags

With the MARC21 standard moving from the 440 tag to the 490, this tool is
to help libraries make the move.  It switches any information in 440 tags to
490 tags, and any information in 490 tags to 440 tags.  That seemed like the
best way to go to me.

To Test:
locate some biblios with 440 or 490 tags filled.
run bin/migration_tools/switch_marc21_series_info.pl -c
observe that the information in the biblios has switched 4xx tags.

http://bugs.koha-community.org/show_bug.cgi?id=5608
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No errors.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8378' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 01:56:06 +0000 (21:56 -0400)]
Merge branch 'bug_8378' into 3.12-master

11 years agoBug 8378: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 01:55:14 +0000 (21:55 -0400)]
Bug 8378: Increment version number

Database update for bug 8378 has been given version 3.11.00.111

11 years agoBug 8378 - followup - update notices to use <<items.fine>>
Dobrica Pavlinusic [Wed, 20 Mar 2013 13:46:07 +0000 (14:46 +0100)]
Bug 8378 - followup - update notices to use <<items.fine>>

Didn't break on well-formed notices, and fixed those with problems

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8378 - followup - sample_notices.sql updated to <<items.fine>>
Dobrica Pavlinusic [Wed, 20 Mar 2013 13:13:16 +0000 (14:13 +0100)]
Bug 8378 - followup - sample_notices.sql updated to <<items.fine>>

Trivial string substitution.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8378 - show all items columns and new items.fine
Dobrica Pavlinusic [Tue, 19 Mar 2013 13:36:14 +0000 (14:36 +0100)]
Bug 8378 - show all items columns and new items.fine

This allows users to select any columns from items and adds new
items.fine field introduced by previous patch to user interface.

Note: This works as expected. items.fine appears as an option and gets inserted in the notice template as expected.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8378 - <fine> in overdues changed to <<items.fine>>
Dobrica Pavlinusic [Tue, 19 Mar 2013 12:40:50 +0000 (13:40 +0100)]
Bug 8378 - <fine> in overdues changed to <<items.fine>>

This patch reintroduces fines in overdue_notices.pl with minimal
changes to exsiting code.

It DOES changes template syntax, it used to be <fine>USD</fine> but
currency was not recalculated and used only to select format, so
now we are using active system currency because values are in it
anyway.

Example notify template:

<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>,
Barcode: <<items.barcode>> Fine: <<items.fine>> </item>

If your active currency doesn't have valid ISO code this code will
fallback to sprintf with two decimal digits, and you can insert
currency symbol in template itself (currency field is not editable
through web interface, so this fallback might be useful for existing
installations).

Test scenario:
1. configure fine amount under "Circulation and fines rules"
   for patron category and item type
2. checkout item with correct type to partron in correct
   category with due date set to yesterday
3. verify that overdue notice uses new <<items.fine>> tag
4. run ./misc/cronjobs/fines.pl to calculate fines
5. run ./misc/cronjobs/overdue_notices.pl -n
   and verify that fine amount is included

Notes: Tested using the default ODUE notice, changing:
<fines>USD</fines>
for
<<items.fine>>

Everything worked as expected with finesmode=production set.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoRevert "Merge branch 'bug_8089' into 3.12-master"
Jared Camins-Esakov [Fri, 22 Mar 2013 01:06:30 +0000 (21:06 -0400)]
Revert "Merge branch 'bug_8089' into 3.12-master"

This reverts commit af89f98a7a82e098a5248c4f2d3c9ff3cd5de201, reversing
changes made to cc49dc70fbadb776360b1679616f81388ca71252.

The changes made by bug 8089 caused problems with the
t/db_dependent/Context.t unit test. Given the proximity of feature
freeze and release I am exercising my RM privilege and reverting rather
than seeking to fix the problems right this moment.

11 years agoMerge branch 'bug_8220' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 00:41:37 +0000 (20:41 -0400)]
Merge branch 'bug_8220' into 3.12-master

11 years agoBug 8220: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 00:41:12 +0000 (20:41 -0400)]
Bug 8220: Increment version number

Database update for bug 8220 has been given version 3.11.00.110

11 years agoBug 8220 - QA Followup - Unit Test
Kyle M Hall [Tue, 11 Dec 2012 19:47:44 +0000 (14:47 -0500)]
Bug 8220 - QA Followup - Unit Test

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and qa script pass.

Tests done:
- created a .koc file with return, issue and fine payments.
- queued that file into Koha
- created some transactions using the Firefox plugin
- queued that into Koha
- processed files and checked outcome was ok
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 8220 - Allow koc uploads to go to process queue instead of being applied directly.
Kyle M Hall [Sat, 9 Jun 2012 15:07:39 +0000 (11:07 -0400)]
Bug 8220 - Allow koc uploads to go to process queue instead of being applied directly.

The primary advantage to the Firefox offline cirulation plugin when compared
to the offline circulation desktop application, is the ability to add offline
circulation actions to a queue so that multiple machines running offline
circ can have their circ actions combined and ordered chronologically before
being executed. This commit adds the ability to put actions from uploaded
KOC files into this queue. In this way, both the FF plugina and the desktop
application can be run side by side with no ill effects.

Signed-off-by: Bob Birchall <bob@calyx.net.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_5635' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 00:21:58 +0000 (20:21 -0400)]
Merge branch 'bug_5635' into 3.12-master

11 years agoBug 5635: bulkmarcimport new parameters & features
Stéphane Delaune [Mon, 23 Jul 2012 08:49:31 +0000 (10:49 +0200)]
Bug 5635: bulkmarcimport new parameters & features

See the script's documentation for more details

New parameters are:
 - authtypes
 - filter
 - insert
 - update
 - all

Signed-off-by: Pascale Nalon <pascale.nalon@gmail.com>
This patch is live in Mines ParisTech since 2012-07-24.
Signing off

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
 - Moved the sign-off from bugzilla to the commit message.
 - All tests and QA script pass.
 - Amended commit message to list new parameters.
 - Verified this patch works on a UNIMARC installation.
 - Verified normal import still works correct on a MARC21
   installation.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_4354' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 00:08:17 +0000 (20:08 -0400)]
Merge branch 'bug_4354' into 3.12-master

11 years agoBug 4354 follow-up: correct phrasing of alert
Jared Camins-Esakov [Fri, 22 Mar 2013 00:04:09 +0000 (20:04 -0400)]
Bug 4354 follow-up: correct phrasing of alert

Rather than saying "Are you sure you want to lost your changes" the
message that pops up when a user cancels changes to an existing row
should be "Are you sure you want to cancel your changes?" or something
along those lines. I went with that exact string.

11 years agoBug 4354: Manage the specific case "Unlimited" value
Jonathan Druart [Thu, 21 Mar 2013 14:43:01 +0000 (15:43 +0100)]
Bug 4354: Manage the specific case "Unlimited" value

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All good :)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 4354: Followup: FIX the hardduedate copy
Jonathan Druart [Thu, 21 Mar 2013 11:32:43 +0000 (12:32 +0100)]
Bug 4354: Followup: FIX the hardduedate copy

Before this patch, the copy was based on the string (could be
translated!). Now is base on the -1, 0, 1 values.
The trick is to backup the hardduedatecompare value for each line of the
table.

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 4354: Followup Add a Cancel button
Jonathan Druart [Mon, 18 Mar 2013 11:41:56 +0000 (12:41 +0100)]
Bug 4354: Followup Add a Cancel button

New cancel button on the edit row.
Add a prevent message when editing a new row.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 4354 - Followup - Add row highlighting
Kyle M Hall [Thu, 24 Jan 2013 14:21:34 +0000 (09:21 -0500)]
Bug 4354 - Followup - Add row highlighting

Test plan:
* Click on a row to edit
* Note that the row is highlighted in orange

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 4354: Cannot edit existing issuing rules
Jonathan Druart [Wed, 16 Jan 2013 15:51:13 +0000 (16:51 +0100)]
Bug 4354: Cannot edit existing issuing rules

This patch adds javascript which pulls the values from the
chosen row of data and populates the last row's form with
that data. Some changes have been made to the markup to
better accommodate this.

Possibly missing is some kind of visual feedback to the user
that the edit action is taking place in a different row from
where they clicked. Comments are especially welcomed on
this aspect of the interaction.

The original author of this patch is Owen Leonard <oleonard@myacpl.org>

Test Plan:
* Edit an existing circulation rule
* Delete a circulation rule
* Create a new circulation rule
* Create a new circulation rule that is a dup of an old one
and make sure that it still overwrites the old rule like before

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests passed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8089' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 23:15:34 +0000 (19:15 -0400)]
Merge branch 'bug_8089' into 3.12-master

11 years agoBug 8089: Cache sysprefs with Koha::Cache::Object
Jared Camins-Esakov [Sun, 20 Jan 2013 01:28:58 +0000 (20:28 -0500)]
Bug 8089: Cache sysprefs with Koha::Cache::Object

This patch replaces the %sysprefs hash variable with a
Koha::Cache::Object-tied hash that allows the user to cache sysprefs
in memcached, fastmmap, or memory.

To test:
1) Enable the cache as described on bug 9434.
2) Try viewing some pages in the OPAC and staff client. If the syspref
   caching isn't working, you'll be redirected to the web installer
   (in the staff client) or be shown the maintenance page (in the OPAC).
3) Disable the cache by unsetting the CACHING_SYSTEM environment
   variable.
4) Try viewing some pages in the OPAC and staff client. If the syspref
   caching isn't working, you'll be redirected to the web installer
   (in the staff client) or be shown the maintenance page (in the OPAC).

Note that this will not improve performance. It does, however, eliminate
the problem of sysprefs not getting updated in all threads in
multi-threaded environments.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8509' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:58:26 +0000 (18:58 -0400)]
Merge branch 'bug_8509' into 3.12-master

11 years agoBug 8509: allows the Expected status to be chosen back
Adrien Saurat [Thu, 20 Sep 2012 14:18:18 +0000 (16:18 +0200)]
Bug 8509: allows the Expected status to be chosen back

If a serial has been marked as received by mistake, it's now
possible to set it as an "Expected" serial again.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

I did varoius tests on a subscription switching between the
different status (expected, arrived, late) and couldn't find
a bad side effect of this patch.

Note: The date arrived/date expected is not automatically reset,
but you can enter the date manually in the template, so I think
this could be handled in a separate bug.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9117' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:54:37 +0000 (18:54 -0400)]
Merge branch 'bug_9117' into 3.12-master

11 years agoBug 9117: Add imageurl to the list of parameters of AddAuthorisedValue
Julian Maurice [Thu, 21 Mar 2013 14:47:37 +0000 (14:47 +0000)]
Bug 9117: Add imageurl to the list of parameters of AddAuthorisedValue

and add unit test in t/db_dependant/Koha.t

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9117 [Follow-up] Translatable string should be in double quotes
Julian Maurice [Mon, 18 Mar 2013 15:50:30 +0000 (15:50 +0000)]
Bug 9117 [Follow-up] Translatable string should be in double quotes

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
- Created several reports fresh and using the new duplicate feature.
- Verified authorized values were created correctly and can be
  viewed from Administration > authorized values.
- Checked tabs and limiting on subgroups works correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9117 [Follow-up] Fix group and subgroup filtering
Julian Maurice [Mon, 18 Mar 2013 15:40:02 +0000 (15:40 +0000)]
Bug 9117 [Follow-up] Fix group and subgroup filtering

When a group code is contained in another group code (e.g. 'COD' and
'CODE'), filtering on the longest ('CODE') include reports of the
smallest ('COD').
Same problem for the subgroups.
This patch fixes this.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9117 [Follow-up] Reports hierarchies management improvements
Julian Maurice [Thu, 22 Nov 2012 09:48:08 +0000 (10:48 +0100)]
Bug 9117 [Follow-up] Reports hierarchies management improvements

This patch avoid javascript bugs when user hasn't 'create_reports'
permission (last column is hidden in this case but <th> remains)
+ fix a typo 'selelcted' > 'selected'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9117 [Follow-up] Reports hierarchies management improvements
Owen Leonard [Wed, 21 Nov 2012 15:36:13 +0000 (10:36 -0500)]
Bug 9117 [Follow-up] Reports hierarchies management improvements

This patch corrects serveral markup errors in the template
introduced by this bug as well as previous patches: unescaped
ampersands, missing closing tags, typos.

To test, view various stages of the process of viewing or
creating guided reports and check the source for validity.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9117: Reports hierarchies management improvements
Julian Maurice [Thu, 2 Aug 2012 14:03:32 +0000 (16:03 +0200)]
Bug 9117: Reports hierarchies management improvements

- Filter by groups using tabs
- Filter by subgroups using a dropdown list under each tab
- Allow to create new group and subgroups when building a new report or
  editing an existing report (no need to go through admin AV interface)

+ Possibility to duplicate a report (new link in the table)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9880' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:39:47 +0000 (18:39 -0400)]
Merge branch 'bug_9880' into 3.12-master

11 years agoBug 9880 - Updated control file for new dependencies
Robin Sheat [Wed, 20 Mar 2013 22:37:48 +0000 (11:37 +1300)]
Bug 9880 - Updated control file for new dependencies

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7368' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:33:47 +0000 (18:33 -0400)]
Merge branch 'bug_7368' into 3.12-master

11 years agoBug 7368: POD doc in VirtualShelves.pm
Marcel de Rooy [Tue, 28 Feb 2012 14:33:33 +0000 (15:33 +0100)]
Bug 7368: POD doc in VirtualShelves.pm

Only moving/adding some documentation in VirtualShelves.pm.
Related to earlier changes in connection with report 7310.
Adding my own signoff, nothing to test here. Does Koha still work? :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9879' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 22:30:12 +0000 (18:30 -0400)]
Merge branch 'bug_9879' into 3.12-master

11 years agoBug 9879 - Use DataTables on suggestions management page
Owen Leonard [Wed, 20 Mar 2013 19:50:05 +0000 (15:50 -0400)]
Bug 9879 - Use DataTables on suggestions management page

Replace the tablesorter plugin with the DataTables plugin on the
suggestions management page. Table sorting has been coverted from using
multiple specific IDs to a more efficient class-based selector.

Unrelated change: Prevent page-jumping when checkbox links are clicked.

To test, open the suggestions management page (Acquisitions ->
Suggestions). Confirm that table sorting, paging, and searching works
correctly.

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9403' into 3.12-master
Jared Camins-Esakov [Thu, 21 Mar 2013 16:02:26 +0000 (12:02 -0400)]
Merge branch 'bug_9403' into 3.12-master

11 years agoBug 9403: Increment version number
Jared Camins-Esakov [Thu, 21 Mar 2013 16:02:15 +0000 (12:02 -0400)]
Bug 9403: Increment version number

Database update for bug 9403 has been given version 3.11.00.109