Commit graph

18637 commits

Author SHA1 Message Date
Chris Cormack
a10aeb1b0d Bug 9591 : Set Library changes after viewing Holds Queue >> reserves item
To test
1. Log in to the staff client. Note your logged in library.
2. Navigate to Circulation -> Holds queue.
3. Select a holds queue report for a library other than your own.
4. From the holds queue report page, click the "Check out" tab and
   enter the card number of a patron who has holds.
5. On the circulation page for that patron, click the "Holds" tab.
6. Click one of the titles in the list of holds.

Your logged in branch will now match the library you chose for the
holds queue report.

Alternate sequence:

4. From the holds queue report page, click the "Check out" tab and
   do a non-exact search (search which will return more than one result)
   for a patron who has holds.
5. Choose the correct patron from the list of results.

Your logged in branch will now match the library you chose for
the holds queue report.

Apply the patch and repeat, this time it should not change your logged
in branch

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Weird bug, the patch works for me.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch. All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-15 08:36:07 -04:00
Jared Camins-Esakov
8993c94457 Merge branch 'bug_9933' into 3.12-master 2013-04-15 08:31:44 -04:00
Chris Cormack
f005b51579 Bug 9933: Unable to edit or add rules for any branch except default
To test
1/ Select a branch in circ rules
2/ Edit or add a rule, note this change is made for default instead of
the library you selected
3/ Apply the patch
4/ Try 1 and 2 again

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-15 08:31:41 -04:00
f1af1db21d Bug 8770 - amount does not equal amountoutstanding on a fine with no payments or credits
If a lost item fee is owed and partially paid off when an item is
returned and a refund is processed, Koha tries to pay off existing
fees before adding any leftover balance as a credit on the account.

However, those fee payments aren't actually processed, due to a bug
where the accountnumber was quoted as a string literal, and thus the
for the fee payment would fail. This did not result in an DB error,
as the query was still valid SQL. Checking the return value of the
query would have revealed that the accountline had not been updated.

History:
This bug was introduced on April 23, 2007 with the commit
'reintroducing fixaccountforlostandreturned as requested by rosalie'.
Commit id 111d590e9c

On July 30, 2009 the error was flagged with a FIXME and remained
in that state until now.
Commit id 51e8fc2cb6

Test plan:
1) Create a test patron
2) Check out an item to that patron and give it a due date in the past
3) Run fines.pl to generate the fine for the item
4) Mark the item long overdue on the item tab (not in edit items)
5) Pay for the lost item
6) Check the item back in
7) Note the incorrect fines. Only the lost fee balance  due is refunded,
   not the entire lost fee, but no other fees are paid off.
8) Apply the patch
9) Repeat steps 1-6, then not the fines are paid correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Totel due is correct after applying the patch.
All tests and QA script pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-04-08 08:00:30 -04:00
Jared Camins-Esakov
88f2dd765f Merge branch 'bug_9381' into 3.12-master 2013-04-07 13:49:09 -04:00
Jared Camins-Esakov
d890977603 Bug 9381: Increment version number
Database update for bug 9381 has been given version 3.11.00.202
2013-04-07 13:48:46 -04:00
Bernardo Gonzalez Kriegel
e2651e15d5 Followup 2 - Bug 9381 - Add Catalan language
Sorry, this followup fulfills K. Fischer request to
base de-DE file in english one.

The differences are small corrections and added languages.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Rebased to master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:48:44 -04:00
Bernardo Gonzalez Kriegel
ce1ca0a1dc Followup Bug 9381 - Add Catalan language
This followup adds Catalan language into languages
other than english.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Rebased to master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:48:44 -04:00
Bernardo Gonzalez Kriegel
ae4881a5b6 Bug 9381: Add Catalan language
Simply add catalan language.

No translation yet, so can't be really tested.
But it will come soon.

