Commit Graph

22865 Commits

Author SHA1 Message Date
Chris Cormack 2be314d9f0 Plaintext release notes 2015-03-22 18:52:57 +13:00
Chris Cormack 0d69c03530 Release notes 2015-03-22 18:51:02 +13:00
Chris Cormack f851a35af6 Bumping db version for 3.18.5 release 2015-03-22 18:41:24 +13:00
Chris Cormack 12eda938a1 Merge remote-tracking branch 'bernardo/3.18.05-translate' into 3.18.x 2015-03-22 18:32:45 +13:00
Dobrica Pavlinusic ab60b4a60b Bug 13709 - Patron cards creator utf-8 encoding and ttf fonts broken
This change is similar to Bug 8375 which introduced ttf fonts for
labels printing in order to support diacritics and utf-8 encoding,
but this change was never implemented for patron cards.

Test scenario:

1. make sure that you have <ttf> font mapping in koha-conf.xml
2. define partron card layout, template, profile and batch
   (with utf-8 chars, probably in patron firstname or surname)
3. verify that without this patch pdf export file is error message
   Wide character in compress at /usr/share/perl5/PDF/Reuse.pm line 820
4. apply this patch and verify that generated pdf has correct encoding

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>
(cherry picked from commit d149cd1d97)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 18:25:05 +13:00
Jonathan Druart 5168af2c23 Bug 13586: Remove some other occurrences
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>
(cherry picked from commit 6b3fd48f3f)
2015-03-22 18:16:05 +13:00
Jonathan Druart eae219c19e Bug 13586: Remove the entire block
Previous patch remove the condition but not the block tested.
The entire block should be removed.

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>
(cherry picked from commit a5290b2f9d)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 18:15:45 +13:00
Rochelle 82f30ad218 Bug 13586: Makefile.PL mentions win32
Edited Makefile.PL to remove mentions of win32
To test: Run Makefile.PL

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>
(cherry picked from commit 4c196e62c6)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 18:14:55 +13:00
Jonathan Druart bc92c93a28 Bug 13836: Does not separate symbol and value if symbol is not displayed.
This patch force the separation between the symbol and the value to an
empty string if the symbol is not displayed.

Tested with locale de_CH.UTF-8, prove t/Prices.t is now successful.
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>
(cherry picked from commit 15468615f9)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 18:12:50 +13:00
Nicole 655004d921 Bug 10703: Add more serial table DB documentation
This patch adds a bit more documentation to the serial related tables
in Koha.

To test, apply the patch and review the kohastructure for comments

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 17a886aed2)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 11:12:41 +13:00
Nicole d6fc541b3b Bug 10703: Update Patron DB Documentation
Update patron categories and patron restrictions DB docs.

To test:

* Review database documentation for categories
* Review database documentation for patron_debarments

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 5263a9e0e9)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 11:12:19 +13:00
Nicole d633259ff9 Bug 10703: Update stats table documentation
This patch updates the DB documentation for the statistics
table.

To test review the file and cofirm that documentation is there

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7404b4f177)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 11:11:50 +13:00
Nicole b43d8392b7 Bug 10703: Update course reserves DB documentation
To test review database documentation to see that course tables are
all documented.

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 657d4b497a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 11:11:31 +13:00
Katrin Fischer 31b5bda659 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>
(cherry picked from commit f3e02d2496)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 11:07:16 +13:00
Katrin Fischer 5edda1d0c3 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>
(cherry picked from commit cb9e57cfe0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 11:01:22 +13:00
Tomas Cohen Arazi 2a803271c2 Bug 13814: (QA followup) test for generated warnings
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit a3775ceccd)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 11:00:40 +13:00
Julian FIOL d77263f129 Bug 13814 : Add Lines Alignment
Signed-off-by: Marc Veron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 6be59e14a2)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 10:58:26 +13:00
Julian FIOL a010721271 Bug 13814 : add 6 unit tests in t/Boolean.t
Works as expected.
Signed-off-by: Marc Veron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d11c144eac)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-22 10:57:55 +13:00
Bernardo Gonzalez Kriegel 8b46552287 Translation updates for Koha 3.18.05 release 2015-03-21 16:55:02 -03:00
Chris Cormack 77b5850b3c Bumping version number 2015-03-17 21:01:27 +13:00
Jonathan Druart 46b13460f9 Bug 13380: Wording changes
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cd5752f372)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-17 21:00:34 +13:00
Jonathan Druart 9e82e5acce Bug 13380: Add ORDER_CANCELLATION_REASON AV to all language files
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 7c224d1cb0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-17 21:00:12 +13:00
Jonathan Druart 8ecb0ef544 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>
(cherry picked from commit b475728a50)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:
	installer/data/mysql/updatedatabase.pl
	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
