Commit graph

17986 commits

Author SHA1 Message Date
Colin Campbell
1dabb45a50 Bug 9455: Remove unnecessary quoting from sql
Wa've removed the mysql specific back quotes from sql files
But this case remained of them embedded in an sql string
Also removed the unnecessary call to finish
and temporary variable in the subroutine return

Testing: Functionality should remain unchanged. Retrieval of
basketgroups in acquisitions should not be affected

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

Works according to test instructions: Basketgroups
functionality appears to work normally.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked SQL produces the same results as before and did some
tests on the basket group functionality.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:23:13 -05:00
Jared Camins-Esakov
e0df9b5e59 Merge branch 'bug_9658' into 3.12-master 2013-02-20 08:22:00 -05:00
Jared Camins-Esakov
aeb61b7528 Bug 9658: Incorrect breadcrumb on report dictionary
Prior to this patch, the breadcrumb on the reports dictionary looks
like this: Home > Reports > Guided reports wizard Dictionary (notice
the lack of punctuation between "wizard" and "Dictionary").
This patch makes it consistent with the rest of the system so it looks
like this: Home > Reports > Guided reports wizard > Dictionary

I left dictionary bolded, since that seems to have been intentional,
even if I can't find a good reason for it.

To test:
1) View reports dictionary page before and after patch is applied,
   observing difference.

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

Comment: Trivial patch. Work as described. No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:21:56 -05:00
Jared Camins-Esakov
257f511bf2 Merge branch 'bug_9655' into 3.12-master 2013-02-20 08:20:50 -05:00
Bernardo Gonzalez Kriegel
d2c627fff7 Bug 9655 - Capitalization wrong on 'Close and Print' button in basket groups
This patch fix button capitalization on basket groups for a vendor.

To test:
1) Go to Acquisitions, search for a vendor, click on vendor name,
Manage orders > Basquet groups
2) On Open tab, action button "Close and Print" has incorrect capitalization.
3) Apply the patch
4) Reload or repeat 1-2, capitalization fixed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:20:47 -05:00
Jared Camins-Esakov
7dd65f3a9d Merge branch 'bug_9582' into 3.12-master 2013-02-20 08:17:36 -05:00
Jared Camins-Esakov
7c0edbc315 Bug 9582: Remove unused code from members/pay.pl
The subroutines writeoff() and get_writeoff_sth() (and the two package
variables $writeoff_sth and $add_writeoff_sth) defined in members/pay.pl
are not used at all.

To test:
1) View members/pay.pl by looking at the record of a patron who has
   at least seven fines/fees and clicking the "Pay fines" tab after
   clicking the "Fines" tab on the left side
2) Write off a single item in the table on members/pay.pl using the
   button labelled "Write off"
3) Pay a single fine by clicking the "Pay" button
4) Pay a portion of a fine by selecting a checkbox on one of the lines
   in the table and clicking the "Pay amount" button
5) Select two lines in the table and click the "Pay selected" button
6) Write off all remaining fines

If all your actions show up in the table on the Account tab, this patch
works.

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-02-20 08:17:34 -05:00
Jared Camins-Esakov
0ddbc792b9 Merge branch 'bug_8079' into 3.12-master 2013-02-20 08:16:28 -05:00
c13e8e5275 Bug 8079 - opac not showing fines - says 'no'
Make charges of type FU be counted for opac-user.pl

Test Plan:
1) Checkout an item to a patron, back date the date due enough to create fines
2) Run fines.pl
3) Log into the patron's account via the OPAC
4) Note the fines line for that issue says 'No'
5) Apply patch
6) Reload opac-user.pl, not the fines column now says 'Yes'

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

Works great, Kyle. Seeing as my test patron had $4500 in fines for that item, I was glad to see that column switch to "Yes" ;).

I'm not sure what the difference is between FU and F is, or what L means, but the patch works, so I'm signing off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described, all tests and QA script are ok.
Note: why show yes and not the fine amount?
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:16:24 -05:00
Jared Camins-Esakov
dd9520a7e5 Merge branch 'bug_9651' into 3.12-master 2013-02-20 08:00:42 -05:00
Bernardo Gonzalez Kriegel
663f92f1b7 Bug 9651 - When deleting a fund, button is wrongly labelled with 'Delete this budget'
This patch change legends to approve/cancel deletion of a fund.
Changed to Delete/Cancel, same messages to delete a Budget.