Until then, to test:
1) cp misc/translator/po/es-ES* to ca-ES*
2) do perl translate install ca-ES,
3) apply the patch
4) run updatedatabase.pl
5) enable language and display on system preferences.
6) check labels

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Rebased to current master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:48:44 -04:00
Jared Camins-Esakov
761c6213f4 Merge branch 'bug_9812' into 3.12-master 2013-04-07 13:44:37 -04:00
83cf63f7a8 Bug 9812 - Forbid access to several files through the browser
This patch hides (-Indexes) and forbids (Deny from all) access to some stuff through a browser.
Specifically "xlst", "modules" and "includes" dirs and its contents.

This is just a quick fix we talked about at IRC. The proper solution would be to remove this from htdocs which will still be needed.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
I do not have an installation that uses Apache at this point, but the
changes look correct and this was signed off and QAed by Chris and
Jonathan, both of whom have Apache installations.
2013-04-07 13:43:05 -04:00
Jared Camins-Esakov
c007557f24 Merge branch 'bug_8200' into 3.12-master 2013-04-07 13:38:10 -04:00
Katrin Fischer
0454377380 Bug 8200: Follow up - Removing unused file stats.pl
Patch removes misc/translator/stats.pl that is no
longer used and references deleted script
update.pl in same directory.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:38:06 -04:00
3e72ec4acc Bug 8200 - removing misc/translator/update.pl - deprecated file
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch removes unused file.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:38:06 -04:00
Jared Camins-Esakov
f063dad5f2 Merge branch 'bug_7853' into 3.12-master 2013-04-07 13:34:15 -04:00
11caedbf19 Bug 7853 - opac-maintanance.pl should correctly redirect back to opac-main.pl, if no updates are outstanding
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Works exactly as it should according to the test plan. This is a nice
improvement.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Check OpacMaintenance!

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:34:12 -04:00
Jared Camins-Esakov
88eaa19bf0 Merge branch 'bug_9459' into 3.12-master 2013-04-07 13:30:57 -04:00
ec8758aab5 Bug 9459 [Revised] Use DataTables on hold ratios report page
Replace the tablesorter plugin with the DataTables plugin on the
hold ratios report page.

To test, open the hold ratios report (Circulation -> Hold ratios).
Confirm that table sorting works correctly.

Revision adds correct pagination options and natural sort for 'items
needed' column.

Patch now depends on Bug 9431
(http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9431) which
introduces the natural sort plugin.

Further revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: On top of Bug 9431. Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:30:54 -04:00
Jared Camins-Esakov
dae5b8d1a4 Merge branch 'bug_9850' into 3.12-master 2013-04-07 13:28:19 -04:00
Nicole C. Engard
f6b936d50c Bug 9850: FOLLOW UP: Add Missing Plugin Help for 3.12
This patch is a follow up to the one that adds the plugin help.

To test:

Visit the upload a plugin page and review the help and links.

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>
Fixed capitalization issues.
2013-04-07 13:28:05 -04:00
Nicole C. Engard
40a24e1eed Bug 9850: Update Tools Help for 3.12
Update the text and links in the Tools help files.

To test:

Check the text and links on all help files under Tools.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I fixed one instance of a link to 3.10 instead of 3.12.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:27:29 -04:00
Nicole C. Engard
ddbeb04faa Bug 9850: Add Plugin Help File for 3.12
This adds a help file to the new plugins module.

To test:

Activate the plugin module and check the text and links in the help file

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>
2013-04-07 13:27:29 -04:00
Nicole C. Engard
a6afd8d1e4 Bug 9850: Update Circ Help Files for 3.12
This updates the text and links for the Circulation Help Files.  It also removes
an unused help file 'billing.tt'.

To test:

Visit the help files on all circ pages and confirm links and text are right.

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>
2013-04-07 13:27:29 -04:00
Nicole C. Engard
48242d4a03 Bug 9850: Offline Circ Help Files for 3.12
This updates the text and links in the offline circulation tool help files.

To test:

Visit all offline circulation pages in the staff client and review the text and links.

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>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
4aadbdbc6d Bug 9850: Suggestion Help File for 3.12
This updates the text and link on the suggestions help file.

To test:

Visit the manage suggestions page and review the help file.

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>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
4409a1a6a2 Bug 9850: Serial Help Files for 3.12
Update text and links for Serials help files.

