Commit graph

18172 commits

Author SHA1 Message Date
2a8c07ff65 Bug 9765 - Remove unused include file: budgetperiods-admin.inc
budgetperiods-admin.inc doesn't appear to be used anywhere in Koha. This
patch removes it.

To test, confirm that a search for references to budgetperiods-admin.inc
returns no results.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-15 19:20:01 -04:00
Jared Camins-Esakov
c7599aa48d Merge branch 'bug_9756' into 3.12-master 2013-03-15 19:11:54 -04:00
Jared Camins-Esakov
db031da359 Bug 9756: Increment version number
Database update for bug 9756 has been given version 3.11.00.028
2013-03-15 19:11:44 -04:00
0654465a72 Bug 9756 - Patron self registration missing preference PatronSelfRegistrationAdditionalInstructions
The patron self registration system references a system preference
PatronSelfRegistrationAdditionalInstructions as a free text field
to add additional instructions for newly self registered patrons,
but the system preference in neither created in the database,
nor exposed via the staff interface.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Add some text to the new system preference
   PatronSelfRegistrationAdditionalInstructions
4) Enable opac self registrations and complete a self registration
5) Note the additional instructions you entered appear on the
   "registration complete" page

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-03-15 19:10:58 -04:00
Jared Camins-Esakov
deb77c1e54 Merge branch 'bug_7596' into 3.12-master 2013-03-15 19:03:55 -04:00
a9f743485f Bug 7596 - System prefs editor JS contains untranslatable English string
There is one stray instance of an untranslatable string in
preferences.js. This patch replaces it with a variable which is now
defined in the preferences template.

To test, open the system preferences editor and change any setting. You
should see the usual "Saved preference <preference name>" message.

To test that error strings are now translatable, run "perl translate
update <lang>" from misc/translator, then check if the affected strings shows
up in the po file.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested both, all ok.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-15 19:03:49 -04:00
Jared Camins-Esakov
c7e986536e Merge branch 'bug_4266' into 3.12-master 2013-03-15 18:54:07 -04:00
Mathieu Saby
609ac4f1f9 Bug 4266: Hide Encumbrance and Expenditure in aqbudgets.tt
Encumbrance and Expenditure fields are not taken into account by Koha,
but the data are saved in database.
This patch hide these fields in aqbudgets.tt
To test : check if the 2 fields are hidden when creating a new fund.

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

This could certainly be done in a few different ways both with CSS and
JS, but this is a simple change and can be easily overridden:

$("#budget_encumb,#budget_expend").closest("li").show();

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-15 18:54:04 -04:00
Jared Camins-Esakov
8ef6d4e303 Merge branch 'bug_9711' into 3.12-master 2013-03-15 18:50:58 -04:00
Jonathan Druart
04c56e00c8 Bug 9711: Add css style for OPACPopupAuthorsSearch
Bug 5888 introduces a new syspref OPACPopupAuthorsSearch. If enabled, a
popup is displayed on the OPAC detail page.
This development does not add the css for the ccsr theme.

Test plan:
Enable the OPACPopupAuthorsSearch.
Check that the appearance is the same of prog and ccsr themes.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested on several authorities (authors, subjects, etc)
works as expected

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
1) Switch to CCSR theme
2) Turn off XSLT views (leaving prefs empty)
3) Turn on OPACPopupAuthorsSearch
> Confirm layout is ok/broken in OPAC
4) Switch back to prog theme
> Confirm layout is ok/broken in OPAC
5) Switch off OPACPopupAuthorsSearch
> Confirm layout is ok/broken in OPAC
6) Switch back to CCSR
> Confirm layout is ok/broken in OPAC

Done.

Note: Feature only works with normal view (no XSLT)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-15 18:50:52 -04:00
Jared Camins-Esakov
bbbc5db799 Merge branch 'bug_9458' into 3.12-master 2013-03-13 09:07:22 -04:00
f0c58df12e Bug 9458 - Add sorting to lists - QA Followup 4
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 09:06:20 -04:00
1ac83c0594 Bug 9458 - Add sorting to lists - QA Followup 3
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 09:06:20 -04:00
be48d34b4f Bug 9458 - Add sorting to lists - QA Followup 2
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 09:06:19 -04:00
bc9f606ca7 Bug 9458 - Add sorting to lists - QA Followup
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 09:06:19 -04:00
4b95ee6239 Bug 9458 - Add sorting to lists
Test Plan:
1) Apply patch
2) View list in staff interface, try sorting by title, then author
3) Repeat 2 with same list in OPAC

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 09:06:19 -04:00
Jared Camins-Esakov
18c513d450 Merge branch 'bug_9647' into 3.12-master 2013-03-13 09:01:51 -04:00
Jared Camins-Esakov
809b4d7da9 Merge branch 'bug_9760' into 3.12-master 2013-03-13 08:56:41 -04:00
e49e611c95 Bug 9760: Simplify local use preferences
Removes a lot of code that was needed to handle prefs the old way.

