Commit graph

212 commits

Author SHA1 Message Date
77d69d1beb Fix for Bug 4223 - Too much serials info - design work needed
This patch reimplements the changes suggested in the original
patch. It puts each main section of the display into its own
tab.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-08 19:52:56 +13:00
Katrin Fischer
8f8fc1088a Bug 6458: Incorrect translation processing / serials/...
Fixes problems with template toolkit directives within HTML tags
for the serials module.

Serials > add/modify subsciption

serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:32:49 +12:00
Colin Campbell
99b51e0318 Bug 6733 - Change return page after printing routing slip
Previously printing a routing slip returned the user to
the top level in serials this change maintains the context
in the current subscription

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-27 19:40:02 +12:00
Frédérick Capovilla
4e44667cd6 Bug 6690: If multiple issues are received in serials-edit.pl, changing the status of any issue changes the date of the first issue.
If multiple issues are in the list, changing the status of any issue in
the table would always change the "Expected on" date of the first issue.
Modified the javascript so the date is modified on the correct row.

Reimplementation of Patch for 3.4.x
Patch for 3.2.x from Frédérick Capovilla

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-26 10:15:46 +12:00
9c339d466e Fix for Bug 6638, Columns misaligned on serials claims
T:T variable scope error. Also correcting placement of calendar
include in the source to avoid JavaScript error.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-07-29 08:48:16 +12:00
Chris Cormack
bd73c9f9ce Merge remote-tracking branch 'kc/new/enh/bug_5917' into kcmaster 2011-07-22 08:53:09 +12:00
d8bf9e6a29 Follow-up fixes for Bug 5917, Switch Koha to use Template::Toolkit
While fixing Bug 6395 I found a few other instances of leftover
TMPL usage.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-22 08:50:02 +12:00
Katrin Fischer
d80659ce35 Bug 6589: Adding supplements broken
To test:
- add a new subscription, choose 'create items on receive'
- receive some issues and create items > should work ok
- create a supplement, alone or at the same time as receiving a normal issue
- check if item was created and attached to the biblio record

Without patch this should give you an error message. Although supplement will be created,
no item will be added to the bibliogrpahic record.

With patch applied there should be no error message and the item should be created
and attached to the proper record.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-19 19:22:31 +12:00
f4892799e5 Fix for Bug 6577 - columns misaligned on serials search results
Minor T:T variable scope problem

[2011.07.12] I confirm the bug and the solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-14 10:38:48 +12:00
Ian Walls
f2fa6c893c Bug 6305: receiving serials does not create items
Template::Toolkit variable scope issue.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-06 08:32:07 +12:00
Katrin Fischer
ad26a21056 Bug 6305: Copy enumchron into created serial item
Should work for normal and supplemental issues.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-06 08:32:05 +12:00
Katrin Fischer
3b297b0e44 Bug 6305: Subscriptions can not be edited
This seems to fix the problem with editing existing subscriptions. Please test.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-07-06 08:32:04 +12:00
Colin Campbell
716442708b Remove a typo from serials-edit template
Rogue 'i' removed from template would show up in display

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-10 10:17:09 +12:00
Frédérick Capovilla
ddcf63d29b Bug 6444 Corrects encoding problems in subscription-add.pl
When searching for a vendor, if the vendor has accented character in its
name, the vendor's name that's added in the form of subscription-add.pl
is encoded incorrectly.

[2011.06.01] F. Demians. Port it to 3.4

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-05 18:41:43 +12:00
5984520211 Fix for Bug 6395, Cannot create routing list
Some old TMPL tags got left behind.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-26 09:26:17 +12:00
c92f9dee40 Bug 6320 Generate Next button doesn't generate next issue
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-11 08:55:37 +12:00
Colin Campbell
1c13785fed Bug 6194 Suppress punctuation when no location
Template was showing empty parentheses when no location
data was present. Punctuation should be dependent on
the variable being set

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-26 20:29:37 +12:00
Chris Cormack
1779c06164 Bug 6203 : Fix for numbering pattern not showing
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-20 14:35:52 +12:00
Jared Camins-Esakov
66fb80f436 Bug 6158: Permissions scoped wrong for T::T
Permission flags should always have absolute scope.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:16:27 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
db6ab6a6fd Fix for bug 5498, Standardize markup and style of pagination menus
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:25:36 +12:00
33c7b21cde Bug 6084: Missing translation markers in javascript alert messages
I ommited commented lines and "if $debug" lines too.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:45 +12:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13:00
Reed Wade
241fa939b4 Bug 5665: Routing slip prints too wide for narrow printers
This patch switches off some min-width styling which causes right hand
of page to be clipped.

