Commit graph

15328 commits

Author SHA1 Message Date
Jonathan Druart
b8e9829be5 Bug 5347: Adds columns claims_count and claimed_date in aqorders
This patch adds 2 columns in the aqorders table :
- claims_count : number of claims for an orders
- claimed_date : date of the lastest claim

In the lateorders.pl table, you can not select orders from different
supplier because there is just one letter sent after clicking the "Claim
order" button. So, it's logic that you want to select only orders from
this supplier.

Modification in C4/Letters.pm:
refactoring code for claimacquisition and claimissues letter type.
Now, fields for theses letters check the table name. It's not possible
to chooce aqorders.title, this field doesn't exist !
Furthermore, you can add a <order> tag around your item fields, like
this :

-- Begin example
<<LibrarianFirstname>>
<<LibrarianSurname>>

<<aqbooksellers.contact>>
<<aqbooksellers.address1>>
<<aqbooksellers.phone>>
<<aqbasket.basketno>>
<<aqbooksellers.phone>>
<order>Library : <<items.homebranch>>
In your possesssion : <<biblio.author>>. <<biblio.title>>.
<<biblioitems.publishercode>>, <<biblioitems.publicationyear>>.
Callnumber : <<items.itemcallnumber>>. doc type : <<items.itype>>
Barcode : <<items.barcode>>
Date for the return : <<items.onloan>>.</order>

<<LibrarianSurname>>
-- End example

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-01-20 14:12:27 +01:00
Paul Poulain
b35233acbf Olivier Crouzet is 168th ! 2012-01-19 17:02:43 +01:00
Paul Poulain
9c06057f21 Merge remote-tracking branch 'origin/new/bug_6328' 2012-01-19 16:50:49 +01:00
Lyon3 Team
0e9edb1102 Bug 6328 follow-up, fixes Undefined subroutine &C4::Circulation::Delta_Days
The Delta_Days sub is called only when a patron that is already debarred must be debarred for a longer period.
This (rare) case probably hasn't be tested during QA, because the sub is not loaded.
Loading it fixes the problem

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-19 16:49:25 +01:00
Paul Poulain
0b0212cae3 Merge remote-tracking branch 'origin/new/bug_7083' 2012-01-18 16:20:26 +01:00
Paul Poulain
b70e4f3d6d BZ4376 Minor change in GetMarcAuthor
A minor change in the GetMarcAuthors function of C4/Biblio.pm allow differentiate the type of authors in the templates

This change allow doing things like this in the templates:
<TMPL_IF EXPR="tag == 700" && code eq 'a' >
 <strong>Author:</strong>
<!-- TMPL_ELSE -->
 <TMPL_IF EXPR="tag == 710" && code eq 'a' >
  <strong>Corpotation Author:</strong>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

(html template syntax, but also applicable to template toolkit)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works as claimed and doesn't break existing functionality.
2012-01-18 12:07:12 +01:00
Adrien Saurat
04400d9926 Bug 7435: corrects Fund selectbox in addneworder
Prevent disabled funds to appear in the Fund
select box.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 18:20:23 +01:00
Paul Poulain
d704808684 Merge remote-tracking branch 'origin/new/bug_7276' 2012-01-17 18:14:03 +01:00
Chris Cormack
94516e7f2a Bug 7276 : Follow up, adding a sub to clear the cache
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 18:13:52 +01:00
Henri-Damien LAURENT
6c38cc23d9 Bug 7276 : member entry Performance improvement
Before this patch : 9619 borrowers added in 31 Minutes, After : 68 seconds.
This adds Hashref to table structure in C4::SQLHelper to speed up bulk edits.

Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-01-17 18:13:51 +01:00
6fd3635a59 Bug 6885 Follow up patch, invert tested condition
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Not sure the brackets are nessecary, but I think I remember learning
bitwise operators have a lower priority than other relational
operators so wanted to make sure we notted the result of the bitwise
and, not the flag

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 18:06:55 +01:00
Adrien Saurat
74984f5cf3 Bug 7266: flags debarred, suspended, gonenoaddress in overdue
This patch makes these flags functionnal.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 18:03:37 +01:00
Ian Walls
5fde469429 Bug 7097: HidePatronName not hiding on issue history
HidePatronName wasn't being respected on a titles Checkout History tab.  This patch
exports the preference to the template (if set), and then toggles the display between
patron cardnumber (if 'on') or the name (if 'off')

To test:

Enable HidePatronName
Go to the Checkout History tab of an item that has been checked out before
You should see the patron's cardnumber instead of their surname, firstname

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 18:02:00 +01:00
Liz Rea
57515dfb33 Bug 7388 [SIGNED-OFF] [enh] - round the corners on the side menus in the staff client
To test:
apply patch
check menus on circulation and bib detail page - corners on the menus to the left should be rounded.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Those rounded corners do look more friendly. I have tested circulation and bib detail page and
have found no ill side effects.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:55:13 +01:00
Ian Walls
1b3e84c672 Bug 7399: Holds Queue should show reserve notes
The notes for a specific hold, if they existed, were being added to the tmp_holdsqueue
table by build_holds_queue.pl, but they were not displayed anywhere, which seems a waste.

