Commit graph

13606 commits

Author SHA1 Message Date
Chris Cormack
b403921739 Merge remote branch 'kc/new/bug_4263' into kcmaster 2011-02-14 09:08:18 +13:00
Colin Campbell
1a0b6ded11 Bug 4263: Remove duplicated lines from C4::Items
Merge of bug 4263 duplicates the bulk of
ModItemFromMarc causing compile time errors

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:05:36 +13:00
Colin Campbell
ea2ace41a4 Bug 4263: Fix subfield ordering broken by earlier patch
Restores alpha sorting of item subfields in add/edit screen

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 09:05:33 +13:00
Nicole Engard
77939915c0 Bug 5746: Add space after 'enhanced content' on OPAC
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 08:37:44 +13:00
Paul Poulain
94bd7ad545 Bug 5733 : MT3531: Intranet cart is emptied when session is closed
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-10 15:07:22 +13:00
Paul Poulain
1abf1ea2d0 Bug 5731 When No ccode is defined for an item, then moredetail.pl throws a 500 error
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-10 14:50:49 +13:00
d7208f76bd Fix for Bug 5716 - Whitespace correction for browse shelf
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 21:55:32 +13:00
Chris Cormack
bdd0e225bc Merge remote branch 'kc/new/bug_3009' into kcmaster 2011-02-09 15:27:01 +13:00
Katrin Fischer
224d2dee90 Bug 3009 - Change items.content field so it prints due date by default
<items.content> in overdue notices prints issuedate instead of duedate by default.
This patch changes default to issues.date_due.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:25:55 +13:00
Koustubha Kale
dcfeab4eee Adding id tags to some OPAC templates.
Many of the templates in OPAC, which deal with users data eg opac-account.tmpl, opac-passwd.tmpl etc do not have a id for the container div,
like opac-user.tmpl has an id userdetail. Having these id's makes it easier to customize with css.
This patch adds id's to most of the <div class="container"> tags.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:20:45 +13:00
koha-preprod
de491849ac Add markers to text in Javascript variable in order to be translate.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:13:06 +13:00
koha-preprod
b5c58f964a Bug 5629 : Adding an HTML anchor in the link in order to choose the right tab when we click on the link
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:10:30 +13:00
Brice Sanchez
02824a0b08 Bug 5702 : Adding if statement condition to highlight toggle
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 15:06:49 +13:00
Paul Poulain
d22001b1c4 adding some copyright BibLibre statements
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 14:08:44 +13:00
Chris Cormack
7c376879b4 Bug 3495 : Providing a link to the fast add screen in circulation for an item that isn't found
Squashed commit of the following:

commit bf7fb7971d2d6ea6b3ea09bda571bdc3399efb35
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Feb 9 13:53:38 2011 +1300

    Bug 3495 : Wrapping link to the fast cataloguing page with syspref and permissions

commit ae7e2c278e10efea94e19b75446d7fed25272de2
Author: Paul Poulain <paul.poulain@biblibre.com>
Date:   Wed Dec 15 20:50:45 2010 +0100

    Bug 3495 : Add link to Fast cataloguing in case the scanned barcode don't exist in circulation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 13:58:43 +13:00
Paul Poulain
3a29f37dff Bug 5726 : MT1059 Follow-up : Fix merge reference selection presentation
A change in global-staff.css messed the merge reference selection presentation

    Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 13:47:00 +13:00
Paul Poulain
d251585f71 Bug 5718 : fix permission of moveitem = edit_items needed
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-09 09:33:36 +13:00
Chris Cormack
403f53c0d8 Bug 2742 : Fix typo 2011-02-08 21:47:38 +13:00
Frédérick Capovilla
07731037ee Bug 5616: Corrects an utf-8 encoding problem in cardviews
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-08 21:18:50 +13:00
8ce06ddf32 Bug 5701: Distinction between authors/additional authors in staff normal view (MARC21/XSLT)
At this time all entries in 100/110/111 and 700/710/711 are shown together.
We want to see the difference between an author and an added entry. (The 700
author could for instance be an illustrator.)
To this end we like to see the eventual relator code or term in $4 or $e too
(displayed between brackets after the name).