Work sponsored by Opus

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-01 19:31:58 +13:00
Srdjan Jankovic
750a8a8dae Bug 5294 - Unescape vendor name when pushing back
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:11:19 +13:00
Paul POULAIN
c401514b95 MT2743 : add filter on subscription branch to subscription claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:17:13 +00:00
Paul POULAIN
73a140b509 some display changes in subscription add
- removing librarian line
- displaying subscription number only if it's a modif
- some minor html tag changes
- putting month length on top, as default for subscription duration (it's from far the most usual case)

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:14:02 +00:00
Paul POULAIN
2f9c8293c8 adding some javascript strings for translator
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:11:06 +00:00
Paul POULAIN
43bfa40307 minor change: reordering branch/location/callnumber display
it's more logical to have branch first, then location, then callnumber (from general to specific)
Previously, it was location/callnumber/branch

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 13:10:02 +00:00
Christophe Croullebois
01e4b668ca (MT #4108) Notes in serial
The public and nonpublic notes was redundant with two areas in the page, one was inactive, and in edit subscription page, the subscription history area had two redundant blocks for notes, this fix it.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:47:25 +00:00
Alex Arnaud
ba8a2c7e8a (MT4068) Display callnumber & location in serials-collection.pl & serials-edit.pl.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:46:48 +00:00
Henri-Damien LAURENT
2f318ab841 MT3801: Serials not received issues cannot be claimed
position problem for claimst table
the table was displayed at right handside of the window

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:36:37 +00:00
Jean-André Santoni
b833e0a70d Fixed a bug about hidden checkboxes in claims
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:04:05 +00:00
Jean-André Santoni
159c586b3c Added table filter to claims.tmpl
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:02:51 +00:00
Jean-André Santoni
0efaa6a41c Replaced CGI dropdown box call wich is deprecated
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:00:13 +00:00
Jean-André Santoni
df6283ffe9 Fixed the checkall checkbox
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:56:20 +00:00
Jean-André Santoni
34673bf4ef Checks serials item form
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 11:41:12 +00:00
Colin Campbell
aa6ce934d9 Bug 5022 Supplements were not saved correctly
No subscription id was set
Also entered a default arrived date on the supplement
And removed errors due to bad dates returned from GetSerials

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:13:59 +13:00
e54169ba0f Incremental fix for Bug 3285 - Location on Add Subscription should be pull down
- Adds location dropdown to subscription edit form
- Pulls authorised value for display on subscription detail page
- Adds function for pulling authorised value description based
  on category and value

This patch does NOT implement automatic preselection of the shelving
location form field on the serial add item screen. This must be
worked out in order for the bug to be closed.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-07 09:29:05 +13:00
8ef86f1875 Fix for Bug 4932, Serial Enumeration / chronology not populated on receive
- Correcting JavaScript so that serial enumeration / chronology is always
  prepopulated in the add item form when receiving a new issue.
- Altering the behavior of the "click to add item" link so that the
  "Arrived" option is automatically selected. This makes the link's
  behavior mirror the <select>'s behavior so that Arrived -> Add item
  and Add item -> Arrived.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-02 12:51:51 -04:00
Chris Cormack
b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Conflicts:

	installer/data/mysql/en/mandatory/userpermissions.sql
	installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
	installer/data/mysql/updatedatabase30.pl
	koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
	serials/member-search.pl
	serials/serials-edit.pl
	serials/subscription-add.pl
	serials/subscription-bib-search.pl
	serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:46 -04:00
Garry Collum
c45ddf7ff7 Bug 4199: Adds ability to print routing slip. Patch 2.
Previous patch added an invalid XHTML element.  This patch fixes it.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:52:59 -04:00
Garry Collum
e6a416a847 Bug 4199: Adds ability to print routing slip from serials-collection.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:52:58 -04:00
Garry Collum
59622c22da Bug 4805: Fixes multiple subscriptionid's being passed to serials-collection.
This is a replacement patch for my previous patch.

This patch insures that only unique subscriptionids are defined in the serials-edit form.  Multiple ids are passed to serials-collection, but not multiple copies of the same id.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:46:14 -04:00
Garry Collum
1dfc81a45e Bug 2889: Adds highlighting to serials-collection.tmpl
Also fixes inconsistencies in the capitalization in the headings.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 07:55:05 -04:00
Garry Collum
db1516269d Bug 3910: Removes an erroneous heading from the serials search results.
Removes the 'Search for Serial Routing' heading from the serials search result screen.

There is no code in the template that performs a routing search, and links to the routing tables are provided in the serials search results.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 07:55:03 -04:00
J. David Bavousett
f0528664ee Bug 3928: Modification of date for serials.
When a serial status is changed to "Arrived" or "Claimed", the "Expected on"
date is changed to the current date.

A bit of rewriting to get it to apply on master - chris@bigballowax.co.nz

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:34:17 -04:00
38b16e34fd fix various errors reported by xt/author/translatable-templates.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 08:36:21 -04:00
Garry Collum
caec9fae40 Bug 4432: Fixes XHTML in serials-edit.tmpl.
Replaces a reference to an undefined variable, num, with a defined variable to create unique ids.

Also adds zebra striping to the table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:41 -04:00
Garry Collum
d2d2acd4a6 Bug 4200: Fixes adding a member to a routing list after filtering results.
Adds a hidden field for subscriptionid to the filter form.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:40 -04:00