This patch adds the Notes column to the far right of view_holdsqueue.pl.

To Test:

Place a hold with a note
Run build_holds_queue.pl to place it in the Holds Queue
View the Holds Queue; you should see the note on the far right of the table

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:48:44 +01:00
Jared Camins-Esakov
9156de6384 Bug 7332: Translated title (MARC21 242) not shown
The cataloger-supplied translated title stored in MARC21 field 242 was not being
displayed when XSLT was enabled.

Test plan:
1) Enable XSLT for OPAC Details and Results, and Intranet Details.
2) Create or add a record with a 242 field
3) See that the translated title is not displayed in OPAC Details or Results, or
Intranet Details
4) Apply patch
5) See that the translated title is now displayed in OPAC Details and Results,
and Intranet Details

Signed-off-by: Duncan Tyler <duncan@duncan-SoT.wgtn.cat-it.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:46:33 +01:00
Magnus Enger
629f3f322c Bug 6787 - Fast Add framework for NORMARC
The new framework will be called "Hurtigkatalogisering".

To test:
- Make sure the nb-NO translation is installed
- Run through the web installer on an empty database
- Select nb-NO as the installation language
- Select NORMARC as the marcflavour
- Include normarc_fastadd_framework in the installed data
- Check that the framework looks ok in:
-- More > Cataloguing
-- More > Administration > MARC framework

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, not problems found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:45:46 +01:00
Garry Collum
0ad771a68b Bug 7277: Fixes display of subtitles in opac.
Adds comma and space to results display in opac between title and subtitles.
Also removes extra space before the subtitle in the results display of the staff pac.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:43:54 +01:00
Katrin Fischer
7caec5a45f Bug 4300: Fix display of textual holdings (866)
Fixed problems:
- only $z, but not $a was shown
- only first $z for each 866 field was shown
- each 866 field produced a ; even if no $z was present

After patch was applied:
- OPAC displays 866 $a and $z, separating each field with ;
- Staff displays 866 $a, $x and $z, separating each field with ;

Example(s) for testing:
866 $a1-86 (1941-1987)$xbound in 2 v. per year$zSome issues missing
866 $a1-86 (1941-1987)
866 $a--86 (1941-1897)$xinternal note
866 $zfirst note,$zsecond note

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:41:53 +01:00
ffbaf8e2d7 Fix for Bug 7006, highlight patron changes in email
This patch eliminates all unchanged fields from the email
on the assumption that the information is superfluous. I have
also added a link to the patron edit screen which will be
displayed if the staffClientBaseURL has been entered.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:38:16 +01:00
Dobrica Pavlinusic
90d68d6f5c Bug 7247 - rebuild_zebra.pl -v should show all Zebra log output
Currently, -v option resets Zebra log output to default system values.

This produce amount of log specified in system defaults which is usually
too low for debugging.

This change explicitly forces all Zebra log output which create much more
chatter so it triggers with verbosity level 2

Test scenario:
1. pick koha site to reindex
2. use -v -v options to rebuild_zebra.pl to see additional output

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified help corrections and  loglevel 2 output vs. loglevel 1 output. No issues found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 17:31:25 +01:00
JAMES Mason
b0a4233366 Bug 6466 - hung socket read causes SIP tests to fail
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 16:16:09 +01:00
Adrien Saurat
cb1a946693 Bug 7357: display serial title instead of '---'
The full title of a serial is now displayed even
if several lines have the same title.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 16:08:32 +01:00
Paul Poulain
7650a34754 Merge remote-tracking branch 'origin/new/bug_5533' 2012-01-17 16:03:14 +01:00
Ian Walls
3062405c09 Bug 5533 followup: reinstate Lost status editing
The original patch for 5533 removed the Lost status from the edit items screen; new items were not affected,
and batch changes could still be made, so this was not a consistent change.

This patch removes the filter that hid the Lost status dropdown, but then changes the default MARC framework
to hide this field by default (value -5).  New installations will not see this status in the editor, unless
they manually activate it.  This will enforce the semantics of using the "mark lost" options by default, but
provide a workaround for libraries that understand and accept the consequences of manually editing this field.

To test:

1.  on an existing install, edit an item.  you should have the Lost status visible
2.  on a new install, editing or creating an item should not show the Lost status at all

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 16:01:38 +01:00
Ian Walls
b08ccda99d Bug 7407: HidePatronName not working on 'on hold for' messages
HidePatronName was not working on 'on hold for' messages, only 'checked out to'
messages.  This resulted in the patrons name showing if the item was on hold for
them.

T:T scope issue; needs to be within itemloo.  This patch does that.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 15:36:25 +01:00
Paul Poulain
a642b1c72a Merge remote-tracking branch 'origin/new/bug_5327' 2012-01-17 15:35:19 +01:00
Sam Sanders
dbb29b4042 bug 5327 add tests for C4/BackgroundJob.pm
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
perl t/db_dependent/BackgroundJob.t
All tests complete successfully.

