Commit graph

17022 commits

Author SHA1 Message Date
0760a4b988 Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Utils.pm
Subroutine prototypes used at line 38, column 1.  See page 194 of PBP.  (Severity: 5)

Subroutine prototypes used at line 43, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:39 +02:00
c4f041a9d6 Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/Items.pm
"return" statement with explicit "undef" at line 508, column 44.  See page 199 of PBP.  (Severity: 5)
"return" statement with explicit "undef" at line 2267, column 5.  See page 199 of PBP.  (Severity: 5)
Variable declared in conditional statement at line 2642, column 21.  Declare variables outside of the condition.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:39 +02:00
c42f6fbdb2 Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/Message.pm
"return" statement with explicit "undef" at line 109, column 9.  See page 199 of PBP.  (Severity: 5)
"return" statement with explicit "undef" at line 145, column 9.  See page 199 of PBP.  (Severity: 5)
"return" statement with explicit "undef" at line 319, column 9.  See page 199 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:39 +02:00
7b09ce3a22 Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/Output.pm
"return" statement with explicit "undef" at line 128, column 74.  See page 199 of PBP.  (Severity: 5)
Subroutine prototypes used at line 270, column 1.  See page 194 of PBP.  (Severity: 5)
Subroutine prototypes used at line 308, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-09-20 12:01:38 +02:00
16cc80d2bd Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/SQLHelper.pm
Subroutine prototypes used at line 251, column 1.  See page 194 of PBP.  (Severity: 5)
Subroutine prototypes used at line 287, column 1.  See page 194 of PBP.  (Severity: 5)
Subroutine prototypes used at line 317, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:38 +02:00
162d81d536 Bug 6679 - [SIGNED-OFF] fix 4 perlcritic violations in C4/Branch.pm
Subroutine prototypes used at line 157, column 1.  See page 194 of PBP.  (Severity: 5)
Subroutine prototypes used at line 375, column 1.  See page 194 of PBP.  (Severity: 5)
Subroutine prototypes used at line 385, column 1.  See page 194 of PBP.  (Severity: 5)
Subroutine prototypes used at line 418, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:37 +02:00
2633a19b92 Bug 6679 - [SIGNED-OFF] fix 4 perlcritic violations in C4/ShelfBrowser.pm
- Variable declared in conditional statement at line 183, column 5.  Declare  variables outside of the condition.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:37 +02:00
33ae9c9185 Bug 6679 - [SIGNED-OFF] fix 5 perlcritic violations in C4/Serials.pm
- Subroutine prototypes used at line 161, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:37 +02:00
b744352447 Bug 6679 - [SIGNED-OFF] fix 6 perlcritic violations in C4/Barcodes/hbyymmincr.pm
- Subroutine prototypes used at line 45, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:36 +02:00
1ea7842b88 Bug 6679 - [SIGNED-OFF] fix 7 perlcritic violations in C4/Biblio.pm
- Expression form of "eval" at line 492, column 12.  See page 161 of PBP.  (Severity: 5)

- "return" statement with explicit "undef" at line 891, column 5.  See page 199 of PBP.  (Severity: 5)

- Subroutine prototypes used at line 1148, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:36 +02:00
4715e38e6a Bug 6679 - [SIGNED-OFF] fix 8 perlcritic violations in C4/Barcodes.pm
- "return" statement with explicit "undef" at line 57, column 2.  See page 199 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:36 +02:00
5da1298ac1 Bug 6679 - [SIGNED-OFF] fix 8 perlcritic violations in C4/Circulation.pm
- "return" statement with explicit "undef" at line 994, column 39.  See page 199 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:35 +02:00
5e4d80ce6f Bug 6679 - [SIGNED-OFF] fix 9 perlcritic violations in C4/Koha.pm
- Subroutine prototypes used at line 115, column 1.  See page 194 of PBP.  (Severity: 5)

