Commit graph

204 commits

Author SHA1 Message Date
Colin Campbell
d22a4d2038 Bug 5026 Undefined dates formatted poorly in serials-edit
Don't display junk in empty fields
Don't generate errors

Merged some changes to make variable names moremeaningful in loops ( within loops)

Thanks to M De Rooy for spotting a couple of issues in the original patch

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-17 21:22:14 +13:00
Nicole Engard
b7fdfc1384 bug 4131 have subscription so edit routing if one exists
Changes the template variable checked in serials-menu.inc for determining where to
show 'Create Routing List' or 'Edit Routing List' to hasRouting.

Also adds the $hasRouting variable to serials/routing.pl and serials/routing-preview.pl,
for completeness.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-01-12 12:13:34 +13:00
Colin Campbell
74e63fe0e6 Bug 4286 Allow receiving if subscription enddate not set
HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:18:15 +13:00
Chris Cormack
2529527597 Bug 5508 : Updating copyright statements 2010-12-16 11:49:36 +13:00
Colin Campbell
5bc49fe9eb Fix supplier loop in serials claims
Wrong parameter was being passed to GetLateOrMissingIssues
causing incorrect display of count
Remove superfluous loop creating array we dont use
No need to sort a sorted array
2010-12-15 16:53:12 +00:00
Henri-Damien LAURENT
9bfcf01abd MT3801: Serials not received issues cannot be claimed
waiting issues which where planned for an old date were not "claimable"
This also fixes a bug from commit

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 16:52:56 +00: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
Jean-André Santoni
ff36d256b7 (bug #4363) Fix subscription search error when no results
There was a template param assignment before template is loaded.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:52:09 +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
Matthias Meusburger
5fbcf225a4 MT3802: Patron notification is not correctly shown in subscription modification
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:45:34 +00:00
Henri-Damien LAURENT
c7effbe209 MT3667 followup MT3811 : unexpected issues not stored
As a consequence of previous MT3667 patch, the subscriptionid list was processed.
And unfortunately, since array order is the only relevant information from HTML processing,
it caused subscriptionid to be null for a double edition.
This patch only uses uniq for serials-collection and when passing information to serials-collection page.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:39:29 +00:00
Henri-Damien LAURENT
fc725ae643 MT3667 : multiple display of same subscription
The same subscription would be displayed multiple times when coming from serials-edit.
This patch fixes that problem

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2010-12-15 12:33:11 +00:00
Henri-Damien LAURENT
36e766aa4a merge problem 2010-12-15 12:19:41 +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
Chris Cormack
96330a7b07 Bug 5484 - Handling bad borrower categories in serial routing lists more gracefully
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 12:59:14 +13: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
Colin Campbell
48a10d3183 Bug 5032 Remove duplicate code
Two duplicate calls to GetSerials appear to have been merged in
to no purpose other than to generate warnings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 07:56:53 -04:00
Colin Campbell
dfaa0e9d35 Bug 5191 Patron notification was being reset to none
The value of the letter variable was not being correctly passed
to the edit template instead it was reset to none
Also compressed some verbage from letter_loop generation
(if you want a scalar use one)
removed an unused $count variable (?!)
and put a couple of lone )s back on the line they came from

Resend to remove wrong utf-9 header.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-06 06:03:08 -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
Colin Campbell
193b4f2883 Bug 4517 - add authentication to reorder_members.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 09:09:15 -04:00
Colin Campbell
aec1a31b23 Bug 2505 enable warnings in serials/reorder_members.pl
The only serials routine without warnings enabled was a
script with the least code to generate them
removed the numerous Module use declarations that were not
required
aligned the parameters for a more aesthetically pleasing effect

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 08:48:30 -04:00
Colin Campbell
757e1c91cc Bug 3928: Modified date should follow syspref
Changed arriveddate format to follow syspref
Fixed a whitespace error

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:34:22 -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
Henri-Damien LAURENT
92b076f0df MT3438 : faulty subscription-add branch selection
branch selection could lead to two branches selected
this patch removes the faulty line

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:11:49 -04:00
Donovan Jones
d5c8104389 Bug 2505 - Add commented use warnings where missing in the serials/ directory 2010-04-21 20:25:26 +12:00
Colin Campbell
255362e3cf Fix FSF Address in directory serials/
Add License statement to those files lacking it
2010-04-08 20:39:49 +01:00
Colin Campbell
ad3594fded Bug 4380 Use syspref to resolve which bib display is used
Be consistent with elsewhere in cataloguing
When switching there from serials

