Commit Graph

15692 Commits

Author SHA1 Message Date
Katrin Fischer bded625db3 Bug 6394: purchase order has French strings hard coded in
On the purchase order it said 'publié par' - instead of 'published by'.

The layout files for PDF generation in basket groups contain lots of English
strings, this change makes the template more consistent.

Currently the files are not translatable. The only way is to add translated
files to your installation.

To test:
Print a basket group as PDF. Verify string is ok for both possible settings
of system preference OrderPdfFormat:
- pdfformat::layout3pages
- pdfformat::layout2pages

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fa238b1856)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-09-13 18:53:31 -04:00
Jared Camins-Esakov e24f8817e9 Bump version for 3.6.8 2012-08-21 21:07:00 -04:00
Jared Camins-Esakov 7953006520 Add release notes for 3.6.8 2012-08-21 21:06:32 -04:00
Frédéric Demians 62456c504b 3.6.8 Translation Update 2012-08-21 20:29:44 +02:00
Jared Camins-Esakov 52fe598c2d Don't run testcritic on directories that can't pass
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:39 -04:00
Paul Poulain 83f2a4d5c6 bug 6350 (history.txt) fixing typo
decmember is not a month afaik ;-)
(cherry picked from commit 9285b2899f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:39 -04:00
Chris Cormack 636390b51e Bug 6350 : Updating history
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Conflicts:

	docs/history.txt
(cherry picked from commit 42a46b481a)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:38 -04:00
Mason James 2ecd9544cc Bug 8315 - fix 'C4::Output 3.02' errors in Koha
modified:   opac/opac-ratings-ajax.pl
	modified:   opac/opac-tags.pl
	modified:   tags/review.pl

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:37 -04:00
Sophie Meynieux 001f1232b3 Bug 8191 : Adding a new value to 8 position of coded data field 100
From july 2012, unimarc norm evolves and the value k "monograph with both publication date and print date" must be added for this position.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked the new value shows up and is correctly copied into the field.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 83874c6214)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:37 -04:00
Marcel de Rooy 6b41d2ddcb Bug 7143 Followup for timeline
Fixes few tabs within date; adds a regex to fix mistakes with spaces.

Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ee53a0c6fa)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:36 -04:00
Matthias Meusburger 24fe36208e Bug 8282: Bug in modules list in about.pl
Last modules were not displayed if the number of modules did not match the number of rows of the table (when $number_of_modules % 4 != 0)

Signed-off-by: Marc Veron <veron@veron.ch>

Added some code to about.tt to have empty the last remaining cells, not sure if an other signoff is needed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d237f22ad)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:35 -04:00
Paul Poulain 46d02f728a Bug 8289 Upgrading from 2.2 does not work anymore
The updatedatabase22to30.pl script update the engine from MyISAM to InnoDB for most tables.

However, the TYPE=InnoDB was deprecated, and is not removed.
The correct syntax is now ENGINE=InnoDB

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4cb0aa5d30)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:35 -04:00
Maxime Pelletier d1acd3894d Bug 6634 : 3 more cases of manager_id not populated
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d43ec92b6c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:34 -04:00
Chris Cormack 9adf27d310 Fixing whitespace issues. Note to Paul, docs/history.txt is a tab
separated text file.
(cherry picked from commit e4acd9e24f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:33 -04:00
Paul Poulain 0a080b89fe Adding Claire Hernandez as contributor + adding missing contributors in about.tt
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:33 -04:00
Claire Hernandez 525d30f0b7 Bug 7994: Fix pref yaml errors
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:32 -04:00
Claire Hernandez bc02be6c16 Bug 7994: scripts to check yaml files
$ prove yaml_valid.t
checks a closed list of files
$ perl yaml_valid.pl -f myfile.yaml
try to load a yaml file with YAML::LoadFile and show errors

(both files pertidied)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5cb8c9f6e4)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:31 -04:00
Colin Campbell f2259a2354 Bug 8216: Allow SIP modules to pass critic tests
Add C4/SIP to perlcritic tests. Fix those issues that were
generating perlcritic errors