- "return" statement with explicit "undef" at line 1112, column 4.  See page 199 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:35 +02:00
48d5f30226 Bug 6679 - [SIGNED-OFF] fix 9 perlcritic violations in C4/TmplTokenType.pm
- Subroutine prototypes used at line 86, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:01:35 +02:00
ab55f63a2f Bug 6679 - [SIGNED-OFF] fix 15 perlcritic violations in C4/ImportExportFramework.pm
Bareword file handle opened at line 558, column 17.  See pages 202,204 of PBP.  (Severity: 5)

Two-argument "open" used at line 558, column 17.  See page 207 of PBP.  (Severity: 5)

http://bugs.koha-community.org/show_bug.cgi?id=6679
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 12:00:55 +02:00
5abd4f0b9b Bug 6679 - [SIGNED-OFF]fixing 23 '"return" statement with explicit "undef"' violations in C4/Tags.pm
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 11:40:00 +02:00
809b543d27 Bug 6679 -[SIGNED-OFF] fix 12 perlcritic violations in C4/Context.pm
"return" statement with explicit "undef" at line 486, column 5.  See page 199 of PBP.  (Severity: 5)

Subroutine prototypes used at line 548, column 1.  See page 194 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 11:39:37 +02:00
562335d1c4 Bug 6679 - [SIGNED-OFF] fix 12 perlcritic violations in C4/Auth_with_ldap.pm
Subroutine prototypes used at line 73, column 1.  See page 194 of PBP.  (Severity: 5)

"return" statement with explicit "undef" at line 74, column 24.  See page 199 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 11:39:08 +02:00
8cfc1a0804 Bug 6679 - fix 12 perlcritic violations in C4/External/BakerTaylor.pm
Subroutine prototypes used at line 82, column 1.  See page 194 of PBP.  (Severity: 5)

"return" statement with explicit "undef" at line 83, column 22.  See page 199 of PBP.  (Severity: 5)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 11:38:45 +02:00
Paul Poulain
a42e5e6d3e Merge remote-tracking branch 'origin/new/bug_5339' 2012-09-20 10:19:44 +02:00
Paul Poulain
59c230e7fd Bug 5339 follow-up
* fix english error
 * if the invoice is closed, don't display a "finish receiving" link, but a "view invoice" one
2012-09-20 10:19:19 +02:00
Julian Maurice
766b267b15 Bug 5339: Unit tests for invoices related subroutines
These tests use DBD::Mock to check if SQL queries are correctly built.
Actually, we only check bound parameters.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 09:46:59 +02:00
Julian Maurice
8cf9f78702 Bug 5339: ergonomic changes
- "Finish receive" on parcel.pl now redirect to acqui/invoice.pl,
  allowing the librarian to modify invoice informations (freight,
  billing date, ...) and close invoice.
- The librarian can now close (or reopen) the invoice and modify invoice
  informations in 1 operation (instead of 2)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 09:46:50 +02:00
Julian Maurice
766e2b0106 Bug 5339: Fix t/db_dependant/Acquisition.t 2012-09-20 09:45:39 +02:00
Paul Poulain
bc50735e3a Merge remote-tracking branch 'origin/new/bug_8185' 2012-09-19 18:47:58 +02:00
Colin Campbell
10e4f3b9a5 Bug 6679 Avoid critic failure caused by ambiguous code
If countitems not set to 1 it was not being declared
but is referred to outside this scope, generating
runtime warnings and test failure

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 18:47:37 +02:00
Paul Poulain
a287383153 Bug 2060 follow-up DBRev & updatedatabase 2012-09-19 17:25:19 +02:00
Jared Camins-Esakov
65c0174e63 Bug 2060 follow-up: add support for UNIMARCAUTH
The staged MARC management script was not correctly informing
the decoder ring that we had UNIMARC authorities, and the decoder
ring was dutifully trying to turn the authority records into a
bibliographic box of cereal.
2012-09-19 17:16:23 +02:00
Jared Camins-Esakov
7ad5e203da Bug 2060: Update command line MARC import scripts
Expose authority import functionality to the command line import
scripts, and rename them from commit_biblios_file.pl and
stage_biblios_file.pl to commit_file.pl and stage_file.pl.