Test plan:
Goto Local use preferences. Do you see some local preferences?
Add a new pref, edit and delete it.
Modify the url to systempreferences.pl?tab=OPAC or tab=log. You should only see
a short message.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Remove the $sth->finish statements
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:56:30 -04:00
Jared Camins-Esakov
ec3d1726a2 Merge branch 'bug_9035' into 3.12-master 2013-03-13 08:50:11 -04:00
Robin Sheat
788e51adb1 Bug 9035 - delete bulkauthimport.pl
<dcook> Then bulkauthimport.pl?
<jcamins> bulkauthimport should not be used ever.
<eythian> it probably should be deleted
<jcamins> It should be.

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

I've poked around in bulkmarcimport.pl and it certainly seems to have the functionality that Mason (and Jared and Robin) mention.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:50:09 -04:00
Jared Camins-Esakov
6c1b0734e2 Merge branch 'bug_9784' into 3.12-master 2013-03-13 08:46:40 -04:00
Liz Rea
8b234dd480 bug 9784: add koha-shell to the koha-common man page
To test:

Build a package from a git checkout with this patch included
once installed, run man koha-common - koha-shell should appear near the bottom.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:46:21 -04:00
Jared Camins-Esakov
b4ba0d12df Merge branch 'bug_9695' into 3.12-master 2013-03-13 08:43:45 -04:00
d3663a1c38 Bug 9695 - Use alphabet system preference on page used to browse patrons for patron card batches
When adding patrons to a batch for creating patron cards, the template
shows alphabet links for browsing all patrons. This patch converts the
hard-coded alphabet links to use the new alphabet system preference.

To test, go to the patron card creator and create a new batch. Click
"Add items" to pop up the window for browsing for patrons to add to the
batch. You should see a working array of alphabet letters which link to
patron search results.

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

The patch adds consistency to the interface and works as described.
Signed-off-by: Jonathan Druarth <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:43:25 -04:00
Jared Camins-Esakov
2e5198ea47 Merge branch 'bug_6898' into 3.12-master 2013-03-13 08:15:24 -04:00
Jared Camins-Esakov
ffc8076d1a Bug 6898: Increment version number
Database update for bug 6898 has been given version 3.11.00.027
2013-03-13 08:15:09 -04:00
Fridolyn SOMERS
67cc4ca302 Bug 6898 - circulation librarians can't run overdues without reports permissions followup
Better update database.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:14:18 -04:00
a0c44ab17c Bug 6898 - circulation librarians can't run overdues without reports permissions
This patch adds a new user permission overdues_report for the circulation module, and requires this permission to run the overdue items
report, rather than requiring full reports permissions.

Test plan :
With a user with permissions circulate_remaining_permissions :
- Add overdues_report permission to user
- Go to circulation home
=> you see "Overdues" link
- Clik on it
=> you are allowed to access and use this page
- Remove overdues_report permission to user
- Go to circulation home
=> you do not see "Overdues" link
- Edit URL : <server>/cgi-bin/koha/circ/overdue.pl
=> you are not allowed to access this page
- Go to main page
=> you don't have access to reports module

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Fridolyn SOMERS <fridolyn.somers@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:14:18 -04:00
Jared Camins-Esakov
efd78bf374 Merge branch 'bug_8853' into 3.12-master 2013-03-13 08:02:37 -04:00
Mathieu Saby
bf9815302c Bug 8853: Suppress links in basketgroups list
In the table listing all closed basketgroups, clicking the name of a
basketgroup reopen it. To edit an open basketgroup or reopen a closed
basketgroup, there are specific buttons in "Action" column. So the link
around basketgroup name is an UX problem. This patch suppress the link
around basketgroup name, in both "closed" and "open" tab.

To test :
1. create some closed and open basketgroups
2. check links are not showing anymore

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-03-13 08:02:34 -04:00
Jared Camins-Esakov
85385f2ee5 Merge branch 'bug_9293' into 3.12-master 2013-03-11 17:59:29 -04:00
7607defc71 Bug 9293 - action_logs not tracking payments
Add all fine actions to action_logs via FinesLog syspref

