Commit graph

9906 commits

Author SHA1 Message Date
413a300299 Bug 13818 - Editing and saving a course reserve displays the add item form
If one chooses to edit an existing course reserve for an item, saving it
should go back to the course details, but instead displays the "add
items: scan barcode" form.

Test Plan:
1) Edit a course reserve
2) Save it
3) Note you get the "add items: scan barcode" form
4) Apply this patch
5) Repeat steps 1 and 2
6) Note you are now redirected back to the course details page

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-25 11:25:26 -03:00
Katrin Fischer
cc01bfe8e8 Bug 13856: Hard to translate strings on patron search results page
'Add selected patrons to:' at the top of the patron search result
table is hard to translate correctly, because the 'to:' appears
as a separate string from the rest of the sentence.

To test:
- Make sure patron lists are activated
- Do a patron search with more than 1 result
- Look for the text at the top of the search results table
- Verify it looks the same before and after the patch

Bonus:
- run perl translate update <langcode> and verify the
  2 strings are now 1 string with the patch applied

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-25 11:24:35 -03:00
“ByWater
0e8927a5fa Bug 13832 - Missing table header IDs on record holdings table in OPAC
All but two of the table headers in the item holdings table in the opac have identifiers. The remaining two should be added so they can be modified easily with CSS.

Test Plan:
1) Apply this patch
2) View the holdings table for a record
3) Note the new id field for the item holds column
4) Note the new id field for the hold prioirty column ( if enabled )

Followed test plan. Patch behaves as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-25 11:24:08 -03:00
Hector Eduardo Castro Avalos
e044995d8a Bug 13878 - Typo in help file (aqbudgets.tt)
Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudgets.tt:15' and check the typo "wan" or go to Administration > Acquisition parameters > Funds > Help
2) Apply the patch
3) Repeat step 1 and check if the typo is fixed.

Sponsored-by: Universidad de El Salvador

Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx@gmail.com>

Typo is fixed.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-25 11:22:16 -03:00
Hector Eduardo Castro Avalos
7f893f9e1c Bug 13872 - Typographical error on columns_settings.tt
Test plan:
1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/columns_settings.tt' line 9 and check the typo "columsn" and change for columns.
2) See also changes for Column settings to Columns settings at lines 3 and 15
3) Apply the patch
4) Repeat step 1 and chek if the typo is fixed or go to Administration > Additional parameters > Configure columns and go to Help page.

Sponsored-by: Universidad de El Salvador

Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx@gmail.com>

Typo is fixed
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-25 11:21:59 -03:00
e2667222d8 Bug 5786 [QA Followup] - Fix language
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-25 10:33:38 -03:00
Srdjan
1802aa9153 Bug 5786 - Move AllowOnShelfHolds and OPACItemHolds system prefs to the Circulation Matrix
C4::Reserves:
* Added OnShelfHoldsAllowed() to check issuingrules
* Added OPACItemHoldsAllowed() to check issuingrules
* IsAvailableForItemLevelRequest() changed interface, now takes
  $item_record,$borrower_record; calls OnShelfHoldsAllowed()

opac/opac-reserve.pl and opac/opac-search.pl:
* rewrote hold allowed rule to use OPACItemHoldsAllowed()
* also use OnShelfHoldsAllowed() through
* IsAvailableForItemLevelRequest()

templates:
* Removed AllowOnShelfHolds and OPACItemHolds global flags, they now
  only have meaning per item type

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

I have tested this patch left, right and upside down for the last
several months. All tests have passed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-25 10:33:14 -03:00
Jonathan Druart
bceac94f0a Bug 13021: Reintroduce the name column for guarantor search
Previous patch removed the name column, it's a regression.
This patch reintroduces it.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:19:40 -03:00
Jonathan Druart
8cee27c915 Bug 13021: guarantor search - guarantor_search.tt is useless
The guarantor_search.tt is now useless, no script uses it.
It can be removed safely.

Signed-off-by: Morag Hills <the.invinnysible.one@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:19:35 -03:00
Jonathan Druart
88816eebd9 Bug 13021: guarantor search - main patch
This patch is the main patch.
The "common" template is improved to allow different type of picking:
"add" or "select".
The first one appends a patron to a list, the second one selects the
patron and close the result search window.

The members/guarantor_search.pl has completly changed but is quite the
same file as acqui/add_user_search.pl. Both should exist: they don't
belong to the same module (acqui vs members), the picking type is
different (add vs select) and the columns are not the same.