Note: Test 11 does not tell what it's about, but it has been there before.
2012-01-17 15:31:56 +01:00
Connor Dewar
e96c92d077 Bug 5327 Added unit tests for C4/Reports.pm
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
perl t/Reports.t b/t/Reports.t
All tests complete successfully.
2012-01-17 15:31:56 +01:00
Connor Dewar
f053ca0c22 Bug 5327 Added unit tests for C4/ClassSortRoutine/Dewey.pm
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-01-17 15:31:55 +01:00
Connor Dewar
995485e574 Bug 5327 added unit tests for C4/ClassSortRoutine/Generic
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-01-17 15:31:55 +01:00
Paul Poulain
2bfad0f6f9 Merge remote-tracking branch 'origin/new/bug_6990' 2012-01-17 15:07:09 +01:00
Paul Poulain
6456afea95 Bug 6990 follow up PODDOC & unit test updating
This patch removes the TransformKohaToMarcOneField sub, but there was some remaining POD & unit test about it
2012-01-17 12:07:03 +01:00
02d392a502 TransformKohaToMarc enhancement
TransformKohaToMarc function is called for each biblio and item that has
to be build. This function execute a DB statement for each Koha field
that has to be mapped to a MARC tag/letter. This impact deeply
performances for script like rebuild_zebra, especially since items are
not anymore in bilio records and have to be rebuild on the fly.

I'm proposing a patch which read Koha field to MARC field mapping just
one time and cache it. My test show a 30% execution time improvement on
rebuild_zebra.pl script. It uses already cached mapping in C4::Context.

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

http://bugs.koha-community.org/show_bug.cgi?id=6990
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-17 12:07:02 +01:00
Paul Poulain
d5b1b8ee87 Merge remote-tracking branch 'origin/new/bug_7364'
Conflicts:
	cataloguing/additem.pl
2012-01-17 12:05:00 +01:00
D Ruth Bavousett
4cf7cd28da Bug 7364: Possible to get to FA item add without current branch being defined.
Some paths to the FA item-add screen didn't have a branch defined--if the param is set,
use it, otherwise, use the user's logged in branch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Modified for syntax by:  Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2012-01-17 09:32:39 +01:00
Paul Poulain
977e1a401b Revert "Bug 7364: Possible to get to FA item add without current branch being defined."
This reverts commit 6f681bec2d.
2012-01-17 09:32:21 +01:00
Paul Poulain
49c3525321 Revert "Bug 7364: Possible to get to FA item add without current branch being defined."
This reverts commit 6f681bec2d.

Reverting because on my test server, I get

syntax error at /home/paul/koha.dev/koha-community/cataloguing/additem.pl line
668, near "->param{"
Execution of /home/paul/koha.dev/koha-community/cataloguing/additem.pl aborted
due to compilation errors.
2012-01-16 18:58:10 +01:00
Paul Poulain
34a27e01b1 Merge remote-tracking branch 'origin/new/bug_929' 2012-01-16 18:19:38 +01:00
Chris Cormack
2cfb891c83 Bug 929 : Follow up to allow tests to check plugins too
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
perl xt/author/valid-templates.t runs without errors now.
2012-01-16 18:18:11 +01:00
D Ruth Bavousett
6f681bec2d Bug 7364: Possible to get to FA item add without current branch being defined.
Some paths to the FA item-add screen didn't have a branch defined--if the param is set,
use it, otherwise, use the user's logged in branch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-16 15:28:54 +01:00
Paul Poulain
c13d3f0043 Merge remote-tracking branch 'origin/new/bug_7143' 2012-01-16 15:05:49 +01:00
Jesse Maseto
3907cf4547 Bug 7143: add Albert Oller to the about.tt
Albert Oller was in the doc/history.txt but not the About page.
adding him alphabetically

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-16 15:04:59 +01:00
Chris Cormack
251d873b82 Bug 6947 : opac-topissues.pl wasn't respecting item live itemtypes
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The search was only looking for bib level itypes independent
from the settings for item-level_itypes.

After patch the system preference setting is respected
and search works accordingly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-16 14:53:43 +01:00
Paul Poulain
d7a51d83c1 Merge remote-tracking branch 'origin/new/bug_6132' 2012-01-16 14:53:08 +01:00
Julian Maurice
6eac5284ee Bug 6132: Add unit test for system preferences
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-16 14:52:24 +01:00
Julian Maurice
b867d7d12a Bug 6132: Update sysprefs cache in set_preference
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-01-16 14:52:23 +01:00
Paul Poulain
79b0b76481 Merge remote-tracking branch 'origin/new/bug_929' 2012-01-13 17:47:30 +01:00
Paul Poulain
5dcc27d14c Bug 929 small follow-up (mistake in POD) 2012-01-13 17:47:16 +01:00
Chris Cormack
55d0b65522 Bug 929 : Follow up adding unit tests, discovered C4::Dates cached the syspref with no way to clear it, fixed also. 2012-01-13 16:17:48 +01:00