To test:
1) When deleting a fund, confirmation messages said:
'Delete this budget XXX?' to approve
'No, do not delete' to cancel
2) Apply the patch
3) Now the messages are 'Delete'/'Cancel'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:00:40 -05:00
Jared Camins-Esakov
2b61128842 Merge branch 'bug_7969' into 3.12-master 2013-02-19 11:04:52 -05:00
Jared Camins-Esakov
9f4069fb8a Merge branch 'bug_9646' into 3.12-master 2013-02-18 09:11:25 -05:00
d9deb165db Bug 9646 - Replace YUI button on the printers administration page with Bootstrap
This patch converts the toolbar on the printers administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the printers administration page and confirm that the "New
printer" button looks correct and works correctly.

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

Comment: Works well. No errors.
Off-topic: How do you access this page? I can't find a link
(tested using .../cgi-bin/koha/admin/printers.pl)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works well, no problems found.
Accessed printers page manually: /cgi-bin/koha/admin/printers.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:11:25 -05:00
Jared Camins-Esakov
45e97d94cc Merge branch 'bug_9645' into 3.12-master 2013-02-18 09:09:57 -05:00
f2da479668 Bug 9645 - Replace YUI buttons on the quotes management page with Bootstrap
This patch converts the toolbar include file used by the quotes editor
to Bootstrap, replacing YUI button and menu code with Bootstrap markup.

To test, view any page in the quotes editor. Buttons and menus should
look correct and work correctly. Test save, delete, and upload buttons
on the summary page, and save and delete buttons on the upload page.

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

Comment: All buttons work. Tested add, delete and upload.
You are using icon-remove and not icon-remove-circle,
which I prefer but is different of Bug 9627.
Question: "Import quotes" takes you to "Quotes uploader",
would not it be more consistent to use "Upload quotes" or
"Quotes importer"?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
I think the difference to 9627 is, that this really deletes
quotes, while the icon-remove-circle is used for closing subscriptions.
Closed subscriptions remain in the system, it's just a way to indicate
that there will be no new issues. There is a separate option to really
delete subscriptions.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:09:57 -05:00
Jared Camins-Esakov
4bad9adb51 Merge branch 'bug_9644' into 3.12-master 2013-02-18 09:08:33 -05:00
fe13e889ee Bug 9644 - Replace YUI button on the suggestions management page with Bootstrap
This patch converts the toolbar on the suggestions page to to Bootstrap,
replacing YUI button code with Bootstrap markup.

To test, view the suggestions page and confirm that the "New purchase
suggestion" button looks correct and works correctly.

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

Comment: Another confirmation. Button looks and works. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:08:33 -05:00
Jared Camins-Esakov
06f83e8690 Merge branch 'bug_9643' into 3.12-master 2013-02-18 09:07:33 -05:00
389cb14012 Bug 9643 - Replace YUI button on the road types administration page with Bootstrap
This patch converts the toolbar on the road types administration
page to to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the road types administration page and confirm that
the "New road type" button looks correct and works correctly.

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

Comment: Confirmed, button works and looks correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:07:33 -05:00
Jared Camins-Esakov
0176d1098d Merge branch 'bug_9642' into 3.12-master 2013-02-18 09:06:49 -05:00
775ed7d0bc Bug 9642 - Replace YUI button on the patron attribute types page with Bootstrap
This patch converts the toolbar on the patron attributes administration
page to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the patron attribute types administration page and confirm
that the "New patron attribute type" button looks correct and works
correctly.

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

Comment: Button looks and works correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:06:49 -05:00
Jared Camins-Esakov
4ad8e4116f Merge branch 'bug_9641' into 3.12-master 2013-02-18 09:05:51 -05:00
f566e7f89b Bug 9641 - Replace YUI button on the Koha news management page with Bootstrap
This patch converts the toolbar include file used by the Koha news
editor to Bootstrap, replacing YUI button and menu code with Bootstrap
markup.