In the patch the code for authors is moved to a template routine at the end of
the xslt stylesheet.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-08 21:15:37 +13:00
Chris Cormack
dd5f1386ae Bumping database version 2011-02-08 21:12:41 +13:00
Colin Campbell
d1a06829f6 Bug 2742 Correct language names in install
Correct native versions of Danish and Dutch

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-08 21:08:02 +13:00
Chris Cormack
083fd5776a Merge remote branch 'kc/new/enh/bug_5462' into kcmaster 2011-02-08 21:05:14 +13:00
6709d0e4f7 Follow-up correction for Bug 5462 - Fix variable names for template::toolkit
Previous commit modified checks for the item-level_itypes preference
to look for a different variable name but didn't update where that
variable is set in Auth.pm.

Other scripts perform a direct check of item-level_itypes and must
continue to use the name of the variable in the database.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-08 21:03:28 +13:00
Paul Poulain
14422c8ed9 Bug 5700: MT4004 : additem.pl Some Status were not defaulted to the correct value Status 0 was lost because test was done on value and not on the fact that a value was defined or not. when value is 0 then it was not used as default value for
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-07 22:17:36 +13:00
Paul Poulain
60e0a76fc0 Bug 5699: don't discard $3 when building a record (UNIMARC specific)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-07 21:30:02 +13:00
Chris Cormack
a8222aeeb1 Merge branch 'new/bug_5277' into kcmaster 2011-02-07 21:13:56 +13:00
Chris Cormack
a4cc394508 Bug 5691 - Delete all items respects independentbranches system preferences
Squashed commit of the following:

commit 66cdb8804136803a3f626d183c8f192f61f3c7b1
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:55:10 2011 +1300

    Bug 5691: Updating copyright statement

commit 79ef6c269afc9c644c51709a7657542a0fc6d7d6
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:52:13 2011 +1300

    Bug 5691 - Fixing a syntax error and tidying up some formatting