The changes in the common template are very powerful, it's now possible
to list the column we want! This will be very useful for further
reusability.

Before this patch, all patrons mathing the pattern were return. Now only
the first 20 are (depends on the DataTables selected value).

For QA: This patch introduces a new template plugin "To", for now it
permits to convert a perl structure to json. In the idea, it could
permit to convert foo to bar too.

Test plan:
1/ Verify there is no regression in the guarantor search. When the
selection has been done, all data from the guarantor should fill the
form in the "main address" section.
Note that the request is done when the search input in not empty and the
user stop to write for 1 sec.
2/ Verify there is no regression on the 2 other pages where this patron
search is used: link a patron to an order and to a basket (in the
acquisition module).

Signed-off-by: Morag Hills <the.invinnysible.one@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:19:34 -03:00
Jonathan Druart
0de27f53ae Bug 13021: guarantor search - prepare existing code to be reused
The add_user_search tt file will be reuse in next commits, this commit
just moves it in a "common" directory.

Signed-off-by: Morag Hills <the.invinnysible.one@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:19:31 -03:00
Marc Véron
e043b5563f Bug 13826 - OPAC: Display RSS icon on list of recent comments
This patch adds RSS icon to OPAC page 'Recent comments'

To test:
1)
Enable display of 'Recent comments' in OPAC (Syspref OpacShowRecentComments)
2)
In OPAC, go to Home > Recent comments
3)
Verify that there is a link in the head part of the HTML source code (<link rel="alternate" type="application/rss+xml"....), but no RSS icon on the pate itself (like in search results).
4)
Apply patch
Result: Icon with link to RSS feed is displayed  next to title.

Bug 13826 - Follow-Up: Close </h3>

There was a slash missing.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by for the Follow Up: Marc Veron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:18:17 -03:00
Christophe Croullebois
7e14824009 Bug 13768: Correction of double quotes escaped into double quotes
Without the patch the translated pages for quotes.tt may have the problematic line broken.
So the js is broken too. The line with bad usage of double quotes escaped :
var sEmptyTable = _("No quotes available. Please use the \"Add quote\" button to add a quote.");

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

diff on staff PO file

-msgid ""
-"No quotes available. Please use the \\\"Add quote\\\" button to add a quote."
+#, fuzzy
+msgid "No quotes available. Please use the 'Add quote' button to add a quote."

No koha-qa errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:14:20 -03:00
Katrin Fischer
b4a9b23ab7 Bug 13861: \n in confirmation message on closing a budget
\n in strings doesn't translate well, so we move it outside
the translated string.

To test:
- create at least 2 budgets
- close one of the budgets (moving orders from one budget to the other)
- after selecting the budget to move your orders to, save
- the confirmation message shown should read:

You have chosen to move all unreceived orders from 'budget 1' to 'budget 2'.
This action cannot be reversed. Do you wish to continue?

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:04:09 -03:00
Bernardo Gonzalez Kriegel
a7d4d05a7c Bug 13748: Acquisition wizard: some strings not translatable
This patch removes all instances of CGI::scrolling_list from
reports/acquisitions_stats.pl, which prevented proper translation

To test:
1) Install and enable a language (es-ES or de-DE are good choices)
2) On Acquisitons wizard, some pulldown labels are not translated
3) Apply the patch
4) Update and install again the language
5) Check labels are translated and all pulldown works

This does not solve the 'Collection code' problem,
is more strange

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, good improvement.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-19 14:02:36 -03:00
Katrin Fischer
f3e02d2496 Bug 13858: Datatables paging on Koha news tool page slightly broken
The paging is slightly broken in the datatables table on the
news page in the tools module.

To test:
- Access the tools > news page
- Make sure you have a few news entries
- Check that the paging is broken without the patch and
  fixed once the patch is applied

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-18 20:17:37 -03:00
Jonathan Druart
031cccb674 Bug 13863: Fix Datatables paging on the cities and search history pages
Test plan:
Go on admin/cities.pl and catalogue/search-history.pl and confirm the
pagination is not broken anymore.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-18 20:16:40 -03:00
Katrin Fischer
66db4a64ef Bug 12399: Small change to remove the whole paging
Previous patch only removed the next and previous buttons.
This patch changes it a bit to remove the whole paging from
the print view of the page.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-15 09:09:51 -03:00
Marc Véron
21d05006c0 Bug 12399 - opaccredits printing at top on printable version
This patch introduces a new class "noprint" in koha-tmpl/opac-tmpl/bootstrap/css/print.css
With this class, unwanted elements can be hidden when printing.