TODO Duplicates Code Should be in a common routine
2010-04-08 20:09:02 +01:00
Colin Campbell
5226371ea3 Remove bottleneck making claims page unuseable
While the idea of showing the number of late serials against the
vendor name was nice it does not scale and on large sites selecting claims
was just timing out. Improved the speed of the initial query but have removed
the big query for each user just to get a count.
Check for 0000-00-00 dates so that C4::Dates does not log error
Removed a variable that was never set and the bit of template used
if the impossible happened
2010-04-08 18:05:42 +01:00
Colin Campbell
f75cca228a Basic refactoring of serials-edit.pm
Removed some useless counts from serials-edit / Serials interfaces
Removed old commented out code. Unrequired variables
Reformatted some code so that improving logic can be done
more easily
2010-04-08 13:16:31 +01:00
Colin Campbell
20fb798f51 Remove unused or unnecessary variables in claims processing
Also cleaned the interface to the claims related functions
in C4::Serials so they do not return an extra count variable
moved generation of dropdown to template instead of inline code
2010-04-08 12:46:06 +01:00
Lars Wirzenius
9302e45442 Fix FSF address in directory serials/
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 20:17:54 -04:00
Colin Campbell
702c4e5d98 Bug 3700 Parameters passed in wrong sequence
As subsequent operations don't get what they expect
all manner of nastiness ensues

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 21:34:28 -05:00
Colin Campbell
fb3f7966b4 Cleanup date handling in routing.pl
Remove dead code
Clarify the loop assigning dates
Remove the cause of undef warnings in the log

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 10:12:35 -05:00
Colin Campbell
db511d897b Fix count in supplier dropdown in serials/claims.pl
Previous patch still used old variable name to get count causing
incorrect value to be returned

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 10:00:06 -05:00
Colin Campbell
c3c732f4bc Bug 4117 Fix system error in routing slip recepients popup
order_by parameter should be an arrayref of hashrefs
Have made order surname, firstname asc (see bug 4067)
do not generate logged warnings by manipulating undef

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 08:31:39 -05:00
e417385299 Bug 4085 - Subscription type length wasn't taken into account
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 07:29:05 -05:00
Colin Campbell
ef8c349c2c Fix some code issues in serials scripts
Add use warnings where not present
Remove unused variables
Avoid redeclarations of variables
trailing spaces trimmed

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-02 18:46:03 -05:00
Colin Campbell
6f58777313 Bug 766 Remove scrolling list from serials claims
Let templating system do what its designed for
pass an array ref with the suppliers
2010-01-05 17:11:31 +01:00
Chris Cormack
b33641ed1c Bug 3903 - Members names not showing on serial routing list 2009-12-20 14:31:38 +01:00
1b1972044c Fix for Bug 3905 (Serial routing list add patron popup pagination broken)
This patch also includes formatting fixes and style updates. The patron search filter form is incorporated now within serials/member-search.tmpl in order to have a markup structure more suited to the pop-up.
2009-12-20 14:31:33 +01:00
Henri-Damien LAURENT
6b29bb866b followup da49fc77df enh 3736 2009-11-23 21:35:07 +01:00
Henri-Damien LAURENT
27460a7ab4 Follow up : MT1902
aaa8d0c80c
This fixes the loop with dates with was using implicit variable
2009-11-11 16:53:28 +01:00
Henri-Damien LAURENT
72d91ac361 Adding a warning On subscription deletion for item
If we really wanted to delete all items linked to a subscription when we delete a subscription
we should change the database structure as such :
ALTER TABLE serialitems ADD FOREIGN KEY ( itemnumber ) REFERENCES items (itemnumber) ON DELETE CASCADE ;
ALTER TABLE serial CHANGE subscriptionid subscriptionid INT( 11 ) NOT NULL
ALTER TABLE serial ADD INDEX subscription ( subscriptionid )
ALTER TABLE serial ADD FOREIGN KEY ( subscriptionid ) REFERENCES subscription (subscriptionid) ON DELETE CASCADE ;
2009-11-11 15:19:24 +01:00
Henri-Damien LAURENT
fc1a5ed318 MT1883 : Serials enddate was not cleanly used
GetExpirationDate should now be used only to get the NEXT expirationdate based on startdate
Perltidying C4/Serials.pm
2009-11-11 14:00:11 +01:00
Paul Poulain
21c3169795 removing warnings 2009-11-11 11:17:48 +01:00
Paul Poulain
bd989696e3 transforming dates to iso to avoid a mySQL error 2009-11-11 11:17:48 +01:00
Paul Poulain
1ca96457b3 Displaying serial call-number on receive.
when the subscription has item creation, the callnumber is inside the item creation.
But when it doesn't have, the callnumber is not displayed, but is useful to be put on physical item.
This patch display the callnumber after the title
2009-11-10 22:23:49 +01:00
Henri-Damien LAURENT
da49fc77df 3736 enh : Adding syspref RoutingListAddReserves
Adding syspref RoutingListAddReserves
Using it in routing-preview
2009-10-29 15:29:04 +01:00
Henri-Damien LAURENT
a9aca08a51 MT 1902 : routing lists presence should be shown
in serials-home, when showing the list of serials,
display is changed in order to display the presence of a routing list
for a subscription
2009-10-29 15:12:53 +01:00