To test, open the Koha news editor and test the "New entry" button. It
sould look correct and work correctly.

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

Comment: The button works and looks correct. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:05:51 -05:00
Jared Camins-Esakov
a012efca4b Merge branch 'bug_9640' into 3.12-master 2013-02-18 09:04:46 -05:00
41dc6c962f Bug 9640 - Replace YUI button on record matching rules page with Bootstrap
This patch converts the toolbar on the matching rules administration
page to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the matching rules administration page and confirm that
buttons look correct and work correctly.

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

Comment: Button look and work correctly. No errors.
There's only one button.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:04:46 -05:00
Jared Camins-Esakov
398d7a2858 Merge branch 'bug_9639' into 3.12-master 2013-02-18 09:03:33 -05:00
0e8f896e85 Bug 9639 - Replace YUI button on MARC tag structure toolbar with Bootstrap
This patch converts the toolbar used on the MARC tag structure toolbar
to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view marctagstructure.pl for any framework. Confirm that the
'New tag' button looks correct and works correctly.

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

Comment: Confirmed that 'New tag' looks and works correctly.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 09:03:33 -05:00
Jared Camins-Esakov
2442950581 Merge branch 'bug_9637' into 3.12-master 2013-02-18 09:00:27 -05:00
9c5796de72 Bug 9637 - Replace YUI button on local use system preferences page with Bootstrap
This patch converts the toolbar on the local use system preferences page
to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the local use system preferences page (the "local use" tab
on the main System preferences page) and confirm that the "New
preference" button looks correct and works correctly.

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

Comment: Works and looks very well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Removed incorrect Javascript comment about YUI.
2013-02-18 08:59:41 -05:00
Jared Camins-Esakov
21bd9d5ba7 Merge branch 'bug_9636' into 3.12-master 2013-02-18 08:57:34 -05:00
d0d2a961db Bug 9636 - Replace YUI buttons on labels pages with Bootstrap
This patch converts the toolbar include file used by the label manager
to Bootstrap, replacing YUI button and menu code with Bootstrap markup.

This patch converts the previous menu buttons to plain buttons,
removing the redundant links to the manage pages, which are in the
left-hand sidebar. This keeps toolbar buttons within the general
category of "action" (as opposed to "view").

This patch also removes an unused include file, labels-new-toolbar.inc

To test, view the labels home page and any of the label manage pages
(layouts, templates, profiles, batches). Buttons should look correct
and work correctly.

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

Comment: Work as described. No errors.
Nicole is not going to be happy, images in Label creator section
of manual needs to change :)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, I was wondering if we should have the plus icon
on those buttons like we have on the other 'New' buttons.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:57:34 -05:00
Jared Camins-Esakov
5a59aa97af Merge branch 'bug_9635' into 3.12-master 2013-02-18 08:55:55 -05:00
fd680afc6f Bug 9635 - Replace YUI buttons on label batches pages with Bootstrap
This patch converts the toolbar used by label batches pages to
Bootstrap, replacing YUI button and menu code with Bootstrap markup.

This patch also consolidates the include file and main template. The
include file was used in only one template.

To test, create a label batch and test all functions related to that
batch: adding and removing items, de-duplicating the batch, exporting
individual items, exporting the batch, and deleting the batch. Buttons
should look correct and work correctly.

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

Comment: Work as described, no errors.
Tested all functions (add, del, de-duplicate, export item, export batch)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:55:55 -05:00
Jared Camins-Esakov
19e6146469 Merge branch 'bug_9633' into 3.12-master 2013-02-18 08:53:11 -05:00
f0efd4de31 Bug 9633 - Replace YUI button on the itemtypes administration page with Bootstrap
This patch converts the toolbar on the itemtypes administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

Small unrelated edit: Button label text case correction.

To test, view the itemtypes administration page and confirm that the
'New item type' button looks correct and works correctly.

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