commit a66485dba113c05ed51a3b4ff19f788e335aa1f6
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Tue Oct 5 17:23:55 2010 +0200

    (MT #1365) Delete all items

    Using DelItemCheck in cataloguing/additem.pl
    when deleting all items

commit fe845fd48ab22ff82ad6d8971c468c327b49f3c4
Author: Christophe Croullebois <christophe.croullebois@biblibre.com>
Date:   Wed Sep 22 11:39:28 2010 +0200

    (MT #1365) Delete all items

    Now if IndependantBranches is on and a user try to delete all items, only the items of his branch will be deleted.
    A message explain this fact.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Followup: (MT #1365) Fixing up the English idiom
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-05 07:41:29 +13:00
Christopher Hall
bd151a4fd8 template::param handles empty array/hash refs better 2011-02-04 15:10:59 +13:00
7acfb3a17f Fix for Bug 5532 - sysprefs editor should show names of saved prefs
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:38:05 +13:00
aac253a5e0 Fix for Bug 5689 - System preference notifications are not translatable
Defining strings in the template so that they can be translated.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:29:43 +13:00
dec6be9148 Fix for Bug 5115, Tags JavaScript includes many untranslatable strings
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:25:22 +13:00
Chris Cormack
ea93d3b56e Merge branch 'new/bug_5690' into kcmaster 2011-02-04 13:23:46 +13:00
Henri-Damien LAURENT
60dd25b5c2 Bug 5690
MT3947: items.timestamp were not updated on edition

If items.timestamp is used in the framework and hidden
the fact that it is NOT deleted before update is done would input the previous timestamp,
which is not the desired behaviour.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-04 13:22:02 +13:00
Chris Cormack
0060b10af9 Updating history docs 2011-02-04 13:21:20 +13:00
Chris Cormack
3b5aa120d7 Merge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462 2011-02-04 08:52:39 +13:00
Christopher Hall
0088c5da53 Bug 5462: fixed current preferences tab highlighting bug created by dashfix
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:58:52 +00:00
Christopher Hall
236ba72ef6 Bug 5462: more dash fixing for variable names within scripts
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:57:45 +00:00
Christopher Hall
f03000f50f Bug 5462: modified intranet scripts to match templates
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:57:24 +00:00
Christopher Hall
8fd29f3d62 Bug 5462: both intranet and opac seem to be 'clean', still need to make relevant changes in scripts
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:57:00 +00:00
Christopher Hall
6ed8d1425d Bug 5462: fixed incorrect TMPL_IF
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:56:31 +00:00
Christopher Hall
c02e4d02d5 Bug 5462: fixed dashes (replaced with _) and fullstops (removed) for variable names
Done within opac and intranet templates, still needs to be done for corresponding scripts.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:54:50 +00:00
Chris Cormack
e29aca325d Fixing a syntax error, that snuck in with a merge 2011-02-03 22:52:36 +13:00
e6a3029470 Fix for Bug 3319 - Need error message when adding patron and libraries are defined
- Hiding patron add toolbar when branches or categories are undefined
- Blocking patron entry form if branches or categories are undefined
- Removing nonfunctional template logic for displaying missing category
  error message.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:21:45 +13:00
f1f36a0c94 Bug 3212 Force leader 9 position to 'a' for new biblios
When Creating a new biblio record, if the cataloguer doesn't use the leader
plugin, a biblio record can be saved with a leader not containing a 'a' in 9
position. If the biblio contains UTF-8 characters, its decoding can fail.

This issue applies to MARC-21 not UNIMARC.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:15:25 +13:00
Colin Campbell
49b5f77194 Bug 5673: test guarantorid consistently
Incorrect checking of guarantorid was causing moremember.pl to
try and construct addresses using data from non-existent guarantors
ensure that test is consistently checking that value is defined and not
'', '0' or 0 [ i.e. what perl does for you anyway!!]

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:10:24 +13:00
Ian Walls
f692123bf1 Bug 2341: items marked 'on order' not reserveable from search results
Items created as part of the acquisitions process, and assigned the temporary notforloan value of -1,
cannot be placed on hold from the search results in either the OPAC or staff client (the link is missing).

This patch changes the evaluation of items->notforloan from a Boolean (if $items->{notforloan}) to a comparison
(if $items->{notforloan} > 0).  Any notforloan status with a negative value can therefore be reserved.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 22:00:01 +13:00
Chris Cormack
aa398ed055 Bug: 4263 - Repeatable subfields in items
Squashed commit of the following:

commit f441094d5095d165eab18340c983a831cce8f6e0
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Mon Jul 5 20:33:23 2010 +0200

    bug4263 followup : Can't blank subfields

    Previous bug4263 reintroduced bug 2466: fix clearing item field
    This keeps bug4263 followup to be assigned (donot blank dateaccessioned)
    But also allow to blank item subfields.

commit 92889b766c41b48bdd0e3a33ca4b183b1e259805
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Apr 23 13:54:30 2010 +0200

    (bug #4263) dateaccessionned is cleaned on item modification

    Every item modification, date accessionned is cleaned, if there is no modification made, we must'nt reset to "undef" the value.

commit 5abb2db16b2564d32e84b7cc680acbc301d73179
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Mar 2 09:57:33 2010 +0100

    (bug #4263) fix the edition of items with repeatable subfields

    The subfield management in item level is broken, fields are concatenated in one field, and if the librarian edit it, the values are not selected.
    This big patch fix three things:
     1) saving fields that are stocked in SQL(using koha2marc mapping) are now well cut and separated in _REAL_ subfields
     2) loading records with repeatable subfields are now well returned
     3) Editing items with repeatable fields works well

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 4263 Removing extranious block of code
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 16:08:08 +13:00
Chris Cormack
35b47b6ff7 Bug 4931: Stocking can be by homebranch or holding branch
Squashed commit of the following:

commit 105de81639cbac5084e4a5c099b19569043e69ff
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Jul 13 11:58:01 2010 +0200

    (bug #4931) fix forgottens input in buttons

    the previous patch missed an hidden input in next buttons that break next page. This fix it.

commit db00295a6b9d1d36fc888ba6a0558011fd6884ba
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Jul 2 15:27:59 2010 +0200

    (bug #4931) add the ability to choose home or holding branch in stocktaking

    This add radio box in stocktaking to base it on home or holdingbranch

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>

Bug 4391 Followup: Adding back lost declaration of $branchcode
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-03 13:50:57 +13:00
Christopher Hall
10807ef6c8 fixed for/end scoping issue for single lines 2011-02-03 12:16:12 +13:00