2015-03-17 20:31:35 +13:00
Jonathan Druart 7a17ca5833 Bug 13380: Add the AV in the install files
(This will completely done when the patch will be QAed)

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>
(cherry picked from commit 2c7457a0d4)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-17 20:27:05 +13:00
Katrin Fischer adedefb512 Bug 13648: OPAC = hidden removes pull down from edit item form
If you uncheck the checkbox OPAC in the bibliographic framework
definition for an item subfield that is linked to an authorized
value list, the pull down will disappear from the item edit
form on staff. The label still shows.

1) Go to administration > bibliographic frameworks
2) Select a framework and go to the item field (MARC21: 952)
3) Edit a subfield with an authorized values list like damaged,
   lost or withdrawn
4) Uncheck the checkbox for OPAC visibility
5) Edit or add an item within your chosen framework
6) Verify the subfield code and description are shown, but the
   pull down has disappeared
7) Apply patch, verify the pull down shows now
8) Also test following hidden combination works correctly:
   OPAC: checked
   All other options: unchecked

Documentation of hidden values:
http://wiki.koha-community.org/wiki/Hidden_values

With special thanks to Jonathan Druart for helping me figure this out!

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fbf73f4318)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-16 13:23:14 +13:00
Jonathan Druart 4936aba7a6 Bug 13746: Add tests
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 476febe5db)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Conflicts:
	t/db_dependent/Serials.t
2015-03-16 13:21:54 +13:00
Katrin Fischer d04a97a342 Bug 13746: On creating a new subscription, notes fields get confused
For every subscription we have 4 notes fields in Koha, 2 are in the
subscription itself and another 2 are in the subscription history.

When creating a new subscription, the notes fields from the
subscription get copied to the fields of the subscription history,
leading to doubled up display of notes in the OPAC.

To test:
- Add a new subscription without patch
  - check manual history
  - Fill in both notes fields
- Verify that the notes fields got also saved into the
  subscription history (easy from the Summary tab)
- Apply patch
- Add another subscription, like above
- Verify now only the subscription notes fields are saved
- Edit subscription and notes - verify all is ok
- Edit subscription history (Planning tab) - verify all is ok

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>
(cherry picked from commit b5fac05bc3)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-16 13:17:40 +13:00
Jonathan Druart b4d77d7c78 Bug 13578: Make sure the 'public' parameter is passed to the last step
If no caching system is up ($usecache == 0), the public parameter is
lost on the step 3.
The hash passed to the template looks like:
   'cache_expiry', 300,
   'cache_expiry_units',
   'public', 1
So the template receives cache_expiry = 300, cache_expiry_units =
'public' and 1 = undef.

This patch fixes the problem passing the cache_expiry* parameters only
if the usecache is set.

Test plan:
0/ Disable any caching system
1/ Create a new public report and go up to the 6th step, save the report
and verify the report is created as public
2/ Enable a caching system
2/ Create a public report with a cache expiry value, save it and verify
the report is created as public and the cache expiry value is correct.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fe986573dd)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:46:36 +13:00
Tomas Cohen Arazi f8ee8c5006 Bug 13785: (QA followup) koha-disable should stop the indexer daemon
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit fdca44709e)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:41:37 +13:00
Larry Baerveldt a46c2d2116 Bug 13785: koha-disable should also stop SIP and zebra for instance
Currently koha-disable ONLY disables the instance in the apache conf
file. Presumably if you want to disable the instance, you also want
its processes to stop, so this patch will stop zebra, if running,
and SIP, if enabled.

Depends on Bug 13784.

To Test:
1) Have an enabled instance, with zebra and SIP running.
2) Run koha-disable INST. Note that after, both zebra and SIP
   will still be running.
3) Re-enable INST.
4) Apply patch, and then copy debian/scripts/koha-disable to
   package site, over /usr/sbin/koha-disable.
5) Run koha-disable INST. You should now see that both zebra
   and SIP have been stopped.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 1fd9cdcdb0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:41:20 +13:00