To test:
In OPAC, do a search with many results (> 1 Page)
Print page or do a print preview
See that footer elements are not displayed correctly (as of screenshot in comment #1) and that on top of page 2 the language selector overlays the list
Apply patch
Repeat steps above.
Verify that printed page looks much nicer now by hiding unwanted elements (including e.g. RSS icon, toolbar etc.)

This mechanism can be used on other pages as well.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-15 09:09:45 -03:00
Katrin Fischer
cb9e57cfe0 Bug 13647: On-site checkouts - Allow library to specify due date
This will remove the restriction that forces the due date for
an on-site checkout to the end of the current day.

It will still suggest the end of the day, but you will be able
to change the date to whatever you want using the datepicker
widget.

To test:

Before applying the patch:
- Turn on OnSiteCheckouts and OnSiteCheckoutsForce
  system preferences
- Check the on-site use checkbox and try to set due date
  manually, it should not be possible
- Check out the item and check the due date is set to the
  end of today
- Put a restriction on your patron account and repeat steps,
  the item checked out should again have a due date at the
  end of the day
> There should be no way to be able to check out an item
  with a 'custom' due date

Apply the patch:
- Repeat steps from above, check out
  - on-site use without a restriction on your account
    - without changing the due date
    - with a due date picked with the datepicker
  - on-site use with a restriction on your account
    ... see above
  - no on-site use but with a specified due date
  - no on-site use, not specifying a due date
- Turn off SpecifyDueDate
  - on-site use with and without restriction should
    set the due date automatically to the end of the date
    now, altering the due date should not be possible.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-15 09:07:32 -03:00
Jonathan Druart
30a8843529 Bug 4402: Date filter on parcels.tt required db date format
The date filters on the parcel page would only work with
dates formatted YYYY-MM-DD.

To test:
- Select a vendor, that already has a few invoices
- "Receive shipment" - you are on the parcels page
- Use the From and To filters on the left, notice there
  is now a date picker on those fields
- Verify the search works correctly for different date
  formats

Signed-off-by: Nicole <nicole@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-15 08:56:06 -03:00
Jonathan Druart
b475728a50 Bug 13380: Fill order cancellation reasons from AV
Since bug 7162, it's possible to give a cancellation reason on deleting
an order.
This would be better to fill an authorised values category with the
different possible values.
Like that we will avoid to have duplicate or similar reasons.

Also, it will be easier to filter or create reports.

Test plan:
0/ Don't apply the patch
1/ Cancel some orders and give a cancelletion reason
2/ Apply the patch and execute the updatedb entry
3/ Cancel an order and verify the you have a list with the reason you
previously filled + 3 new ones ('No reason', 'Sold out' and
'Restocking');
4/ Choose one and verify the value is correctly displayed on the basket
page
5/ You can also try to add other values from the admin module.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-15 08:50:29 -03:00
Jonathan Druart
733d37ff3f Bug 11430 [Follow-up] Search history: Delete selected lines
This follow-up for Bug 11430 makes some changes to the template to make
it more useful when JavaScript is turned off:

- Hide the toolbar containing select all/clear all links if JS is off
- Add buttons to submit the forms if the delete link in the toolbar is
  unavailable (or if the user has scrolled all the way to the bottom of
  a long list)

Also changed: Corrected indentation from 2-space to 4-space, added
comments to the markup to help document page structure; changed the
class of the delete link to match other similar interfaces.

Note: This patch contains whitespace changes. Please diff
accordingly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 15:02:45 -03:00
Jonathan Druart
56c481bc9d Bug 11430: Intranet changes
Signed-off-by: sonia BOUIS <sonia.bouis@univ-lyon3.fr>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 15:02:42 -03:00
Jonathan Druart
d40a2cb176 Bug 11430: OPAC changes
Signed-off-by: sonia BOUIS <sonia.bouis@univ-lyon3.fr>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 15:02:41 -03:00
Marc Véron
e0863d9711 Bug 13657 - Don't show extra comma after guarantor name on patron details
This patch suppresses the first name part (including comma) if first name is empty. This way, first name is still displays with natural persons, but not with organizations.

To test:
Apply this patch (without the first patch).
Have one patron with a natural person as guarantor and one patron with an organization as guarantor. Verify that both display properly on the patron details page.

Signed-off-by: Jesse Maseto <Jesse@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 14:38:33 -03:00
Pasi Kallinen
901fdce2c6 Bug 11364: Label layout types and text justification types are not translatable
To test:

1) cd misc/translator
2) perl translate update xx-YY
3) check that there's no msgids that contain the layout types or
   text justification types in po/xx-YY-i-staff-t-prog-v-3006000.po
