Mark Tompsett [Fri, 29 Jun 2012 13:54:44 +0000 (21:54 +0800)]
Bug 7630 - Warning on moremember.pl about param without key Move "$error => 1," to its own conditional $template->param()
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Mark Tompsett [Sat, 21 Jul 2012 14:04:23 +0000 (22:04 +0800)]
Bug 8489: Revise Ubuntu install files
1) Changed ubuntu-pkg-check.sh to use lsb_release to determine version
of ubuntu.{version}.packages file. If a versioned file does not
exist, the user is warned, and ubuntu.packages is used. Told the
user which file is being used. Caught apt-cache policy errors nicely.
NOTE: ubuntu.packages MUST BE A COPY OF THE
LATEST ubuntu.{version}.packages FILE!
2) Moved: ubuntu.packages -> ubuntu.10.04.packages
ubuntu_maverick.packages -> ubuntu.10.10.packages
ubuntu.precise.packages -> ubuntu.12.04 packages
(last file created new, but effectively supersedes bug 8488)
3) Tweaked ubuntu.12.04.packages:
* changed yaz3 references to yaz4
* dropped libmysqlclient16-dev
* changed libmysqlclient16 to libmysqlclient18
4) Copied the ubuntu.12.04.packages file to ubuntu.packages
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
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>
Sophie Meynieux [Tue, 5 Jun 2012 15:44:25 +0000 (17:44 +0200)]
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 83874c62142b99f3a09ec9a7384e4ac6bfe8a1c2)
Marcel de Rooy [Thu, 21 Jun 2012 09:01:15 +0000 (11:01 +0200)]
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 ee53a0c6fae18ca247a589e485455dfc6d333d04)
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 7d237f22adc9b8f3b2ba927995dc307e58e6a1e1)
Paul Poulain [Fri, 22 Jun 2012 09:10:18 +0000 (11:10 +0200)]
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 4cb0aa5d30dd044f50b9caacb59cd7bf39226070)
Maxime Pelletier [Wed, 28 Mar 2012 21:26:01 +0000 (17:26 -0400)]
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 d43ec92b6cb3fe33fe8dbd626aec2a005a212c5d)
Claire Hernandez [Mon, 11 Jun 2012 13:52:10 +0000 (15:52 +0200)]
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>
$ 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 5cb8c9f6e44aa9874231bae5a909cb4a4f3473b5)
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 4b38fb0d4346480f7acefaf3d6976952bb2307c3)
Katrin Fischer [Mon, 11 Jun 2012 14:09:00 +0000 (15:09 +0100)]
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>
Marcel de Rooy [Thu, 14 Jun 2012 06:31:46 +0000 (08:31 +0200)]
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 89e115c4d9f5ae55d824200464e9541ece2eec0e)
Robin Sheat [Sun, 10 Jun 2012 14:56:21 +0000 (15:56 +0100)]
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 fe5214ba5e326d23a2b689cd945012325107b9e0)
Mason James [Mon, 11 Jun 2012 04:40:04 +0000 (16:40 +1200)]
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 4b1666e0bd4038e05a45acd42982a0f55f97be31)
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 68c6e00f1659e66a3fcf60752d5ed7a67688b119)
Sophie Meynieux [Sun, 10 Jun 2012 15:01:26 +0000 (17:01 +0200)]
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 d92874095256058756b08aec4fcaf7b4316bca7f)
Sophie Meynieux [Sun, 10 Jun 2012 10:23:20 +0000 (12:23 +0200)]
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 45784a7183095bc9bbe4761fd26e385386d822d1)
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 0b39f30a69da728586d9cb27ed6f50983e3336d9)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8403c9d2c74694dd482b1d020d847defb8e8c4f7)
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 e2e80737d354323be820e4176c2a965440ff089b)
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 dc0cf0b3290e642b33f44ff465976ac915d952d7)
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 c215ba8117e727ed8b91e55dde30f5256c0f3064)
Amit Gupta [Wed, 30 May 2012 07:07:33 +0000 (12:37 +0530)]
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 42dbe025d953ef9809a1330be4517e393d49ea4a)
Jonathan Druart [Tue, 15 May 2012 14:29:46 +0000 (16:29 +0200)]
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 c3b69a6f9ce800e999cc9e1276bb402863953c85)
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 985e89fc09f36707f562dba68e1dfb4f55ed804e)
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 fa00315b2b61c3c1824b7af185317c1b3503c66f)
Fridolyn SOMERS [Mon, 22 Aug 2011 13:14:24 +0000 (15:14 +0200)]
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 fd2a52bda95b54d94df6fc870d002baff0d5f27b)
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 57ff55a84dfcf1c7b4d9851ccafe842ff074e4e0)
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit ee3ffc006cd574eae85c8cd20d885133a9ffde3a)
Frédéric Demians [Mon, 14 May 2012 07:57:50 +0000 (09:57 +0200)]
Bug 8062 [SIGNED-OFF] Cart email broken for non english templates
Fix basket email sent from OPAC. The email body is now generated HTML
(to be translatable), and converted into TEXT before beeing sent by
email.
To test that it works in other language than English, you have to update
your language .po file:
perl translate update de-DE
Then, translated strings coming from opac-sendbasket.tt, and install the
translation:
perl translate install de-DE
New dependency: Template::Plugin::HtmlToText
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(Conflicts in koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
resolved by replacing the file with the version from 3.8.x)
Katrin Fischer [Mon, 9 Apr 2012 07:48:46 +0000 (09:48 +0200)]
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 d55cde8ae5b09bce0d93c2bfac26de6d27a4507a)
Paul Poulain [Tue, 10 Apr 2012 13:08:47 +0000 (15:08 +0200)]
Bug 2505 follow-up: C4::Ris not ready for use strict;use warnings;
The patch pushed a few hours ago is a good 1st step in the right direction.
however, many things are still to do to have the script OK with strict/warning, so commenting them
Errors if you have them:
Global symbol "$utf" requires explicit package name at C4/Ris.pm line 111.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 353.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 363.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 389.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 431.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 438.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 439.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 440.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 441.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 442.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 443.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 464.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 465.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 466.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 479.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 480.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 483.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 484.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 485.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 501.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 505.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 527.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 530.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 539.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 540.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 556.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 557.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 561.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 562.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 578.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 579.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 583.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 584.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 613.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 614.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 629.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 630.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 645.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 646.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 674.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 706.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 710.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 715.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 721.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 725.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 729.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 731.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 734.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 735.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 738.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 772.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 776.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 779.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 789.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 892.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 895.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 901.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 935.
Global symbol "$utf" requires explicit package name at C4/Ris.pm line 962.
Global symbol "$uniout" requires explicit package name at C4/Ris.pm line 966.
C4/Ris.pm had compilation errors.
(cherry picked from commit 5d9c7dfe040ca0302095a5641060388b14b9e984)
Julian Maurice [Thu, 22 Mar 2012 16:20:01 +0000 (17:20 +0100)]
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 680e92115f109bec50562de7043df17add8b26eb)
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)
Katrin Fischer [Fri, 6 Apr 2012 15:09:30 +0000 (17:09 +0200)]
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 bd52531d69e0f86093a16101f87743a9f8b0c892)
Colin Campbell [Wed, 15 Jun 2011 11:15:14 +0000 (12:15 +0100)]
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 e7971380e8ff699b57d0c02b2406eca254dfd04a)
Sponsored-by: Los Gatos Public Library Sponsored-by: NEKLS Sponsored-by: East Brunswick Public Library Sponsored-by: Athens County Public Libraries Sponsored-by: Horowhenua Library Trust Sponsored-by: Halton Borough Council Sponsored-by: South Taranaki District Council Sponsored-by: Arcadia Public Library
Katrin Fischer [Sat, 9 Jun 2012 18:20:52 +0000 (19:20 +0100)]
Bug 7548: Missing arguments when receiving orders
Patch redone for 3.6.x to fix TT scoping problems and taking care
of changed variable names (booksellerid vs supplierid).
To test:
Check pagination works correctly when receiving orders.
Invoice number and date received should always appear in your URL
and be shown at the top of the website.
Signed-off-by: MJ Ray <mjr@phonecoop.coop> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
MJ Ray [Wed, 4 Apr 2012 09:23:06 +0000 (10:23 +0100)]
bug 7894 [SIGNED-OFF]: crude fix: convert results array into an arrayref
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
This patch fixes the problem with the first record on the second
page, but there is still a problem with the next/previous links,
as described in comments 3 and 4 in the bug report. I'm signing
off since it's unclear wether that problem is directly linked to
the "first record on the second page" problem, and a partial fix
seems better than no fix at all.
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Colin Campbell [Fri, 1 Jun 2012 07:10:21 +0000 (08:10 +0100)]
Bug 8176 [SIGNED-OFF] Assign an intial value to $sqlwhere
warnings in log because of undefined value in
string concatenation
variable should be initialized to empty string rather
than left undefined
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Removes a warning in logs
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>
Colin Campbell [Thu, 18 Aug 2011 15:48:44 +0000 (16:48 +0100)]
Bug 3638 : Captured Holds may need to generate a transfer
If a discharged item is captured for a hold at another branch
the selfcheck should generate a branchtransfer for it.
This was complicated as the checkin routine was setting its own
location from a field not set in many scm machines (e.g. 3M)
also in ILS::Transaction the test for location was incorrect
assuming that an empty string or undefined was a valid location
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Colin Campbell [Mon, 4 Jul 2011 15:44:16 +0000 (16:44 +0100)]
Bug 3638 Self Check Should Capture Hold Items
Shelf Check was receiving messages saying item was wanted
for a hold but the item was discharged to the shelf
not associated with the hold or transited to
the pickup location. The message was also being sent
on discharge of items when a suitable item had already
been captured.
Checkin now associates the item with the hold and sets
the appropriate data for a correct checkin response
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Mon, 14 May 2012 01:48:53 +0000 (13:48 +1200)]
Bug 8082: Fixing circulation.pref to match reality for IssuingInProcess
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, changes are as advertised.
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>
Piotr Kowalski [Mon, 28 May 2012 09:50:49 +0000 (21:50 +1200)]
Bug 8116 : Fixing warn in error log
Signed-off-by: Chris Cormack <chrisc@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>
Owen Leonard [Wed, 16 May 2012 16:44:56 +0000 (12:44 -0400)]
Bug 8111 - Language chooser display problem in self-checkout
- Adds required JavaScript and JavaScript linked files
- Updates CSS with changes relevant to this feature which had
been made to the main CSS file.
- Removes an image file which has been made obsolete now that
sco.css uses the main image sprite like opac.css does.
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Due to a dependency cycle between C4::Search and C4::Items, searches
in the OPAC die spectacularly under Plack. This counter-patch extends
dpavlin's solution and replaces use with require for C4::Search in
C4::Items and for C4::Items in C4::Search.
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>
Owen Leonard [Tue, 22 May 2012 18:42:42 +0000 (14:42 -0400)]
Bug 7599 - [SIGNED-OFF] Cart JavaScript contains untranslatable English strings
To simplify the sentence structure for better translation flexibility
the message now reads:
"Item in your cart: " + number
Fixed in both OPAC and staff client, although I'm not sure
the message is actually triggered in the staff client.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Strings become translatable
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>
Kyle M Hall [Wed, 23 May 2012 11:43:59 +0000 (07:43 -0400)]
Bug 8140 - [SIGNED-OFF] Error when exporting label xml
It appears that the name of a variable was changed,
but the declaration of said variable was not.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.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>
Chris Cormack [Mon, 21 May 2012 08:06:36 +0000 (20:06 +1200)]
Bug 4330 : Adding copyright headers and fixing FSF addresses
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Sun, 20 May 2012 23:03:21 +0000 (11:03 +1200)]
Bug 4330 : Fixing FSF address and copyright headers for acqui/
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Sun, 20 May 2012 10:30:41 +0000 (22:30 +1200)]
Bug 4330 : Adding missing license statement
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Sun, 20 May 2012 10:27:29 +0000 (22:27 +1200)]
Bug 4330 Fixing FSF statements
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Sun, 20 May 2012 10:14:04 +0000 (22:14 +1200)]
Bug 4330 : Fixing FSF address and copyright statements
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Sun, 20 May 2012 09:55:55 +0000 (21:55 +1200)]
Bug 4330 : Fixing FSF address and copyright headers
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Simon Story [Fri, 18 Nov 2011 14:52:09 +0000 (14:52 +0000)]
Bug 6684: Fixes to koha-remove
Fixes bugs 6684 6997 4880:
6684 koha-remove should check the number of arguments it gets
6997 koha-remove leaves system in inconsistent state if there is an error
4880 koha-remove sometimes fails because user is logged in
Amended by chrisc@catalyst.net.nz
Trying to resolve conflicts.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on top of bug 7924.
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>
Kyle M Hall [Mon, 14 May 2012 12:22:14 +0000 (08:22 -0400)]
Bug 8080 - login and password is pre-filled by the browser when creating a new patron
When creating a new patron, if you have chosen to let your browser remember your
login and password for you, the login and password fields will be pre-filled with
them, leading to a systematic error "the passwords entered do not match" since
the second password field was not filled. These fields should be blank.
Add the directive autocomplete="off" to the memberentry form tags.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
enhances usability of password forms, gets my signoff.
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>
Amit Gupta [Tue, 22 May 2012 10:32:31 +0000 (16:02 +0530)]
Bug 5795 Update the database as follow-up If sys pref
ReservesControlBranch has null then update the table to
insert a PatronLibrary as value
To Test:
1) Go to mysql use koha database
2) select * from systempreferences where variable = 'ReservesControlBranch'; Check if value set to ItemHomeLibrary.
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| variable | value | options | explanation | type |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| ReservesControlBranch | PatronLibrary | ItemHomeLibrary|PatronLibrary | Branch checked for members reservations rights. | Choice |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Conflicts:
installer/data/mysql/updatedatabase.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fixed for 3.8.x
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sat, 14 Apr 2012 11:12:54 +0000 (13:12 +0200)]
Bug 5795 [SIGNED-OFF] - Missing ReservesControlBranch system pref in database installer
sysprefs.sql file was missing ReservesControlBranch.
To test:
1) Create a new installation and check sysprefs.sql loads correctly.
2) Check ReservesControlBranch shows up correctly in the sys pref editor.
3) Check sys pref can be edited and new value saves correctly.
Signed-off-by: Marc Veron <veron@veron.ch>
- Line is added at the end of installer/data/mysql/sysprefs.sql
- Tested Line diretly in MySQL with a systempreferences table where variable 'ReservesControlBranch' was missing. Data inserted correctly.
- Syspref shows up in Staff client
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
- Fixed merge conflict
Conflicts:
installer/data/mysql/sysprefs.sql
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
- Tidied for 3.8.x
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Thu, 29 Mar 2012 13:54:38 +0000 (09:54 -0400)]
Bug 3521 - Items table in catalogue/detail.pl and cataloguing/additem.pl is sorted nonsensically
Based on patch submitted by Ian Walls
Items were sorted by branch, then date accessioned, in GetItemsInfo. While this can be
helpful in some circumstances, more often it is useful for items to be sorted first by
their enumchron (volume/issue, if applicable) then by their copy number. This patch changes the
sort on GetItemsInfo to branch, enumcrhon, copynumber then date accessioned.
As sorting on copynumber will be incorrect based on standard sorting ( e.g. 1, 10, 2, 20 ),
the copynumber is now padded with leading zeros to correct the sorting ( e.g. 01, 02, 10 20 ).
This function appears to be a standard SQL function and not a mysql-ism. I have verfified
that is available in MySQL, Postgres, and Oracle.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passed t xt
Item sorts appear to be correct to me based on the rubric of branch, enumchron, copynumber, then date accessioned.
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>
Kyle M Hall [Thu, 12 Apr 2012 15:16:20 +0000 (11:16 -0400)]
Bug 7948 - Printing transfer slip loses barcode field focus
* Refocus on barcode field after running Dopop()
* Cleaned up javascript, removed tabs
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
works as advertised.
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>
Katrin Fischer [Sat, 14 Apr 2012 12:43:32 +0000 (14:43 +0200)]
Bug 7604 - Link on basket group name for closed basket groups is broken
Fixes the intended behaviour of the link on the basket group name
for closed basket groups by adding a missing '='.
Clicking the link will reopen the basket group.
Signed-off-by: Chris Cormack <chrisc@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>
Robin Sheat [Tue, 24 Apr 2012 04:43:56 +0000 (16:43 +1200)]
Bug 8001: [SIGNED-OFF] improve styling potential of the tag list
This adds the class name "tagterm" to the terms in the list of a user's
tags in the OPAC, allowing them to be seperately styled.
signed-off-by: Jonathan Druart <jonathan.druart@biblibre.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>
Kyle M Hall [Thu, 15 Mar 2012 20:27:07 +0000 (16:27 -0400)]
Bug 7722 - Insidious problem with searching
I cannot find the root cause of this issue, but multiple libraries that I am aware of have problems searching on particular search terms ( and never the same terms at the same library ). The error they get when they trigger this problem is:
Tag "" is not a valid tag. at /home/koha/kohaclone/C4/Biblio.pm line 1849
Something somewhere is adding empty keys to C4::Context->marcfromkohafield, I think it may have something to do with the analytics feature that was added.
In the while loop for TransformKohaToMarc, there is a line
next unless my $dtm = $db_to_marc->{''}->{$name};
I don't think it's working.
If I dump $dtm, for each search, I see the dump twice.
It looks like this:
$VAR1 = [
'952',
'w'
];
$VAR1 = [];
I think the second time, when it is empty is what's breaking this.
The next never fails because even though it is empty, it is still a valid arrayref.
The solution I have some up with is to skip over the elements where the arrayref is empty.
Signed-off-by: Ian Walls <koha.sekjal@gmail.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>
Simple command-line client which can authorize itself to Koha,
get MARC XML record based on biblio number and update record
This script can also be used as module using require "koha-svc.pl"
from other scripts which can implement MARC XML creation or parsing.
This is follow up version which now uses Content-type: text/xml
header when using POST method to be in sync with documentation at
http://wiki.koha-community.org/wiki/Koha_/svc/_HTTP_API
Signed-off-by: Chris Cormack <chrisc@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>
Bug 8022: Permissions test doesn't check all languages
Add the permissions files for es-ES and nb-NO to the permissions test.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Running xt/permissions.t before the patch leaves out nb-NO and es-ES.
After the patch they are picked up and the test fails correctly
because of the missing permissions described in Bug 7984.
As far as I can tall, all permission files are now picked up by
this test.
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>
Jonathan Druart [Wed, 28 Mar 2012 13:27:50 +0000 (15:27 +0200)]
Bug 7820: Followup: Add missing Debian packages
Adds DateTime::Set used in Koha/Calendar.pm
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>
Ian Walls [Sat, 24 Mar 2012 13:50:29 +0000 (09:50 -0400)]
Bug 7820: Add missing Debian packages
Adds DateTime::Format::DateParse, Readonly, Readonly::XS and Modern::Perl
Debian packages to install_misc/debian.packages
Signed-off-by: Marc Balmer <marc@msys.ch> Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Sign off for Marc Balmer added manually by Ian Walls on Mar 24, 2012 by
permission (see IRC chat log)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Mason James <mtj@kohaaloha.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>
Magnus Enger [Wed, 25 Apr 2012 12:28:32 +0000 (14:28 +0200)]
Bug 8008 - Fix typo in man page for koha-create
Line 121 had "/etc/koha/koha-site.conf" instead of "/etc/koha/koha-sites.conf"
To test:
I don't think this needs any actual testing, just read the patch and check
that it looks sensible...
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> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Wed, 11 Apr 2012 06:06:00 +0000 (08:06 +0200)]
Bug 7929 - Duplicate id "availability" on XSLT result page
Changes id="availability" to class="availability" for XHTML valididy
(ids have to be unique on a page).
Signed-off-by: mveron <veron@veron.ch> Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Fri, 20 Apr 2012 11:16:13 +0000 (12:16 +0100)]
Bug 7987 [SIGNED-OFF] Fix typo in circulation template
li was not properly closed after loss of a character
Signed-off-by: Marc Veron <veron@veron.ch>
- Checked koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt before / after applying patch
- Line is changed as expected, ends now with </li>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Tue, 3 Apr 2012 18:23:47 +0000 (20:23 +0200)]
Bug 2399: Follow up removing MySQLisms from ru-RU and uk-UA sample files
Signed-off-by: Chris Cormack <chrisc@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>
Katrin Fischer [Mon, 2 Apr 2012 17:28:37 +0000 (19:28 +0200)]
Bug 2399: All status fields in the item edit interface offer two blank/null entries per dropdown instead of one
Removes the '0' values without description from the sample date for
authorised values.
To test:
1) Verify that SQL files load correctly
- truncate authorised_values; /* empty authorised values table */
- load sample data using one of the SQL files
2) Check cataloging interface - all status fields should only show 1 empty line
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Mon, 9 Apr 2012 09:44:06 +0000 (11:44 +0200)]
Bug 3413: Checkboxes for new subfields not saving correctly
The bug was in the numbering of the fields and subfields in the form.
The form elements for the 'new subfield' got the same numbered names and ids as
the form elements for the second subfield. (example: repeatable1)
The patch fixes the numbering to continue to the new subfield.
To test:
- Create some new subfields and check all checkbox fields save correctly
(mandatory, repeatable, is url)
- Check that other subfields' checkboxes are not changed
- Check existing subfields and newly created subfields can be edited
Signed-off-by: mveron <veron@veron.ch> 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>