Marc Véron 778ae6a30d 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>
(cherry picked from commit e0863d9711)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:39:00 +13:00
Pasi Kallinen 02521f7ed2 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>
(cherry picked from commit 901fdce2c6)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:36:17 +13:00
Kyle M Hall 6420117ecd 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>
(cherry picked from commit d501637861)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:33:10 +13:00
Bernardo Gonzalez Kriegel 10084d00ac 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>
(cherry picked from commit 379e9cbe1e)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:31:10 +13:00
Marc Véron 66afc74c05 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>
(cherry picked from commit 6004b2492b)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:28:52 +13:00
Matthias Meusburger b8bbabadee Bug 12631: Inventory: fix "wrong place" and "item not scanned"
"item not scanned": when calling GetItemsForInventory, datelastseen should
 be used when "compare barcodes list to result" is checked.

 Otherwise, when loading multiple barcodes files for the same inventory, many
 items will be marked as "item not scanned" when loading the last barcode file
 ("compare barcodes list to result" checked) even though they were scanned.

 "wrong place": when searching for wrongly placed items, we should only check
 for the location (callnumbers, location and branch). To fix this, A new call
 to  GetItemsForInventory has been made with location filters only.

 Otherwise, any item with a different itemtype for instance will be marked as
 wrong place even if the location is correct.

 Test plan:

"item not scanned" status:

1) Split a barcode file in two.
2) Load the first barcode file without checking "compare barcodes list to result".
3) Load the second barcode file with "compare barcodes list to result" checked.
4) Check in the csv report that you have a lot of scanned items with the "item
not scanned" status.

Then apply the patch, do the same, and check that the false "item not scanned"
statuses are gone.

"wrong place" status:

1) Load a barcode file with barcode matching an item that has a correct
location, but a different itemtype than what you're looking for.
2) Check in the results that this item will be marked as "change item status"
and "wrong place".

Then apply the patch, do the same, and check that the only status for this item is "change item status", which is correct.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit bafceab9bd)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:27:13 +13:00
Jonathan Druart a53d18ac7c 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>
(cherry picked from commit d3405211be)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:26:06 +13:00
Katrin Fischer f74865fd4b 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>
(cherry picked from commit 1bd8f5e6f7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:25:57 +13:00
Tomas Cohen Arazi d955ad9246 Bug 13784: (QA followup) allow running Zebra for disabled instances on packages
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit ee3c31076b)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:24:26 +13:00
Larry Baerveldt 3662ebebc8 Bug 13784: koha-stop-zebra should also work for disabled instances
Currently koha-stop-zebra will not stop zebra for disabled instances. It should
work more like koha-stop-sip, which does work for disabled instances. Also,
koha-stop-zebra is called by '/etc/init.d/koha-common stop' which clearly
should also apply to disabled instances.

To Test:
1) Disable a koha instance.
2) Run koha-stop-zebra INSTANCE. You should get message
   "Instance INSTANCE disabled. No action taken."
3) Apply patch, and copy patched file debian/scripts/koha-stop-zebra
   to package site over /usr/sbin/koha-stop-zebra.
4) Disable koha instance.
5) Run koha-stop-zebra INSTANCE. It should now stop zebra.

http://bugs.koha-community.org/show_bug.cgi?id=13784
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 77809ccd32)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-03-14 11:24:07 +13:00
Mark Tompsett 12afc7baea 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>
(cherry picked from commit f71f1ba6e2)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:28:39 +13:00
Katrin Fischer 7caaaff926 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>
(cherry picked from commit dad48bcf0a)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:27:26 +13:00
Katrin Fischer cfab129501 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>
(cherry picked from commit 92656844d8)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:27:11 +13:00
Katrin Fischer 536d558231 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>
(cherry picked from commit d9d0ea3904)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:26:58 +13:00
Nicole 470270ece7 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>
(cherry picked from commit ad898e811c)
2015-03-13 14:17:44 +13:00
Nicole 61d0b62ed1 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>
(cherry picked from commit fd4f8f1360)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:17:33 +13:00
Nicole 0294120b9d 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>
(cherry picked from commit 15dd5e9943)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:17:17 +13:00
Nicole 1ccd5f6590 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>
(cherry picked from commit 008d0b3438)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:16:59 +13:00
Nicole C. Engard 87eeaa4214 Bug 13771: Main Page Help fro 3.18
This updates the main page help file for 3.18.

To test:
* Log in to staff cleint
* Click help on the mian page
* Review help file

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>
(cherry picked from commit 9702bf1211)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:16:03 +13:00
Nicole C. Engard 25dccdbed8 BUG 13771: Update Tools Help Files for 3.18
This patch creates a helpf ile for the batch record delete tool
and updates the help files for notices and marc export.

To test:

* Visit tools > batch record deletion
* confirm help is right
* Visit tools > Notices & Slips
* confirm help is right
* Visit tools > export marc
* cofirm the help is right

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit cee9f08bcb)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2015-03-13 14:15:44 +13:00