To test:

Visit all serial related pages and check the text of the help and
test the links.

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>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
f820f3f323 Bug 9850: Update Reports Help for 3.12
This updates the reports help for Koha 3.12.

To test:

Visit all reports pages and review the help for textual changes
and correct links.

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>
2013-04-07 13:27:28 -04:00
Nicole C. Engard
bdd27cdfe2 Bug 9850: Cataloging Help for 3.12
This updates just the links in the cataloging help, no text changes where made.

To test:

Visit help in cataloging and click the manual links and make sure they're right.

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>
2013-04-07 13:27:28 -04:00
Jared Camins-Esakov
38d48ad7c3 Merge branch 'bug_9902' into 3.12-master 2013-04-07 13:20:40 -04:00
9f2189d0c5 Bug 9902 - item subfields not populating
Test Plan:
1) Create a new serial with a default location, call number, and library
   ( the library will need to be any but the one you are logged in as )
2) Click the "Recieve" button for this serial
3) Click "Click to add item"
4) Note those values are not populated
5) Apply the patch
6) Reload the page
7) Click "Click to add item"
8) Note those values are now populated

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

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

This seems to restore the former behaviour.

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>
2013-04-07 13:20:07 -04:00
Jared Camins-Esakov
b38a3126e1 Merge branch 'bug_7449' into 3.12-master 2013-04-07 13:08:31 -04:00
Fridolyn SOMERS
8297a2d424 Bug 7449: billingplace and freedeliveryplace not saved when creating a new basketgroup
billingplace and freedeliveryplace are missing in C4::Acquisition::NewBasketgroup.

Test plan :
- Go to a vendor basket groups
- Create a new basket group
- Enter a name
- Choose a billing place
- Do not choose a delivery place in combobox but enter a text in delivery place textarea
- Enter a comment
- Save
- Edit created basket group
=> Check that billing place and free delivery place are ok

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works according to test plan, delivery place is now
correctly saved into the databas and was before lost.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:08:28 -04:00
Jared Camins-Esakov
c490421407 Merge branch 'bug_8061' into 3.12-master 2013-04-07 12:52:23 -04:00
Karam Qubsi
7f48829c50 Bug 8061: Follow Up (Opac-Prog) - enhancement to D Ruth's patch
In this Patch I added some changes to the rtl.css file
I made some changes in the file opac-bottom.inc and add css
classes to the lang list and I define the class value in
the opac.css
I add If statment to the opac-detail.tt to chose the rtl.css
when rtl lang.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Reformatted commit message and added bug number.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with po files for Arabic from 3.8.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
Karam Qubsi
6fd6c024a4 Bug 8061: Follow up - RTL CSS overrides (staff client)
I think this patch is good for th rtl langs.
and based on what D.Ruth send before, I added some edits
as a right to left reader.

Tested on master with Arabic
I used the updated po files for v. 3.8 (because the 3.12 )
need some revision ...

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
D Ruth Bavousett
2880e76e8f Bug 8061: RTL CSS overrides (OPAC)
This patch repairs a few things in templates and CSS to allow
for the injection of right-to-left CSS, also in this patch.
It should apply to 3.8 and master.

To test, install and enable a right-to-left language for the
OPAC, currently Hebrew or Arabic.
The Arabic OPAC translations for 3.6 are mostly-complete, so
they are a good test case.

It's helpful to have a reader of the language handy, but the
layout should be easy enough to figure out, even for
non-readers.

Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch adding back author and adding sign off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
D Ruth Bavousett
8c130eede3 Bug 8061: RTL CSS overrides (staff client)
This patch tweaks a few templates, and enables right-to-left
flipping via CSS in the staff client.

Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch, putting back author and adding sign off.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04:00
Jared Camins-Esakov
815a6b62bd Merge branch 'bug_9980' into 3.12-master 2013-04-07 12:15:11 -04:00
ae06a83cf0 Bug 9980: Fix for anonymous searches
To test
Search in the OPAC both logged and logged out

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
When I turn off XSLT for the OPAC I can recreate the problem.
After applying the patch things work as expected for all
combinations of:
- Search results and detail view
- Logged in and not logged in
- XSLT and non-XSLT view

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests, QA script and test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:11:37 -04:00
Jared Camins-Esakov
7b1a091a80 Merge branch 'bug_9981' into 3.12-master 2013-04-03 07:16:08 -04:00
ae0d137436 Bug 9981: Handle sort1 field when duplicating patron
It is noted in Bug 5432 that during a duplicate operation one field,
'Sort1' does not automatically clear when the cursor moves into it. This
patch corrects this.

