Commit graph

52 commits

Author SHA1 Message Date
Katrin Fischer
d9d364516b Bug 7521: Templates should use receive_serials permission
Corrects templates to use permission receive_serials.

Before patch:
1) Serial receive page (/cgi-bin/koha/serials/serials-edit.pl...)
can only be accessed with full serials permissions.
When one permission is missing, page can not be accessed.

2) Serial collection/Issue History page (/cgi-bin/koha/serials/serials-collection.pl...)
can only be accessed with full serials permissions.

After applying patch:
1) Serial receive page can only be accessed when user has receive_serials
permission.

2) Edit and serial receive links are hidden, when user doesn't have
serials_receive permission. Page is accessible with at least 1 serials
permission.

I will send a another patch to correct behaviour for the routing permission.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 09:51:49 +01:00
Liz Rea
1ddc9322df Bug 7546 - cannot view subscription detail
This patch adds a C4::Search to subscription-detail.pl to compensate for a removed
one from auth.pm during the denesting effort.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Bug 7546 Do not call routine as bareword

Fixes compilation errors due to calling routine without parens
Also nothing was gained (and obfuscation added) by forcing
the return into a hash ref have changed variable to hash
tidied up the if else chain

These routines should be refactored out future

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

bug 7546 follow-up, enabled_staff_search_views problem

* enabled_staff_search_views was not exported by C4::Search, should have been
* serials/serials-edit.pl were also missing it