4) apply patch
5) perl translate update xx-YY
6) check po/xx-YY-i-staff-t-prog-v-3006000.po that it contains the
   msgid for the frequencies. (search for "BLOCK translate_label_types"
   and "BLOCK translate_justification_types")

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 14:32:14 -03:00
d501637861 Bug 13804 - Returns via the checkouts tables uses the phrase "Returned" rather than "Checked in"
Test plan:
1) Apply this patch
2) Return an item via the checkouts table
3) Note the left most column now reads "Checked in" rather than "Returned"

Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 14:23:42 -03:00
Bernardo Gonzalez Kriegel
379e9cbe1e Bug 13350: Untranslatable strings in aqbudgetperiods.tt
Counter patch, same test plan as original

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 14:23:04 -03:00
Jonathan Druart
855c8f47b7 Bug 12648: Fix conflict with bug 8096
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Patch fixes the regression found while testing. Thanks for the fast response Jonathan
2015-03-11 14:16:17 -03:00
105f8f57f2 Bug 12648: QA Followup
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 11:48:18 -03:00
Jonathan Druart
f027f6b502 Bug 12648: Add the new 'Acquisition' entry in the letter module list
Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 11:47:43 -03:00
Jonathan Druart
5993857cca Bug 12648: The patron's name should be the same as before
The displayed patron's name should be surname + firstname

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 11:47:41 -03:00
Jonathan Druart
1119faf3ef Bug 12648: Hide the result search on load
When no search has been done yet, it's not necessary to display the
result list.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 11:47:38 -03:00
Jonathan Druart
8e91a0f01d Bug 12648: The users added to basket should have a permission
Before this enh, the users to add to a basket should have the
acquisition.order_manage permission.
This patch reintroduces this behavior.

The code in acqui/add_user_search.pl was never used. The filter should
be done in the members/search service.

But it is not possible easily to filter using a sql query, so the filter
is done after. This means that we cannot use the DT pagination
(otherwise the results will become inconsistent).

Test plan:
1/ On adding patrons to a basket, verify that the search patron results contain
patron with the acquisition.order_manage permission.
2/ Verify that all patrons are return on the 'normal' patron search and
when adding patrons to an order.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 11:47:35 -03:00
Jonathan Druart
519c273643 Bug 12648: Link patrons to an order
This patch is the main patch.

This feature adds the ability to link patrons to an order.
On that way, they will be notified when the order is completely
received.

Test plan:
1/ Execute the updatedb entry and verify you have a new notification template in your table (tools/letter.pl).
code: ACQ_NOTIF_ON_RECEIV, module: acquisition
2/ You can edit it if you want
3/ Create a basket and create an order with 1 or more items
4/ Link 1+ patrons to this order
5/ Close the basket and receive the order
6/ When you have received all items for this order, all patrons attached
will be notified. Check the message_queue table to check if the letters
have correctly been added to the queue.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 11:47:30 -03:00
Jonathan Druart
bb1beb4f5d Bug 12648: Refactoring to prepare user search for reuse
A previous enhancement allows to link basket with patrons.
Next patches will use the same way to link order with patrons.

In order to avoir c/p of code, this patch refactores this part of code.

Test plan:
1/ Verify there is no regression on adding/modifying users to a basket.
(acqui/basket.pl?basketno=XXX, "Managed by", "Add user").
2/ Note that you get a friendly message if the user is already present in the
list and when the user has correctly been added to the list.
3/ Note that the list uses the member search service (ie. DataTable +
serverside processing).

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-11 11:47:25 -03:00
Marc Véron
66c9e7a183 Bug 11400 - Follow-up for nicer design
This patch tries to get the Bug out of "In discussion" by changing the design a little bit.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 22:09:45 +01:00
9b56ae7627 Bug 11400: Show "Log in as a different user" in the error message instead of the "Logout" button
Bug 11146 introduced a way to go back, and have a logout link for the
"Not enough permissions" message page. I belive the logout button is redundant. And
also "Log in as a different user" tells the user more about its options on the scenario.

Simple and disputable usability/string change.
Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 22:09:38 +01:00
Marc Véron
6004b2492b Bug 13351 - Untranslatable javascript in members.tt
This patch streamlines the page title text for search results in Home > Patrons to make it translateable (and more readable).