Signed-off-by: Stacey Walker <stacey@catalyst-eu.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:31 -04:00
Jared Camins-Esakov 0f6915adff Bug 6720: show authority type in auth details
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Authority type on detail page in staff now shows correctly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b38fb0d43)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:30 -04:00
Katrin Fischer 6462cc09a1 Bug 8232: Comments in OPAC contain untranslatable javascript messages
To test:
- add a new comment to a record in the OPAC
- Your comment (preview, pending approval) is not translatable
- update po files by running 'perl translate update <language>'
- Open po file and check if strings are there, translate
- install language again by running 'perl translate install <language>'

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:30 -04:00
Marcel de Rooy 959cac40ab Bug 7367 Followup for opac-suggestions template
This small typo was found by Albert Oller.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Very trivial fix.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 89e115c4d9)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:29 -04:00
Marcel de Rooy a13fbb992f Bug 7368 Followup for history.txt Only correcting whitespace for correct placement in about form
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Very trivial.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Conflicts:

	docs/history.txt

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:28 -04:00
Robin Sheat afce459827 Bug 8222 - make the zipcode no longer mandatory
Having the zipcode field mandatory by default is a bit annoying for
places where no one cares about it. This patch stops it being the case
on new installs.

Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fe5214ba5e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:28 -04:00
Mason James d3f5177ea0 patch for Bug 8226 - 'OpacFooter' markup/css improvements
Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4b1666e0bd)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:27 -04:00
christophe croullebois 93d3df9825 Bug 8136 Changes the expected lenght of 100$a in rebuild_zebra.pl
In rebuild_zebra.pl, if we are in "unimarc" ("marcflavour" syspref), the sub "fix_unimarc_100" is called and checks if 100$a lenght is equal to 35.
If it is not the case, the sub inserts the localtime and more, so we loose the datas in reindexing.
The standart lenght is 36.
I have just changed 35 to 36.

Signed-off-by: Sophie Meynieux <sophie.meynieux@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 68c6e00f16)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:26 -04:00
Sophie Meynieux dad248a255 Bug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch table, if items are not deleted because they are issued.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d928740952)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:26 -04:00
Sophie Meynieux f370fb5845 Bug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch table, if items are not deleted beacause on loan.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 45784a7183)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:25 -04:00
Christophe Croullebois 8251bdd673 Bug 7329: Items onloan are deleted when undoing import into catalog
this patch checks the "on loan" and "reserved" status before deleting item, and
do noting in this case, so the record can't be deleted due to existing item.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0b39f30a69)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:24 -04:00
Kyle M Hall 6c9b1f8bd8 Bug 6141 - html glitches causing problems to translator - 3.8.x
* opac-topissue.pl = untranslatable string removed
* authorities.pl missing _() in javascript

Rewrite of patch authored by Julian Maurice.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8403c9d2c7)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:24 -04:00
Dobrica Pavlinusic 2075889275 Bug 7952 - followup to fix t/Creators.t
Since we are now using temporary file, we are creating test.pdf
at end of test and checking if it exists and have non-zero size.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7526cc1042)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:23 -04:00
Dobrica Pavlinusic db56039e36 Bug 7952 - PDF::Reuse under plack writes to console STDOUT instead to browser
Without name option to prFile, PDF::Reuse opens '-' file which is real
console STDOUT on plack so pdf file gets emited to terminal instead of
sending it to browser.

This change creates temporary file using File::Temp, pass it to PDF::Reuse
and then reads it back and prints it out for plack (or CGI) to pick up.

Test secenario:

1. Home › Tools › Patron Card Creator › Manage Card Batches
2. select batch checkbox and click Export
3. select template and click Export
4. click on pdf file to download it

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e2e80737d3)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:22 -04:00
Owen Leonard 6b79121f39 Bug 8171 - Improper escaping of quotes during z39.50 queries leads to broken html
Implementing fix as suggested by Chris Cormack:

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8171#c4

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dc0cf0b329)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:22 -04:00
Frédéric Demians e7bcb7ced3 Bug 4838 Fix repeated authorities selection
How to test:

Create an authority, with more than one heading, for example a
UNIMARC multilingual author:

  200 $7 da
      $a 原
      $b 純輔
  200 $7 ba
      $a Hara
      $b Junsuke

In data entry form, on 700 field, you click on ... Search for the above author.
In auhtority search result page, you just have a 'Choose' link, and so you just
can select the first heading (in Chinesse writing).