To test (note that these instructions assume you have a MARC21
installation and are using the provided sample file):
1. Find a file of authorities (a sample file with MARC21 authorities
   is attached to bug 7475) and download it to your server
2. Stage the file using the following command (replace <filename> with
   the name of the file you saved in step 1):
   > misc/stage_file.pl --file <filename> --authorities
3. Note the batch number the script assigns to your batch
4. Commit the records using the following command (replace <batchnumber>
   with the batch number you made note of in step 3):
   > misc/commit_file.pl --batch-number <batchnumber>
5. Index the authorities Zebraqueue (or wait)
6. Confirm that the new authorities appear.
7. Create a matching rule with the following settings:
   Code: AUTHTEST
   Description: Personal name main entry
   Match threshold: 999
   Record type: Authority record
   Search index: Heading-main
   Score: 1000
   Tag: 100
   Subfields: a
   Offset: 0
   Length: 0
   (note the ID of this matching rule)
8. Stage the authority file again, this time using the following
   command:
   > misc/stage_file.pl --file <filename> --authorities \
     --match <matchingrule>
7. Revert the import with the following command:
   > misc/commit_file.pl --batch-number <batchnumber> --revert
8. Index the authorities Zebraqueue (or wait)
9. Confirm that the records have been removed
10. Import an authority record with the Stage MARC/Manage staged MARC
    tools in exactly the way you would for a bibliographic record,
    but choose "Authority" instead of "Bibliographic" for the record
    type.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Testing plan delivers as it should.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:16:18 +02:00
Jared Camins-Esakov
6e71b80ca3 Bug 7475: Teach matching rules to handle authorities
* Add the code necessary to handle authorities with matching rules and
  import batches.
* Update all the scripts that use the matcher and import batch code
  to use the new API.
* Add authority records to the matching rules interface in the staff
  client.

http://bugs.koha-community.org/show_bug.cgi?id=2060
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:15:56 +02:00
Jared Camins-Esakov
91be607586 Bug 7475: Update configuration
In order to make matching rules more useful for MARC21 authorities,
this patch adds special indexes on previous see-from headings and
LCCN. This patch does not change UNIMARC authority configuration in
any way. Also modifies the Koha schema in preparation for adding
authority import and matching to the Staging tools.

To install:
1. Run installer/data/mysql/atomicupdate/importauthorities.pl
2. Update the following four files in your koha-dev:
    etc/zebradb/authorities/etc/bib1.att
    etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
    etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
    etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
3. Reindex your authorities:
    misc/migration_tools/rebuild_zebra.pl -a -r -v

NOTE TO RM: this patch adds an atomicupdate file that needs to be
incorporated into updatedatabase.pl if bug 7167 is not pushed.

http://bugs.koha-community.org/show_bug.cgi?id=2060

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 1 August 2012
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 11 September 2012
2012-09-19 17:15:25 +02:00
Paul Poulain
2f8308cd49 A follow-up will be added though, because we understood why I had some javascript error and jonathan didn't. It's because I've plack + debug
Bug 8117 follow-up: explicitely list tables to dataTable


debug panel in plack adds a lot of <table> (without any id)
thus, when you call
$("table").dataTable(...)
there's a javacscript error because datatable can't handle the plack <table> !