Comments:
* checked with for file in */*.pl; do perl -wc $file; done that no script was still having this problem

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Final sign off for all 3 patches
Note: I had some problems with tests, but it is probably related to my data and not this patch.
2012-02-17 09:05:54 +01:00
Frédérick Capovilla
acc684bc01 Bug 6479 Converts all the serialseq variables to UTF-8.
Corrects a problem when an UTF-8 character is used in the serial
numbering formula. The encoding became incorrect when concatenating the
number in the subscriptionhistory table.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To reproduce:
- Create subscription with numbering pattern N° {X}
- Receive 2 or more issues
- Check subscription summary page and manual history fields on the edit screen

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 06:31:03 +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
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
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
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
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
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
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
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
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
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
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
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
Colin Campbell
c9f3ede161 Enable warnings in serial scripts
Remove some superfluous variables
Simplify some loops over lists
Fix generated warnings
Strip whitespace from line endings

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-14 21:26:11 -04:00
Nahuel ANGELINETTI
8cd87e5426 (bug #3198) fix serial receive with autobarcode
this add an arg to GetMarcFromKohaField, else it will always return (0,0).

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-05-11 07:47:06 -05:00
Galen Charlton
8f07521a2d bug 2955: fix remaining calls to GetMarcFromKohaField
This includes part of a patch from Henri-Damien Laurent
that could not be applied because Chris and Joe patches
happened to win the race.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-02-12 16:29:19 -06:00
Henri-Damien LAURENT
d7a56c856e Bug fixing : 2470 Serials forgetting library
Using default values for PrepareItemrecordDisplay
It changes Biblio.pm
Adding a hash with default values to PrepareItemrecordDisplay
Usunf that API in Serials.pm and serials-edit.pl

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-06 09:35:44 -05:00
Paul POULAIN
80c8b5c149 bugfix for 2451 : serial recieve & barcode does exist complaint
If barcode already exists, then return an error.
making some checks on values passed through the code.
Duplicated serialid and subscriptionid are displayed only once.

This manage multiple errors on barcode and displays them.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-05 08:15:29 -05:00
Joshua Ferraro
d7e117afe3 Revert "bugfix for 2451 : serial recieve & barcode does exist complaint"
This reverts commit 23b8da277b.
2008-08-05 08:12:49 -05:00
Paul POULAIN
23b8da277b bugfix for 2451 : serial recieve & barcode does exist complaint
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-08-04 08:43:20 -05:00
Chris Nighswonger
4f3df5d1d2 kohabug 2219 Corrects inconsistent use of subscription.serialsadditems column
From the bug report:

The serialsadditems syspref was ostensibly removed in DB rev 071
(http://git.koha.org/cgi-bin/gitweb.cgi?p=Koha;a=commit;h=5c41ae54e68866f9661e853376537059f4d83f70)
in favor of a new serialsadditems column in the subscription table.

However, this removal was incomplete.  It is still created for new installations by:

installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql

and is used in

serials/serials-recieve.pl
serials/serials-edit.pl
admin/systempreferences.pl

Since the system preference was not removed from the sample data scripts, it
is necessary to add another DB rev to remove it - a user may have made a
fresh install of Koha after DB rev 071.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-27 06:07:45 -05:00
Chris Nighswonger
cdf93bffee kohabug 2380 Correcting serialitems table structure and fixing duplicate barcode check
The current serialitems table structure does not provide for a *:1 relationship with
the serial table. This causes a problem when attempting to add multiple items to a given
serial. The db throws an error when attempting to INSERT in  serialitems due to serialid.serialitems
being a unique key. A further side effect is that the marc record is updated with the
item inspite of the error. The mods to the serialitems table structure in this patch
drop serialid.serialitems as a key and make itemnumber.serialitems the primary key
creating a *:1 relationship with the serial table. This patch also makes serialid.serialitems
a foreign key referencing serialid.serial to maintain referential integrity.

Fix for duplicate barcode check

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-27 06:07:40 -05:00
Chris Nighswonger
40f09c8166 kohabug 2150 Correcting (somewhat) the inconsistent use of autoBarcode syspref
This patch corrects somewhat the inconsistent use of the autoBarcode syspref in serials-edit.pl
It does not impliment all the possibilities currently available in the autoBarcode syspref as
there is currently no support for the js plug-in/drop-in feature in serials-edit.pl. So in this
sense, the autoBarcode syspref is still used inconsistantly here. The fix for this is recommended
for rel_3_2

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-07-22 15:50:23 -05:00
Joe Atzberger
75c0bef66f Remove bad use of map in void context, exclusively for side effects!
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-05 22:43:20 -05:00
paul
7be6d1f12b IMPROVEMENT : serialsadditems at subscription level (bump 071)
The patch update the DB by adding a row in the subscription table (serialsadditems), that is filled with the value of the syspref.
then, the syspref is deleted.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-04-22 17:34:33 -05:00
Ryan Higgins
fd65fcc365 fix record->field call on autobarcode
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-10 15:36:18 -06:00
Ryan Higgins
f98e567b57 Populate serialitems table, bugfix
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-10 13:45:19 -06:00
Ryan Higgins
3de59aba27 Serials updates to link item record to serial table.
This commit makes db changes to subscription, serials tables:
  allow subscriptions larger than 127 issues
  link serial to item uniquely.
MARC Framework:
  Adding MARC tag 942$s (990$s unimarc) to map biblio.serial
Udate biblio.serial on new-subscription.
Use biblio.serial to check if Items.pm should return
  pubdate and enumeration text string from serials table with items.
Update opac-detail so serial items are sorted most recent first.
Adding link from items table to serial table.

Allows sorting of serials in details pages, and removes
enum data from itemnotes field.
Also fixes  visibility in serials item editor

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-08 11:11:45 -06:00
Galen Charlton
c6c8e80a73 start of BIB change -- introduce C4::Items
Introduced C4::Items module to separate items API
from biblio API.  Details on changes will be
put in later commit messages.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 16:23:12 -06:00
Joshua Ferraro
a602c6d6eb cleanup for serials and members for Dates 2007-12-04 19:03:35 -06:00
Joe Atzberger
a5746c616a serials subdir - Dates.pm integration and warnings fixes.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-04 18:21:07 -06:00
Henri-Damien LAURENT
855d9697de Bug Fixing : itemization would create undesirable items
One item was created for "unexpected" issues if the first issue was received.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-08 17:10:49 -06:00
Henri-Damien LAURENT
4399daf0bd Managing Independant branches.
librarian can edit only subscriptions on branches of his or subscription with no branch now.
cannotedit is a calculated value in Mysql and transfered for process.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-04 16:27:25 -06:00
Mason James
58dfd9c18e fix for 1521, boolean test for 'autobarcode' syspref fixed, and test for non-existant $marc->field before barcode subfield add
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-31 05:58:14 -05:00
Mason James
fda72bf787 if() incorrectly eval-ing syspref value 'FALSE' as true, wrapping in boolean.
if (C4::Boolean::true_p(C4::Context->preference("autoBarcode")) != 0 )

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-29 16:06:09 -05:00
Paul POULAIN
8b7085a8ab removing useless code
the 3 parameters :
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),

are filled by Auth.pm automatically, removing them in templates

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-24 17:03:38 -05:00
Chris Cormack
606ecb532a Patch from Joe Atzberger to remove $Id$ and $Log$ from scripts
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-18 16:27:04 -05:00
hdl
e3791f5966 Bug Fixing
Getting back to serials-collection when edit finished.
subscription-renew is done in a popup.
2007-07-16 15:49:14 +00:00
hdl
866708d29a serials-edit.pl
Changing redirection to serials-home.pl
serials-home.pl
	Adding some parameters to serials-home script to display information passed by serials-edit.pl
	Preparing information for display.
(template to get committed)
2007-06-30 06:23:10 +00:00
hdl
b05cb8df7b Adding redirection to serials-collection.pl if no serials selected for edition. 2007-05-18 12:00:17 +00:00
hdl
827ed50aee Adding bibliotitle information to display 2007-05-18 09:25:06 +00:00
hdl
097fef712a Removing $dbh from GetMarcFromKohaField (dbh is not used in this function.) 2007-04-27 14:00:48 +00:00
hdl
100e6a9808 functions that were in C4::Interface::CGI::Output are now in C4::Output.
So this implies quite a change for files.
Sorry about conflicts which will be caused.
directory Interface::CGI should now be dropped.
I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip.
2007-04-24 13:54:28 +00:00
tipaul
b71839d85c circulation cleaning continued: bufixing 2007-04-17 08:44:49 +00:00