Comment: Work and look correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:53:11 -05:00
Jared Camins-Esakov
61faf37355 Merge branch 'bug_9632' into 3.12-master 2013-02-18 08:51:45 -05:00
3e45a2fde1 Bug 9632 - Replace YUI button on the currencies administration page with Bootstrap
This patch converts the toolbar on the currencies administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the currencies and exchange rates administration page. The
'New currency' button should look correct and work correctly.

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

Comment: Work and look correctly. No errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:51:45 -05:00
Jared Camins-Esakov
91eaa1e170 Merge branch 'bug_9631' into 3.12-master 2013-02-18 08:50:23 -05:00
c4631937f3 Bug 9631 - Replace YUI buttons on classification sources administration page with Bootstrap
This patch converts the toolbar on the class sources administration page
to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the class sources administration page. Buttons should look
correct and work correctly.

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

Comment: Works as described. Change "rules" to singular.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.

http://bugs.koha-community.org/show_bug.cgi?id=9613
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:50:22 -05:00
Jared Camins-Esakov
77572c15ce Merge branch 'bug_9630' into 3.12-master 2013-02-18 08:48:36 -05:00
5d14cef0cc Bug 9630 - Replace YUI button on cities and towns administration page with Bootstrap
This patch converts the toolbar button on the cities
administration page to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, view the cities administration page and confirm that the
"New city" button looks correct and works correctly.

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

Comment: Works as described, looks correct and works correctly.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:48:36 -05:00
Jared Camins-Esakov
c8a8825367 Merge branch 'bug_9629' into 3.12-master 2013-02-18 08:47:28 -05:00
11546a2ee1 Bug 9629 - Replace YUI button on patron category administration page with Bootstrap
This patch converts the toolbar used by the patrons
[category] administration to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, view the patrons [category] administration page and confirm that
the button looks correct and works correctly.

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

Comment: Work as described, looks correct and works correctly.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:47:28 -05:00
Jared Camins-Esakov
7d7063ff03 Merge branch 'bug_9628' into 3.12-master 2013-02-18 08:24:38 -05:00
8b648c94f9 Bug 9628 - Replace YUI buttons and menus on budgets administration pages with Bootstrap
This patch converts the toolbar include file used by budgets
administration pages to Bootstrap, replacing YUI button and menu code
with Bootstrap markup.

To test, create, view, and edit budgets. Buttons and menus should look
correct and work correctly. Functions include:

- New budget
- New fund
- Edit budget
- Duplicate budget
- Plan by (months, libraries, etc)

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

Comment: Work as described. No error.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:24:37 -05:00
Jared Camins-Esakov
82f9234dc9 Merge branch 'bug_9627' into 3.12-master 2013-02-18 08:23:07 -05:00
aa3ff32c9d Bug 9627 - Replace YUI buttons and menus on serials pages with Bootstrap
This patch converts the toolbar include file used by Serials pages to
Bootstrap, replacing YUI button and menu code with Bootstrap markup.

To test, view any page in serials/ which uses serials-toolbar.inc
(subscription-detail.pl, serials-home.pl, etc).
Buttons and menus should look correct and work correctly, including:

- New subscription
- Edit subscription
- Edit as new (duplicate)
- Delete subscription
- Renew
- Receive
- Close

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

Comment: Work as described. No errors.
For me it would be better to use icon-remove, because icon-remove-circle
shows a little cross, think that a bigger cross is more clear.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
I think there is a point in differentiating between closing and deleting,
so the icon-remove-circle is maybe not ideal, but the icon-remove
would falsely indicate a delete. Maybe we can find another icon that
expresses the functionality a bit better later on.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:22:59 -05:00
Jared Camins-Esakov
2774064e94 Merge branch 'bug_9624' into 3.12-master 2013-02-18 08:08:22 -05:00
629bd2f813 Bug 9624 - Replace YUI button on reports dictionary page with Bootstrap
This patch removes the toolbar include file used by the reports
dictionary and embeds the toolbar markup directly in the main
template since it's the only instance where it is used.
Toolbar is converted to use Bootstrap, replacing YUI button code
with Bootstrap markup.

To test, view the reports dictionary and confirm that the "New
definition" button looks correct and works correctly.

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

Comment: Work as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:08:15 -05:00