Jared Camins-Esakov [Sun, 2 Dec 2012 14:21:50 +0000 (09:21 -0500)]
Merge branch 'bug_8117' into 3.12-master
Owen Leonard [Tue, 27 Nov 2012 20:57:55 +0000 (15:57 -0500)]
Bug 8117 [Follow-up] Divide budget periods into two tabs
This patch corrects some capitalization errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String changes, all tests pass.
Jared Camins-Esakov [Sun, 2 Dec 2012 14:17:06 +0000 (09:17 -0500)]
Merge branch 'bug_9134' into 3.12-master
Jonathan Druart [Fri, 23 Nov 2012 13:38:03 +0000 (14:38 +0100)]
Bug 9134: There is no previous link on the second page of the search results page
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass.
Checked paging forwards, backwards, using 'Previous', 'Next'
and page numbers works correctly in staff and OPAC.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 2 Dec 2012 14:16:50 +0000 (09:16 -0500)]
Merge branch 'bug_9154' into 3.12-master
Owen Leonard [Tue, 27 Nov 2012 19:34:27 +0000 (14:34 -0500)]
Bug 9154 - On item edit page, highlight row of item being edited
This patch changes the item edit page to add a highlighting
background color to the row in the table of all items corresponding
to the item being edited. Changes to JavaScript have been made
to allow row color changes on hover.
Other minor edits: Capitalization corrections.
Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String changes, changes to JavaScript.
All tests pass.
Test plan:
1) 'Edit items' on a record with some items.
2) Check edited item is highlighted correctly in table above.
3) Add, edit, delete an item, should all work the same as before.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 2 Dec 2012 14:06:22 +0000 (09:06 -0500)]
Merge branch 'bug_9168' into 3.12-master
Fridolyn SOMERS [Thu, 29 Nov 2012 15:40:44 +0000 (16:40 +0100)]
Bug 9168: Software error when filtering in receipt summary (followup)
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.
To test:
- Use filters on the 'order receive' page
(don't confuse with invoices - filters are similar)
- Verify that without patch filters are not functional
- Verify that with patch applied filters work correctly
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Thu, 29 Nov 2012 15:40:12 +0000 (16:40 +0100)]
Bug 9168: Software error when filtering in receipt summary
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Colin Campbell [Fri, 6 Jul 2012 15:19:33 +0000 (16:19 +0100)]
Bug 8429: Remove unnecessary use of Exporter from SIP/ILS
All the modules in the SIP/ILS tree are objects
The addition of calls to Exporter or hand manipulation of
@ISA added unnecessary bloat
Removed the "self = shift or return" idiom as it is nonsensical
if the method can only be called via an object.
standardized inheritance via use parent
added a $self = shift in a couple of places where it
was not strictly necessary as its absence seemed to have
misled readers in the past
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 13:14:27 +0000 (08:14 -0500)]
Bug 8782: Increment version number
Database update for bug 8782 has been given version 3.11.00.004
Jonathan Druart [Tue, 18 Sep 2012 12:03:06 +0000 (14:03 +0200)]
Bug 8782: Close a subscription
If a subscription is no longer enough published (or we are not waiting
for a new periodical) we are allowed to close it.
If a subscription is closed, we are not able to receive or generate a
new serial.
On the serial module, we can now
- close a subscriptionn
- reopen a closed subscription
On serial search 2 tabs is displayed (opened and closed subscriptions).
This patch adds:
- a new field subscription.closed in DB
- a new status for serials (8 = stopped)
Test plan:
- search subscriptions
- close a subscription and check that you cannot receive or generate a
new serial
- launch another search and check that the closed serial is into the "closed"
tab.
- You are allowed to reopen a subscription on the subscription detail
page and on the subscription result page. A javascript alert ask you
if are certain to do this operation.
- Check the serial status "stopped" everywhere the status is
displayed (catalogue/detail.pl, serials/claims.pl,
serials/serial-issues-full.pl, serials/serials-collection.pl,
serials/serials-edit.pl, serials/serials-recieve.pl,
serials/subscription-detail.pl and opac-full-serial-issues.pl)
- The report statistics does not include the closed subscriptions if you
don't check the "Include expired subscriptions" checkbox.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Bug 8782: Followup: add some minor modifications
- Show 'closed' information in biblio detail page
- Add a column in serials report table
- Search subscriptions on title words instead of string
- Prevent serials editing when subscription is closed
- Don't change status of "disabled" serials
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Bug 8782 - Close a subscription - Followup - Fix updatedatabase.pl
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>
Jared Camins-Esakov [Fri, 30 Nov 2012 13:02:14 +0000 (08:02 -0500)]
Merge branch 'bug_7189' into 3.12-master
Jared Camins-Esakov [Fri, 30 Nov 2012 13:02:00 +0000 (08:02 -0500)]
Bug 7189: Increment version number
Database update for bug 7189 has been given version 3.11.00.003
Kyle M Hall [Tue, 24 Apr 2012 13:05:36 +0000 (09:05 -0400)]
Bug 7189 - preference to control if returning lost items gives refund
Right now when you return an item that was lost the patron's card is
credited with the lost fee, but not all libraries refund lost fees
and sometimes the fee is refunded after the patron has paid for it,
causing all kinds of financial issues.
Adds the syspref RefundLostItemFeeOnReturn to control whether
returning a lost item refunds the fee charged for losing that
item. Enabled by default to maintain Koha's current functionality.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 12:38:55 +0000 (07:38 -0500)]
Merge branch 'bug_6945' into 3.12-master
Owen Leonard [Wed, 22 Aug 2012 20:01:03 +0000 (16:01 -0400)]
Bug 6945 [FOLLOW-UP] Add a link to show a MARC preview in the normal view
Adding the same MARC preview link to the section of the template
which is displayed when XSLT is on.
This revision also adds a unique id to the surrounding element in the
normal and XSLT versions.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Maxime Pelletier [Thu, 29 Sep 2011 20:40:47 +0000 (16:40 -0400)]
Bug 6945: Add a link to show a MARC preview in the normal view of the detail
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 12:29:15 +0000 (07:29 -0500)]
Merge branch 'bug_8032' into 3.12-master
Marcel de Rooy [Mon, 5 Nov 2012 13:22:55 +0000 (14:22 +0100)]
Bug 8032: Sort lists by call number
Precaution: Joining the items table makes that the table is sorted on
the item call number of the first item (in case there are more items).
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 12:14:29 +0000 (07:14 -0500)]
Merge branch 'bug_8715' into 3.12-master
Jonathan Druart [Mon, 3 Sep 2012 09:44:21 +0000 (11:44 +0200)]
Bug 8715: Receive all serials for a year.
This patch adds
- 2 links in the table header (select all and clear all).
- Datatable on these tables
Test plan:
Try to select all serials for a year and receive them.
Test there is no regression (ergonomic) on this page
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Bug 8715 [Follow-up] Receiving all serials for a year
Follow-up: For consistency, I would prefer to have the
column of checkboxes at the beginning of the table and the
select/clear links above.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Bug 8715: Force the default sort order to desc
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 12:09:47 +0000 (07:09 -0500)]
Merge branch 'bug_8946' into 3.12-master
Mathieu Saby [Thu, 18 Oct 2012 21:21:25 +0000 (23:21 +0200)]
Bug 8946: corrections in inc files for UNIMARC coded fields advanced search
In subtypes_unimarc.inc files for opac and staff interface, this patch
- fix 1 wrong code (Frequency-code:i = Other should be z)
- fix the label "Feschrift Ind." to "Literary genre"
- add some values for Material-type index (s, t), Literature-Code (i), ctype (v, w), Type-Of-Serial (e,f,g)
- fix a few typos
- change the order of some values (u values)
To test, check if the new values are visible in the opac and staff interface.
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>
Owen Leonard [Tue, 20 Nov 2012 18:53:43 +0000 (13:53 -0500)]
Bug 6602 - Reports dictionary doesn't properly recognize text columns
Reports dictionary won't let you set a comparison for MEDIUMTEXT columns. To
test, choose a MEDIUMTEXT column like borrowers.surname in Step 3 of adding
a new dictionary definition. Before the patch, in Step 4 you would not see
any kind of form field for entering a comparison. After patching Step 4 will
offer you a field labeled "Search string matches."
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.
Test plan:
1) Reports > Reports dictionary > New definition
2) Step 1: Some name
3) Step 2: Patrons
4) Step 3: First name (mediumtext)
5) Step 4: Verify 'Search string matches' is offered.
For both, surname (mediumtext) and first name (text) the program should offer you
"Search string matches" on step 4.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 03:18:06 +0000 (22:18 -0500)]
Merge branch 'bug_7687' into 3.12-master
Owen Leonard [Tue, 30 Oct 2012 18:10:53 +0000 (14:10 -0400)]
Bug 7687 - Remove problematic CSS gradient declarations targeting Internet Explorer
Removing and revising some CSS which causes problems in
Internet Explorer:
- User sidebar menu tabs in the OPAC
- Sidebar menu tabs in the staff client (circ, catalog, etc)
- List edit/delete buttons in the OPAC (when viewing the
list of lists and viewing a list itself).
Also fixed is the sprite positioning for the "new list"
link which showed the wrong icon.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I tested this in Firefox, and Chromium and it didn't break anything,
I trust it works for IE too.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 03:07:49 +0000 (22:07 -0500)]
Merge branch 'bug_8981' into 3.12-master
Paul Poulain [Thu, 29 Nov 2012 16:38:09 +0000 (17:38 +0100)]
Bug 8981 follow-up: case
While QAing your patch, I saw you were writting "MarcFlavour", it should have been "marcflavour"
Will work with the UC, but let's be consistent.
This patch fixes another MarcFlavour just a few lines before I spotted by chance
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
David Cook [Mon, 29 Oct 2012 22:06:45 +0000 (09:06 +1100)]
Bug 8981 - Remove Nonpublic General Note from OPAC authorities display
Currently, the MARC21 667 Nonpublic General Note field is appearing on the opac-authoritiesdetail.pl page.
Since it is a nonpublic note, it makes sense to remove it from this view.
This patch adds in an extra condition that checks authority records for MARC21 667 fields before displaying them in this opac screen.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Does what it says, with no side effects
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 30 Nov 2012 03:03:55 +0000 (22:03 -0500)]
Merge branch 'bug_5801' into 3.12-master
Kyle M Hall [Mon, 1 Oct 2012 19:16:29 +0000 (15:16 -0400)]
Bug 5801 - C4::Circulation::_GetCircControlBranch wrongly used in opac-reserve.pl
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and perlcritic pass.
Tests done:
holds policy vs. circulation rules seemed to make the difference for me,
I am not totally sure why that is, but see no reason to fail this patch as
results are ok.
System preferences
- CircControlBranch = the library the item is from
- ReservesControlBranch = patron's home library
Circulation rules
- Library A - Holds policy: Books can not be put on hold.
- Library B - Holds policy: Books can be put on hold. (no special setting needed)
Catalog data
- A record with an item for library B, itemtype Books.
Test without patch:
1) Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is NOT allowed.
Before patch: hold IS allowed.
After patch: hold is NOT allowed.
OK
2) ReserveControlbranch = item's home library
Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is allowed.
Before patch: hold is allowed.
After patch: hold is allowed.
OK
3) ReservesControlBranch = patron's home library
Circulation rules: Remove hold policy for library B.
Library A: no holds allowed for books using 'Holds allowed (count)' = 0
Library B: 5 holds allowed for books using 'Holds allowed (count)' = 5
Patron A (home library A) places a hold in OPAC on an item from library B.
Should be: hold is NOT allowed
Before patch: hold is NOT allowed
After patch: hold is NOT allowed
OK
4) ReserveControlbranch = item's home library
Should be: hold is allowed
Before patch: hold is allowed
After patch: hold is allowed
OK
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 29 Nov 2012 00:10:45 +0000 (19:10 -0500)]
Merge branch 'bug_7731' into 3.12-master
Owen Leonard [Mon, 26 Nov 2012 19:34:38 +0000 (14:34 -0500)]
Bug 7731 [Follow-up] Library should be used instead of branch and site
This patch corrects new and old instances of the use of the
term "branch" and replaces them with "library."
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, changes look good.
Also inlcudes some bookseller > vendor changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 29 Nov 2012 00:08:39 +0000 (19:08 -0500)]
Merge branch 'bug_8164' into 3.12-master
Jonathan Druart [Thu, 23 Aug 2012 14:36:24 +0000 (16:36 +0200)]
Bug 8164: Replace IFNULL with COALESCE
mysql> SELECT IFNULL(0, 123);
+----------------+
| IFNULL(0, 123) |
+----------------+
| 0 |
+----------------+
1 row in set (0.00 sec)
mysql> SELECT IFNULL(1, 123);
+----------------+
| IFNULL(1, 123) |
+----------------+
| 1 |
+----------------+
1 row in set (0.00 sec)
mysql> SELECT IFNULL(NULL, 123);
+-------------------+
| IFNULL(NULL, 123) |
+-------------------+
| 123 |
+-------------------+
1 row in set (0.00 sec)
mysql> SELECT COALESCE(0, 123);
+------------------+
| COALESCE(0, 123) |
+------------------+
| 0 |
+------------------+
1 row in set (0.00 sec)
mysql> SELECT COALESCE(1, 123);
+------------------+
| COALESCE(1, 123) |
+------------------+
| 1 |
+------------------+
1 row in set (0.00 sec)
mysql> SELECT COALESCE(NULL, 123);
+---------------------+
| COALESCE(NULL, 123) |
+---------------------+
| 123 |
+---------------------+
1 row in set (0.00 sec)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Fri, 26 Oct 2012 13:14:15 +0000 (09:14 -0400)]
Bug 8710 - Don't show the images tab in the OPAC if the record has no local images
For unknown reasons, having ListImagesForBiblio return undef
when there are no images still results in a variable being passed
to the template which evaluates as true, with a size of 1.
This patch alters ListImagesForBiblio to remove the "return undef"
condition, allowing the template to evaluate images as false
and show no tab.
To test, turn on local cover images and view records in the OPAC
which do and do not have cover images attached. Images should
display as expected when present, and no images tab should appear
on records which have none.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 28 Nov 2012 23:46:18 +0000 (18:46 -0500)]
Merge branch 'bug_9030' into 3.12-master
Jared Camins-Esakov [Wed, 28 Nov 2012 23:44:13 +0000 (18:44 -0500)]
Bug 9030: Increment version number
Database update for bug 9030 has been given version 3.11.00.002
Jonathan Druart [Thu, 8 Nov 2012 12:54:47 +0000 (13:54 +0100)]
Bug 9030: Add constraint on aqorders_items.ordernumber
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 28 Nov 2012 23:35:01 +0000 (18:35 -0500)]
Merge branch 'bug_8557' into 3.12-master
Christophe Croullebois [Thu, 20 Sep 2012 14:06:29 +0000 (16:06 +0200)]
Bug 8557: Prevents form validation by pressing "Enter"
this patch prevents a scan machine to send 'enter' to the form when it is not expected.
The patch is on orderreceive.tt and serials-edit.tt.
Written by Alex Arnaud. MT6626.
Signed-off-by: Marc Veron <veron@veron.ch>
Tested with receiving orders and receiving serials. Could reporduce problem befor applying the patch. After applying the patch both forms behaved as expected.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked order receive and serials edit page, barcode + enter does
no longer submit the form.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 28 Nov 2012 22:09:43 +0000 (17:09 -0500)]
Merge branch 'bug_8559' into 3.12-master
Kyle M Hall [Thu, 4 Oct 2012 11:11:50 +0000 (07:11 -0400)]
Bug 8559 - conflicting item statuses - QA Followup
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Mon, 17 Sep 2012 13:06:38 +0000 (09:06 -0400)]
Bug 8559 - conflicting item statuses - Force cancel or revert
If a librarian checks out a waiting hold to a different patron
it gives the item conflicting statuses. The item will show as both
checked out to the different patron, and waiting for the original
patron.
This patch fixes this by not allowing this situation to occurr. If
a librarian attempts to issue an item that is waiting for a different
patron, the system will force the librarian to choose to
a) not issue the item
b) issue the item, and cancel the waiting hold
c) issue the item, and revert the waiting hold
In this scenario, reverting the waiting hold means to push it back
on the reserves queue as a hold with a priority of 1, which will push
the priorities of any existing holds back by 1 as well. It will become
an item level hold for the given item, as we cannot know if the hold
was item-level or bib-level given the data we have about the hold.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
All three cases tested, correct outcome each time
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Mon, 26 Nov 2012 15:49:22 +0000 (10:49 -0500)]
Bug 9137 - Focus when editing/adding new itemtypes/authorised values
This patch adds the "focus" class to the relevant inputs so
that the global staff client JS will move the focus to those fields.
Logic in the authorised_values template puts the focus on the
correct field whether you're adding a new category, a new value,
or performing an edit.
To test, try the following operations:
- add an itemtype
- edit an itemtype
- add an authorised value category
- add an authorised value value
- edit an authorised value value
In all cases the focus should automatically be in the first
form field.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 28 Nov 2012 20:42:43 +0000 (15:42 -0500)]
Merge branch 'bug_9106' into 3.12-master
Jared Camins-Esakov [Wed, 28 Nov 2012 13:31:25 +0000 (08:31 -0500)]
Merge branch 'bug_6680' into 3.12-master
Nicole C. Engard [Wed, 7 Sep 2011 15:48:01 +0000 (11:48 -0400)]
Follow up to Bug 6680: tiny up download lists formats
Explains what uses RIS, and replaces iso2709 with 'MARC'.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simply change, all tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Robin Sheat [Wed, 7 Sep 2011 06:54:42 +0000 (18:54 +1200)]
Bug 6680 - simple tidy-up of cart download format descriptions
Explains what uses RIS, and replaces iso2709 with 'MARC'.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple change, all tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Lyon3 Team [Mon, 19 Nov 2012 10:39:12 +0000 (11:39 +0100)]
Bug 9098 Replace tabulations by spaces in opac-user.pl
There was a bunch of tabulations from line 157 and followings
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The following command show us there is no change:
git show HEAD --ignore-all-space
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 28 Nov 2012 13:24:54 +0000 (08:24 -0500)]
Merge branch 'bug_7143' into 3.12-master
Katrin Fischer [Wed, 28 Nov 2012 07:23:17 +0000 (08:23 +0100)]
Bug 7143: Small fix for About page
Adding missing version numbers:
Frédéric Demians (3.4, 3.6, 3.8, and 3.10 Translation Manager)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Mon, 26 Nov 2012 09:21:45 +0000 (10:21 +0100)]
Bug 7143 About changes for 3.12
Proposing a new section for current release team.
Signed-off-by: Marc Veron <veron@veron.ch>
Section appears on about page as expected.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Looks ok to me, passes tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 28 Nov 2012 13:17:58 +0000 (08:17 -0500)]
Merge branch 'bug_2832' into 3.12-master
Jonathan Druart [Wed, 24 Oct 2012 14:19:24 +0000 (16:19 +0200)]
Bug 2832: [SIGNED-OFF] Followup: Add a default value
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Makes sense, and works as advertised.
Fridolyn SOMERS [Fri, 23 Nov 2012 11:14:03 +0000 (12:14 +0100)]
Bug 9132: Paging through OPAC authority search results does not work (followup 1) input with and_ora instread of and_or
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Fri, 23 Nov 2012 11:13:44 +0000 (12:13 +0100)]
Bug 9132: Paging through OPAC authority search results does not work
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes paging in authority result list in OPAC.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Mon, 26 Nov 2012 13:39:51 +0000 (10:39 -0300)]
Bug 9142 - Remove the use of subtests
Debian stable's version of Test::More is older than the one I used on my
12.04 dev box, and doesn't support subtests, which I used to avoid side
effects between different test scenarios.
This patch removes that subtest definition.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 25 Nov 2012 23:41:55 +0000 (18:41 -0500)]
Merge branch 'bug_9025' into 3.12-master
Sophie Meynieux [Wed, 7 Nov 2012 17:48:43 +0000 (18:48 +0100)]
Bug 9025: Adding new icons for itemtypes from Sudoc
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked that new images show up when managing itemtypes and
authorised values and can be selected and used.
Checked about page for license information.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 25 Nov 2012 23:36:09 +0000 (18:36 -0500)]
Merge branch 'bug_9020' into 3.12-master
Paul Poulain [Tue, 20 Nov 2012 16:02:36 +0000 (17:02 +0100)]
Bug 9020: follow-up fixes french translation for permissions
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass.
Installed Koha with all French sample data and checked that
all permissions were translated and diacritics were displayed
correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 25 Nov 2012 23:34:00 +0000 (18:34 -0500)]
Merge branch 'bug_9059' into 3.12-master
Marcel de Rooy [Wed, 14 Nov 2012 13:02:54 +0000 (14:02 +0100)]
Bug 9059: Followup
Removes last occurrence of dependent= parameter. See also report 7368.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests.
Tested successfully in Chromium and Firefox in Ubuntu.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Mon, 12 Nov 2012 11:20:20 +0000 (12:20 +0100)]
Bug 9059: Increase size of opac-sendbasket window
Change window settings for opac-sendbasket. If you need to login
first, the window should be much larger.
Typo dependant should be dependent. Note that this setting is
ignored in much browsers. Will submit another patch to cover more occurrences.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Fri, 2 Nov 2012 16:40:08 +0000 (12:40 -0400)]
Bug 8515 - OPAC password change does not obey OpacPasswordChange
The OPAC change password template enforces the OpacPasswordChange
preference by preventing the form from appearing. However, the
script doesn't contain any check for OpacPasswordChange so it is
vulnerable to someone submitting data to it by some other means.
This patch adds a check for OpacPasswordChange to the script and
revises the template logic in order to show the right warning
in all circumstances.
To test, turn off OpacPasswordChange and navigate manually to
opac-passwd.pl. You should see a warning that you can't change
your password.
Turn on OpacPasswordChange load the change password page and
save the page to your desktop. Turn off OpacPasswordChange and
submit a password change via the saved page. Without the patch
this would result in a password change. After the patch it
should not.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug and made sure patch fixes it.
Passes all tests and perlcritic.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 25 Nov 2012 23:20:32 +0000 (18:20 -0500)]
Merge branch 'bug_7358' into 3.12-master
Jonathan Druart [Wed, 22 Aug 2012 11:37:31 +0000 (13:37 +0200)]
Bug 7358: reaffect a closed basket to a closed basketgroup
The list of basketgroups when looking at a closed basket show all the
basketgroups.
It should not be possible to affect a basket to a closed basketgroup,
since this basketgroup should have been sent to a supplier.
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>
Jared Camins-Esakov [Sun, 25 Nov 2012 23:09:14 +0000 (18:09 -0500)]
Merge branch 'bug_9073' into 3.12-master
Owen Leonard [Tue, 20 Nov 2012 17:27:25 +0000 (12:27 -0500)]
Bug 9073 - Download option from the cart should match the menu button in lists
This patch moves the staff client Cart download choices into a toolbar
menu button instead of requiring that the user make the choice via a form
in the pop-up window.
To test, add items to Cart in the staff client. Open the cart and
choose a download option from the Download menu. Your download
should complete correctly without the page changing or reloading.
Unrelated edit: Eliminating duplicate document.ready() block by
consolidating a couple of lines of JavaScript.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked all export formats can be selected and downloaded, including
CSV profiles.
All tests and perlcritic pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 20 Nov 2012 14:49:19 +0000 (09:49 -0500)]
Bug 9115 - basket window should close automatically when placing a hold
If you choose to place a hold from the Cart pop-up, the entire
holds process (possibly including login) takes place in the cart
window. Upon completion of the operation you're left with a second
window which has lost its context as the Cart.
This patch revises the hold process so that when you click the
hold link in the cart the operation is moved to the main window
and the Cart window closes.
Since the holdSel() function doesn't require interaction with
template variables I have moved it to basket.js along with the
described changes.
To test, put items in your Cart and open it. Select items to
place on hold and click the "Place hold" link. The cart
should close, and the items you selected should appear on the
place hold screen in the main window.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked in Firefox and Chromium in Ubuntu, works nicely.
All tests pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 21:39:37 +0000 (16:39 -0500)]
Merge branch 'bug_8660' into 3.12-master
Fridolyn SOMERS [Thu, 18 Oct 2012 10:23:32 +0000 (12:23 +0200)]
Bug 8660: follow-up: Porting changes to ccsr theme
Signed-off-by: Mason James <mtj@kohaaloha.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Wed, 22 Aug 2012 14:10:06 +0000 (16:10 +0200)]
Bug 8660: Tag status does not show on multiple tag add
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 18:35:24 +0000 (13:35 -0500)]
Merge branch 'bug_8986' into 3.12-master
Jonathan Druart [Mon, 19 Nov 2012 16:11:21 +0000 (17:11 +0100)]
Bug 8986: Followup FIX a JS error if there is no valid card number
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I can't reproduce the JS error but the template changes are correct
with regard to how the page should handle errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 30 Oct 2012 13:51:31 +0000 (09:51 -0400)]
Bug 8986: Batch patron modification template corrections
Many minor template changes:
- Correcting title and headings
- Adding translation to string in JavaScript
- Tweaking table sorter
- Wrapping card number in link to patron detail page
- Adding standard styles to "clear" links (see patron attributes)
- Terminiology corrections (borrower-> patron, cardnumber -> card number)
- Capitalization corrections
- Improve display of extended attributes
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 18:30:32 +0000 (13:30 -0500)]
Merge branch 'bug_8899' into 3.12-master
Owen Leonard [Fri, 12 Oct 2012 14:26:52 +0000 (10:26 -0400)]
Bug 8899 [Revised] Remove unused CSS declarations from staff client CSS
Using an add-on for Firefox called CSS Usage I found some
instances of CSS in staff-global.css which are unused. Unused
selectors were confirmed by a search of the code.
Testers can't exactly check the whole staff client for things
which look off, but can confirm by their own search that
the removed CSS has no corresponding markup.
Revision adds back lines which were discoverd by QA to be in use.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 30 Oct 2012 14:53:39 +0000 (10:53 -0400)]
Bug 5521 - item edit form appears if no items found
This patch changes the template so that if no items are
found the page doesn't show "The following barcodes were found"
and doesn't show the item edit form.
To test, submit a batch which contains no valid barcodes.
Compare to a batch which contains some or all valid barcodes.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests succeed.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 18:02:31 +0000 (13:02 -0500)]
Merge branch 'bug_8546' into 3.12-master
Owen Leonard [Fri, 2 Nov 2012 18:48:25 +0000 (14:48 -0400)]
Bug 8546 - Error in description of OPAC Advanced Search Publication date range search
The publication date range search description in the OPAC suggests
that a search like "-1987" or "2008-" is not inclusive when it
actually is. This patch corrects the description.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Tue, 30 Oct 2012 10:20:05 +0000 (11:20 +0100)]
Bug 8983: Typo in UNIMARCslim2OPACResults.xsl
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 29 May 2012 19:07:32 +0000 (15:07 -0400)]
Bug 8163: Click to populate XSLT preferences with "default" or empty values
This patch adds markup and JavaScript to the system preferences
interface so that the user can click "default" or "empty" to populate
an XSLT-related pref with those vaules.
To test, open system preferences for the OPAC or staff client. In
the description for an XSLT-related preference click the "default"
link to populate the field with "default." Click the "leave empty"
link to empty the field.
Revised according to Julian Maurice's suggestion for a more
generic, flexible way to implement it.
Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 17:12:59 +0000 (12:12 -0500)]
Merge branch 'bug_8664' into 3.12-master
Owen Leonard [Wed, 22 Aug 2012 12:48:38 +0000 (08:48 -0400)]
Bug 8664 - Add floating toolbar with save button to system preferences editor
This patch adds a copy of the "save" button in a toolbar at
the top of the system preferences editor. The toolbar becomes
fixed at the top of the page when you scroll down, exactly like
the toolbar on addbiblio.pl.
Because multiple save buttons might appear when the system prefs
page displays search results, the toolbar does not appear in
this case.
To test, open the system preferences editor and change a setting.
Try saving both with the button in the toolbar and the button at
the top of the page. Test scrolling to confirm that the toolbar
"sticks" to the top of the page when you scroll down.
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 16:44:55 +0000 (11:44 -0500)]
Merge branch 'bug_8758' into 3.12-master
Jared Camins-Esakov [Fri, 23 Nov 2012 16:44:26 +0000 (11:44 -0500)]
Merge branch 'bug_2832' into 3.12-master
Conflicts:
kohaversion.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 16:42:34 +0000 (11:42 -0500)]
Update kohaversion for 3.11.000.001
Jared Camins-Esakov [Fri, 23 Nov 2012 16:41:48 +0000 (11:41 -0500)]
Merge branch 'bug_2832' into 3.12-master
Conflicts:
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
installer/data/mysql/updatedatabase.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Fri, 23 Nov 2012 16:40:46 +0000 (11:40 -0500)]
Merge branch 'bug_9008' into 3.12-master
Jared Camins-Esakov [Fri, 23 Nov 2012 16:38:29 +0000 (11:38 -0500)]
Update history to reflect 3.10.0 and 3.8.7 releases
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Paul Poulain [Fri, 23 Nov 2012 15:27:57 +0000 (16:27 +0100)]
Adding 3.10 release notes
Paul Poulain [Mon, 19 Nov 2012 16:16:33 +0000 (17:16 +0100)]
Bumping version to 3.10.0 and adding sponsors that are were not already written
Sponsored-by: Central Kansas Library System (CKLS), Plum Creek Library System and Washoe County Library System
Sponsored-by: Los Gatos Public Library and Harrison Carmel Public Library
Sponsored-by: Talking Tech
Sponsored-by: VOKAL
Sponsored-by: Brooklyn Law School Library
Sponsored-by: North Central Regional Library (NCRL)
Sponsored-by: Washoe County Library System
Sponsored-by: Corpus Christi Public Libraries
Sponsored-by: Northeast Kansas Library System (NEKLS)
Sponsored-by: Université d'Aix-Marseille
Sponsored-by: Université de Rennes 2
Sponsored-by: Université de Lyon 3
Sponsored-by: Université de St Etienne
Sponsored-by: BdP de la Meuse
Paul Poulain [Fri, 23 Nov 2012 13:32:42 +0000 (14:32 +0100)]
Bug 9122: fix the problem when writing-off a fine
The problem was introduced by the addition of accountlines_id in bug 7671
The WriteOffFee sub was called with accountlines_id as second parameter
but still dealing with the accountno column.
As a result, the UPDATE was failing (updating nothing), and the fine
note written off even if the writeoff itself was saved. In other words:
the writeoff was not "attached" to the fine.
This patch fixes the problem.
Test plan: do what katrin says in initial description of the problem:
- add some fines manually, I did 'new card' and sundry
- try writing off all of them or one of them
- the fine is correctly written off
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Mon, 19 Nov 2012 16:00:15 +0000 (11:00 -0500)]
Bug 9106 - Filtering list of uncertain price list by owner empties order information
The form which filters the list of orders with uncertain prices
includes a parameter which tells the script to modify the orders,
resulting in order information being lost. This patch removes
the unnecessary form field.
To test you must have orders with uncertain prices, preferably from
more than one user. Go to the uncertain prices page. Before applying
this patch, submitting the "orders from" form would cause the page
to refresh with no results. This is because the script cleared the
orders of price, quantity, etc. information.
After applying this patch the uncertain prices list should refresh
and show the correct results, either your orders ("me") or all
("Everyone").
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Wed, 21 Nov 2012 15:54:46 +0000 (12:54 -0300)]
Bug 9078 - fixing exceptions broke tests
Fixing the holiday exceptions arised a problem with how the test data was constructed.
This made several tests fail.
This patch fixes the add_holiday function. Tests should pass now.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Wed, 21 Nov 2012 13:43:11 +0000 (10:43 -0300)]
Bug 9078 - is_holiday should honour holiday exceptions
Make is_holiday return 0 for holiday exceptions.
Note: This patch makes several current ok tests fail. My first guess is test data is not
constructed ok. More on this later.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Thu, 22 Nov 2012 14:20:07 +0000 (09:20 -0500)]
Merge branch 'bug_8800' into 3.12-master