The solution has been to explicitely name the tables to dataTable (which is a good thing anyway)
        $("#activeperiodst,#inactiveperiodst").dataTable($.extend(true, {}, dataTablesDefaults, {
2012-09-19 17:02:14 +02:00
Paul Poulain
d3fcc8b973 Bug 8117 follow-up remove perl warning
first & last were already defined, removing my
2012-09-19 16:29:46 +02:00
Jonathan Druart
f4dadc955c Bug 8117: Followup: remove h3 title (duplicate infos)
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 16:17:22 +02:00
Jonathan Druart
4b312b141a Bug 8117: Divide budget periods into two tabs
Budget periods are now divided into two tabs : active and inactive
budget periods.

The original author of this patch is Julian Maurice

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Michael Davis <m.r.davis@cranfield.ac.uk>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-09-19 16:17:16 +02:00
Paul Poulain
be12aa9609 Merge remote-tracking branch 'origin/new/bug_6448' 2012-09-19 16:12:23 +02:00
Dobrica Pavlinusic
8f2dcc6741 Bug 6448 - carp on invalid barcode
This is consistent with implementation of other barcode types
which all carp instead of die on invalid barcodes.
2012-09-19 16:11:41 +02:00
Mirko Tietgen
1059c03b68 Bug 8185: Change some more strings from Italian to English
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Two additional corrections

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 15:45:29 +02:00
Zeno Tajoli
65e0a7d5a5 Bug 8185: plugin for linking records in MARC21
This plugin works like the unimarc plugin unimarc_field_4XX. It
 insert: $9 -> biblionumber $w -> 001 $t -> 245$a (title )
 $x -> 022$a (ISSN) $z -> 020$a (ISBN) The search is done on
 'any' index. Data are inserted only in the working record.
 To insert data in the connected record, you need to open
 the other record.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-09-19 15:45:27 +02:00
Jared Camins-Esakov
9b5a5224e6 Bug 8624: Move famfamfam out of theme directory
The patch moves the famfamfam image set out of the
koha-tmpl/opac-tmpl/prog/famfamfam into koha-tmpl/opac-tmpl/famfamfam

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 15:40:55 +02:00
f34e90f768 Bug 6689 [Follow-up] Improve styling of table pager
Small correction to add non-vendor-prefixed border
radius declaration to make style consistent on
newer browsers.

To test, view a page with a sorted table and pager controls,
like members/readingrec.pl. The pager controls "box" should
show rounded corners in Firefox 15+

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 14:29:11 +02:00
881ee1b1a1 Bug 7401 - Shelving Location facet
This patch enables the shelving location facet as an
alternative to the branches fact in two situations:
A) SingleBranchMode is enabled
B) There is only one branch in the branches table

Test Plan:
1) Catalog multiple items with different shelving locations.
2) Test enable by enabling SingleBranchMode
3) Test enable by deleting all but one branch

Based on initial patch by Ian Walls.

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

Tested cases 2) and 3) successfully in OPAC and staff client

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 14:25:04 +02:00
Paul Poulain
884c8a2b7c Merge remote-tracking branch 'origin/new/bug_7993' 2012-09-19 12:13:02 +02:00
Paul Poulain
6bc91ace59 Bug 7993 follow-up to fix POD DOC 2012-09-19 12:12:43 +02:00
Paul Poulain
7aff89ebff Bug 7751 follow-up adding updatedatabase for sysprefs decreateLoanHighHolds*
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7751#c31 to c34
2012-09-19 12:01:11 +02:00
Paul Poulain
659a4aab57 Merge remote-tracking branch 'origin/new/bug_8597' 2012-09-19 11:43:04 +02:00
Paul Poulain
81ba4ca979 Bug 8597 follow-up translation issues
Replacing 2 french terms by the english one
2012-09-19 11:42:41 +02:00
Paul Poulain
3847f55cc7 Merge remote-tracking branch 'origin/new/bug_8597' 2012-09-19 11:36:51 +02:00
Jared Camins-Esakov
df104c331c Bug 8597 follow-up: add missing lib files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-19 11:36:36 +02:00
Paul Poulain
10818eb6f1 Bug 5339 follow-up DBRev 2012-09-19 11:13:36 +02:00