To test:
- Apply patch
- Select Englsh language
- Apply filter wit several values or click on a letter for "Browse by last name"
- Verify that the title makes sense
- Translate to your language and select this language
- Verify that the text appears properly in your language

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.

http://bugs.koha-community.org/show_bug.cgi?id=13352
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 22:08:12 +01:00
Jonathan Druart
d3405211be Bug 13750: Fix capitalization All vs ALL
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:52:10 +01:00
Katrin Fischer
1bd8f5e6f7 Bug 13750: Holds queue - Show branch name instead of branch code
When the holds queue report is limited to one library, it shows
<cound> items found for <branchcode>

With the patch applied, the branch name is shown instead of the code.

To test:
- Go to circulation > Holds queue
- Limit to one branch with holds waiting to be processed
- Confirm the string has changed to show the branch name

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:52:03 +01:00
Mark Tompsett
f71f1ba6e2 Bug 13787 - Clean up noisy opac-advsearch warnings
While testing bug 10937, there were noisy warnings, which
distracted from testing the functionality of it.

Here is a snippet of the after the patch warnings:
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 384.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 161.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 177.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 202.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 240.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 256.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 356.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.
Argument "" isn't numeric in numeric gt (>) at /home/mtompset/kohaclone/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt line 369.

Tweaking the [% IF %] statements eliminated the warnings.

TEST PLAN
---------
1) Apply patch
2) Run koha qa test tools.
   -- there will be noisy warnings in the before processing, but
      there will be no such messages in the after processing.
3) git diff origin/master
   -- there should be no visible typos.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
- Applied the patch from bug 10937
- Ran "koha-qa.pl -c 1" and observed the warnings described in the
  commit message
- Applied the patch from this bug
- Ran "koha-qa.pl -c 1" again and saw no warnings
- Ran "koha-qa.pl -c 2" and saw no warnings

I have not tested the functionality of 10937 with this patch, just verified
that the changes look sensible.

This patch feels more like a followup for 10937, than a separate patch,
especially since 10937 is just "signed off" at this time. But as long as it
works...

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:22:18 +01:00
Katrin Fischer
dad48bcf0a Bug 13744: Fix datatables paging on 'Holds to pull' report
The paging of the datatables on the 'holds to pull' report
page is broken without this patch.

To test:
- Make sure that some holds are placed on available items
  in your installation
- Go to the circulation start page
- Open the 'holds to pull' report
- Verify that the patch fixes the paging on the result table

Also: Fixes "None" in the filter pull downs to be translatable.
Signed-off-by: Nicole <nicole@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:10:28 +01:00
Katrin Fischer
92656844d8 Bug 13744: Fix datatables paging on 'checkout history' page
The paging in the datatable on the 'circulation history' page
is broken without this patch.

/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=...

To test:
- Search for a record with items that have been checked out
  in the past
- From the detail page, open the 'checkout history' tab
- Check paging displays correctly with this patch and is
  broken without

Signed-off-by: Nicole <nicole@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:10:26 +01:00
Katrin Fischer
d9d0ea3904 Bug 13744: Fix datatables paging on 'order from subscription' page
The paging of the datatable on the 'order from subscription' page
is broken without this patch.

To test:
- Make sure you have a subscription, note the vendor
- Create a new basket for this vendor
- Add a new order line 'from a subscription'
- Check paging on the result table displays correctly

Signed-off-by: Nicole <nicole@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:10:24 +01:00
Nicole
ad898e811c Bug 13771: Update manage staged marc help for 3.18
This updates the manage staged marc files help.

To test:

* Visit Tools > Staged MARC record management
* Click help
* Confirm it's there and correct

Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:08:17 +01:00
Nicole
fd4f8f1360 Bug 13771: Add missing item search help file
This patch adds a help file for the staff item search.

To test:

* Click search
* click item search
* click help
* review the help file

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:08:15 +01:00
Nicole
15dd5e9943 Bug 13771: Add admin help files for 3.18
This patch adds a new help file for column settings and updates the
files for budgets, funds, libraries, patron categories, and circ rules.

To test:

* Visit the above listed admin pages
* Review help files

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:08:14 +01:00
Nicole
008d0b3438 Bug 13771: Update Circ Help File
This updates the main circulation help file with new features in 3.18.

To test:

* visit circulation page
* click help
* review text

Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-03-07 21:08:12 +01:00