Apply the patch. Repeat. Now you have, on result page, you have two links, and
can select one heading or the other.

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c215ba8117)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:21 -04:00
Amit Gupta fb630f0166 Bug 8166 - Adding new currencies & exchange rates
if not fill any field it save blank record

To Test:
1) Go to Currencies & Exchange rates.
2) Create New currency
3) If you not fill any field for ex: (Currency, rate, symbol)
   it will not save the record.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 42dbe025d9)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:21 -04:00
Chris Cormack 5d5974a867 Fixing tabs in docs/history.txt
NOTE: This is a tab separated file, please do not switch tabs for
spaces
(cherry picked from commit 4688e3df37)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:20 -04:00
Paul Poulain ecc3112e1b Adding Shari Perkins as contributor
(she submitted some patches for online help)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e844ce6650)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:19 -04:00
Sophie Meynieux 7dc1359c5c Bug 7815 : Order pickup libraries list by name rather than by code
Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 317479ff43)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:19 -04:00
Jonathan Druart 158577652c Bug 8009: Followup Item descriptive data not populated on pay.pl
Separation of title from the description.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c3b69a6f9c)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:18 -04:00
D Ruth Bavousett 1f86ed8a3b Bug 8009: Item descriptive data not populated on pay.pl
GetBorNotifyAcctRecord was not populating the {title} element of the
hash, which pay.tt will use.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 985e89fc09)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:17 -04:00
christophe croullebois e5d397f827 Bug 8197 : Software error when you have cleaned cookies and try to past the url to opac-topissues.pl
Try to delete cookies and paste the url to opac-topissues.pl.
Without the patch we have a Software error.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fa00315b2b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:17 -04:00
Fridolyn SOMERS 5ddfbd6171 BUG5312 XHTML correction in authority summary
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fd2a52bda9)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:16 -04:00
Marc Veron 187d318692 Bug 7586 - Search: Language restriction does NOT show expected results (no items shown)
modified:   etc/zebradb/marc_defs/marc21/biblios/record.abs

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 57ff55a84d)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:16 -04:00
Srdjan 8d840b139a bug_8138: added 773$t field to search results
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:15 -04:00
Katrin Fischer 40746407fb Bug 7834: order search at the top of acq does nothing
Entering a search term for 'title' or 'vendor' at the top search
form in acq (tab 'Orders search') did redirect to the advanced
search form, but didn't start the search.

After applying the patch the search will bring back results immediately
or redirect to the form, when there are no results.

To test:
- Check all searches still work as expected by searching for title,
vendor, order name and invoice number
- Check advanced search still has the search terms prepopulated
- Check searches with and without results are ok

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d55cde8ae5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:14 -04:00
Chris Cormack 3d7b70caa5 Bug 6679 :[SIGNED-OFF] Fixing some perlcritic violations in the opac
signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
(cherry picked from commit 6f3123bbc6)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:14 -04:00
Julian Maurice 0b56975be8 Bug 7807: [SIGNED-OFF] Fix call to GetSuggestionFromBiblionumber
This sub only takes one parameter

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 680e92115f)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:13 -04:00
Jared Camins-Esakov df82226988 Bug 7886 follow-up: DBrev number
Receives version 3.06.07.001

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:29:06 -04:00
Dobrica Pavlinusic 60cf55bceb Bug 7886 - C4/ShelfBrowser slow SQL performance
ShelfBrowser uses two SQL queries with syntax

WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?)
AND homebranch = ? AND location = ? AND ccode = ?

homebranch already has index, and adding indexes on ccode and location
improves performance by 30% for each query since MySQL is able to use
index_merge intersect(items_ccode,homebranch,items_location)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d8e702dd25)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:13:43 -04:00
Katrin Fischer a76ce7b49b Bug 7900: Link to vendor from subscription detail is broken
To test:
- Add a serial subscription with a link to a vendor
- Check the subscription detail page for the name and link to the vendor
- Check that the link works correctly

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bd52531d69)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:13:42 -04:00
Colin Campbell e8c67c3f93 Bug 2505 : Switch on warnings in circ/returns.pl
Removed a compile time warning caused by a void context
in a bit of too clever obscure code

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e7971380e8)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-08-11 07:13:41 -04:00