Edit a patron record to have data in the Sort1 and Sort2 fields. Perform
a duplicate operation on this patron and confirm that the Sort1 and
Sort2 fields show the information from the original patron record. When
you click on each field the contents should disappear.

Signed-off-by: David Cook <dcook@prosentient.com.au>

Works as described.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 07:16:06 -04:00
Jared Camins-Esakov
19d042a833 Merge branch 'bug_4862' into 3.12-master 2013-04-03 07:09:22 -04:00
Liz Rea
17b38f15a7 bug 4862 - Change label of Browse by subject or author to Authority search
Replicate:
Load the OPAC
You should see "Browse by Subject or Author right below the search box

To test:
Apply patch
Load the OPAC
You should see "Authority search" where "Browse by Subject or Author" was .

Signed-off-by: Mason James <mtj@kohaaloha.com>
Amended patch: change strings in opac-authorities-home.tt

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 07:08:52 -04:00
Jared Camins-Esakov
87a070d74a Merge branch 'bug_9683' into 3.12-master 2013-04-03 07:03:52 -04:00
Fridolyn SOMERS
b9c2c58fe6 Bug 9683: Allow disable rewrite apache mod
In Apache config koha-httpd.conf, URL-rewriting is enabled and does not
allow to disable mod_rewrite. Also, first rewriting rule
"RewriteRule (.+) $1?%1%2 [N,R,NE]" is enabled by default. This rule
rewrites nearly every URL. I propose to comment it in sources so that is
must be intentionally enabled.

This patch sets rewriting options into a conditional tag.

Test plan :
Test OPAC and intranet with and without mod_rewrite activated.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The new Apache configuration seems to work fine (or at least as "fine"
as Apache gets) both with and without mod_rewrite enabled.
2013-04-03 07:02:54 -04:00
Jared Camins-Esakov
cb86132048 Merge branch 'bug_9877' into 3.12-master 2013-04-03 06:16:29 -04:00
Jonathan Druart
09b8622b4e Bug 9877: Followup: FIX if the table is empty.
If there is no data, we don't display the table.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:16:15 -04:00
09af6d03f5 Bug 9877 - Use DataTables on funds administration page
Replace the tablesorter plugin with the DataTables plugin on the funds
administration page.

To test, open the funds administration page (Administration ->
Funds). Confirm that table sorting, paging, and searching works
correctly.

Note that the table is sorted only when hierarchical display of parent
and child funds is not enabled. When the hierarchicial display is
enabled the table sorter is not triggered.

Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>

Post-QA revision adds handling for empty table: "No funds" row must have
same number of cells as the rest of the table (including hidden cell);

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:16:14 -04:00
Jared Camins-Esakov
aad7490058 Merge branch 'bug_9970' into 3.12-master 2013-04-03 06:12:14 -04:00
93db077cb2 Bug 9970 - Add datepicker default configuration to OPAC patron entry form
The datepicker on the OPAC patron entry/update form
(opac-memberentry.pl) doesn't show a calendar icon. This is because
although there is in-page JS to trigger the widget, the page doesn't
include the file which sets some widget defaults, including the path to
the calendar icon and the translatable strings for calendar labels.

This patch simply adds calendar.inc to the template.

To test, load the patron entry/update form (click "personal details" for
an existing patron or a start new patron registration). The date of
birth entry field should show a calendar icon.

Signed-off-by: David Cook <dcook@prosentient.com.au>

Test plan works as described. Looks much better.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-03 06:12:11 -04:00