Test Plan:
1) Enable FinesLog
2) Apply patch
3) Try all the various fine related actions possible
4) Verify that each action creates an action_logs entry

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 17:59:17 -04:00
Jared Camins-Esakov
dcc75ed3fa Merge branch 'bug_9207' into 3.12-master 2013-03-11 08:57:19 -04:00
Jared Camins-Esakov
a971109d0c Bug 9207: Increment version number
Database update for bug 9207 has been given version 3.11.00.026
2013-03-11 08:56:08 -04:00
72f1b94a09 Bug 9207 - Improve z39.50 speed slowdowns for sites with many records
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 08:55:43 -04:00
Jared Camins-Esakov
301a07d243 Revert "Merge branch 'bug_9446' into 3.12-master"
This reverts commit 5b8f7e43fd, reversing
changes made to af7f49d198.
2013-03-11 08:52:17 -04:00
Jared Camins-Esakov
1ccbebf584 Merge branch 'bug_9431' into 3.12-master 2013-03-11 08:46:59 -04:00
baf95b1340 Bug 9431 [Revised] Use DataTables on Patron Category Administration page
Replace the tablesorter plugin with the DataTables plugin on the
patron category administration page. Structural changes were made to the
table markup for validity and to deal with a DataTables bug which
prevents it from properly parsing a <th> with a colspan.

To test, open the Patron Category Administration page (Administration ->
Patron types and categories). Confirm that table sorting works
correctly.

Revision adds a "natural sort" plugin to the main datatables
configuration JavaScript file to enable sorting of columns like those in
this table which include mixed numeric and text data. Allows correct
numeric sorting of data like "0 years, 1 years, 2 years, 18 years," etc.

Further revision corrects template path to datatables assets.

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

Comment: Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 08:46:22 -04:00
Jared Camins-Esakov
43c340c53e Merge branch 'bug_8054' into 3.12-master 2013-03-11 08:14:24 -04:00
Liz Rea
6c6fe37ced Bug 8054 - double clicking can cause duplicate payments/fines
Uses preventDoubleForSubmit() to prevent double form submissions in the fines module.

To test:

Create a manual invoice/fine
Create some manual fines, click save like mad - you should get only one fine (without, you will get several if you click madly enough)

Click Pay fines
Pay some fines, clicking save like mad on each. You should only get one payment. (without, you will get several payments)

Create a manual credit
Create a credit, click save like mad. You should only get one credit. (without you will get several if you click madly enough)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 08:14:12 -04:00
Jared Camins-Esakov
415af04cd7 Merge branch 'bug_9377' into 3.12-master 2013-03-11 08:08:55 -04:00
Fridolyn SOMERS
fa1ee846f7 Bug 9377 - itemtype in duplicate biblio search
In C4::Search::FindDuplicate, when biblio has no ISBN, the duplicate search adds :
$query .= " and itemtype=$result->{itemtype}".
This is wrong when itemtype is defined in items.

This patch simply removes the itemtype from dublicate search.

Test plan :
- Go to a biblio details page
- Click on "Edit as new (duplicate)"
- If ISBN is defined, remove it
- Click on save
=> a duplicate is detected
- Change biblio item type and save
=> a duplicate is detected
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 08:06:50 -04:00
Jared Camins-Esakov
bc11d66aa8 Merge branch 'bug_9555' into 3.12-master 2013-03-11 07:40:50 -04:00
Chris Cormack
82337d9624 Bug 9555: Another template contains single quotes in a js string
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 07:40:42 -04:00
Jared Camins-Esakov
5bdc68837b Merge branch 'bug_9734' into 3.12-master 2013-03-11 07:33:33 -04:00
MJ Ray
36965d7df8 Bug 9734 - String::Random is marked as optional, but C4::Members requires it
jcamins confirmed on IRC it is not optional.

To test:
1) perl koha_perl_deps.pl -a |grep String::Random
2) notice the "No" in the last column - it should be Yes
3) apply patch and repeat same steps, looking for Yes.
4) prove t/Installer_PerlModules.t # which checks String::Random is required

Sponsored-by: software.coop
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 07:33:30 -04:00
Jared Camins-Esakov
0ffaa644b9 Merge branch 'bug_9767' into 3.12-master 2013-03-08 07:00:37 -05:00
3dc0f5728e Bug 9767: Fix for updatedatabase.pl (mixed version numbers)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-08 07:00:09 -05:00
Jared Camins-Esakov
2bd3c85961 Merge branch 'bug_8917' into 3.12-master 2013-03-07 11:16:51 -05:00