for each budget period and budget, the library can enter planning on branches, itemtype, month or any auth_value selected as planning category for a given budget
* budget period management
* budget management (budgets lines are defined for a given budget period)
budget_owner_search is the popup to select a librarian as budget owner
While trying to add a new Branch with an existing Branch code, the UI says "Library saved" instead of something such as "Please select a unique branch code".
This patch, disallow the users to create frameworks without frameworkcode.
It adds some javascripts checks, and some perls checks(for non-javascript users).
Adding finedays and reservesallowed and renewalsallowed management in smart rules
Adding Clone Rules
Adding CanBookBeReserved and CanItemBeReserved in C4::Reserves
Manage Reservesallowed in opac and staff interface
Manage renewalsallowed in C4/Circulation.pm
Update Database follow
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Adds selection by row and by column, all/none/toggle for individual ccode/itype sets, and a tabbed interface for a more compact display.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Pending a system for displaying the correct currency symbol based on the system's default currency all dollar-specific symbols should be removed in favor of no symbol.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Remove "toggle" code and useless javascript.
Rework "SimpleSearch" to use just one argument.
Remove unnecessary dependencies.
Remove incorrectly pasted comments.
Remove queries that didn't do anything.
Enable warnings. Use one $dbh. Remove $sth->finish calls.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed toggle variable from auth_tag_structure.pl and .tmpl. Used template __odd__ in auth_tag_structure.tmpl.
Removed toggle variable from auth_subfields_structure.pl and .tmpl. Use __odd__. Removed a type in the highlight class definition. Fixed a minor xhtml error.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Relatively minor cleaning.
Remove unused javascript. Add row highlighting to both tables. Remove conditionals where the
behavior is the same for both possibilities.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed toggle variable from marc_subfields_structure.pl and marc_subfields_structure.tmpl. Used template __odd__ variable instead.
Corrected a typo in the highlight class definition in .tmpl.
Corrected a readability issue with the description when deleting a subfield in .tmpl.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Fixed useless redirect statements that weren't even printed.
Removed unused javascript and script variables;
Removed sth->finish. Use get instead of post on "cancel" button (no data to post).
Reduce duplicative variables (e.g. scriptname and script_name).
Many other problems are still in the scripts, including use of META-REFRESH instead of
redirect, and the whole idea of redirecting back to the same page for no valid reason.
We should be able to formulate the right response on THIS pass, not ask the browser to start over.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed toggle variable from categorie.pl and categorie.tmpl. Used template __odd__variable in categorie.tmpl.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed toggle variable from aqbookfund.pl and aqbookfund.tmpl. Used template __odd__ variable in aqbookfund.tmpl.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed unused javascript. Enabled warnings. Use common $dbh.
Removed sth->finish calls. Removed toggle code. Added row highlight where
none had been implemented. Added some HTML escaping in TMPL.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed toggle variables from z3950servers.pl and z3950servers.tmpl. Used template __odd__variable instead.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed unused toggle variable form smart-rules.pl and added highlighting to smart-rules.tmpl through template __odd__.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed toggle variable from roadtype.pl and roadtype.tmpl. Corrected typo in class definition in roadtype.tmpl and add highlighting through the templated __odd__ variable.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Removed toggle variable from itemtypes.tmpl and itemtypes.pl. Used the __odd__ template variable instead.
Resubmittal - first patch contained a typo.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Remove entire subs that were unused. Remove "toggle" code.
Comment out unconditional warn.
Remove inaccurate comments regarding long-fixed bugs and obsolete processes.
Remove unused variables.
Added "dialog message" div around MESSAGE8.
NOTE: all printer functions currently useless, unfixed by this patch.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
80% of the javascript was junk.
Bad check failed on non-existant field borrowers.select_city.
Enabled warnings. Reduced "StringSearch" to 3 lines, removed unused args and vars.
Fixed row highlighting and removed "toggle" code. Etc.
TODO: Stop redirecting to the same page. Instead get the correct data and show it
on THIS pass.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
[1] Restore behavior of the input field for the library
code; when adding a new library, it should be a
a text box; when editing an existing library,
should be a hidden input.
[2] When user attempts to add a new library with the same
code as that of an existing library, populate the form
with what the user entered for the new library, not the
values from the existing library.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
While trying to add a new Branch with an existing Branch code, the UI says "Library saved" instead of something such as "Please select a unique branch code".
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Patch by Rick Welykochy <rick@praxis.com.au> with some squashing
by me.
Bug Report: 2866 Filtering and sorting the overdue report using patron attributes
1. Create a new system preference ?FilterBeforeOverdueReport?
2. Option to filter *before* the overdue report runs, avoiding report slowness
3. Add searchable patron attributes to the list of overdue report filters
4. Add searchable patron attributes to the sort fields on the overdue report
5. add item call number and replacement price
6. the CSV download link now returns the same
data as the web report, rather than (inconsistently)
trying to run the overdue_notices.pl batch job
7. always run report if requesting CSV
8. barcodes are now links
9. use item-level item type for overdue itemtype filter
Included is a new callback for searching patron attributes, similar
to circ/ysearch.pl.
The following additional bugs are fixed:
2748: Nothing is output to the .csv file for the "Overdues" circulation report
This is fixed by having circ/overdues.pl produce the CSV output directly instead
of trying to call the overdues cronjob. The CSV output includes all of the fields
that are displayed on the web table plus the item replacement price and any extended
patron attributes.
2836: overdues.csv may contain HTML
2837: Descending sort doesn't descend on the overdues report plus other probs with report
This enhancement was sponsored by the Plano Independent School District.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Add the ability to set the default circulation messages preferences
for a patron category. When the EnhancedMessagingPreferences
syspref is ON, the administrator will be able to define
default patron messaging preferences for a patron category. When
a new patron record is created (either manually or via a patron
import), the new patron's preferences will be copied from the default
for that patron's category.
Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Because of the way that HTML::Template::Pro evaluates
expressions, any variable referred to in a TMPL_IF EXPR
must be be present when the template is parsed, otherwise
you get Apache error log warnings like this:
non-initialized variable new_subfield
For a simple flag check, TMPL_IF NAME="new_subfield" is sufficient.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Added escape="html" to several TMPL_VAR tags which need it in order
to deal with quotes and other special chars in user supplied data.
Many other templates still need to have escaping added to fields which
allow free form entry.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
In an list of autorised values (Parameters >autotised values), if you delete an
autorised value after confirm, you go back to the first page of the list, and
you must return manually to the page you left before.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
- fixed cross browser issues. (IE and Safari don't let you say
someobject.class, presumably because "class" is a keyword that's reserved
for future versions of JS. Firefox and Opera allow it.)
- added text to the grid for added clarity.
Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
- grid layout (javascript required now)
- makes distinction between checkin and checkout messages
- no longer have to click on a button to submit the branch selection form
Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
- This will allow admins to disable notifications for any combination of
branch, patron category, and item_type.
- Still working on this...
Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This adds holds policy creation support to smart rules and read support to
C4/Circulation.pm, and the two reservation pages. It also adds a system
preference, AllowHoldPolicyOverride, to control whether the staff can override
these policies.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Various fixes to meet coding standards, template
design, and basic functionality:
* (bug 2505) turned on warnings
* use correct loop names when populating
$template
* put all TMPL_FOO in HTML comments
* assign UseBranchTransferLimits to circulation tab
* change template to use "library" instead of "branch"
* use standard YUI scripting for toolbar buttons
* add new script to admin menu
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Added syspref to updatedatabase.
Updated kohastructure.sql with the limits table.
Signed-off-by: Andrew Moore <andrew.moore@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This allows the user to edit system preferences from the main system
preferences screen, rather than having to dig down into each
preference.
[This patch includes some modifications by Galen Charlton
to fix XHTML validation errors and a couple errors that
would crop up under warnings.]
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Following suggestion by Vincent Danjean for Debian
packaging, 0755 -> 0644 for non-executable
files.
Also removed shebang from a few modules in C4.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This fixes the tabs plugin's view of the % subfield by adding another template var called urisubfieldcode that is "pct" when the subfieldcode is "%".
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This is one place that TMPL EXPRs actually made sense, against my better
judgement. It's already used in this template, so if someone wants to clean
it up, feel free.
Added a test to the MARC framework checks to
verify that all authority types used in a framework
are defined.
Documentation changes: possible new screenshots
and text to describe the new test.
NOTE: This patch adds strings to the checkmarc template, and thus
violates the string freeze for 3.0. I'm submitting anyway
because 2254 is a blocker, but if no exception is made,
it is safe to not apply this patch for 3.0.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Patch to remove issuingrules.pl in favor of
using smart-rules.pl to manage loan and fine
rules. Several reasons for this:
* issuingrules.pl's matrix could grow rather large
if the library has a large number of item types
and patron categories
* successfully entering rules via issuingrules.pl
requires placing commas within input fields
* a sparse circulation policy matrix takes the
same amount of screen space as one that uses
rules for a lot of specific patron category/item type
combinations.
* having two administrative interfaces to the same
policy settings could be confusing.
* UI design of smart-rules.pl better lends itself
to adding more policy setting attributes to the
rules matrix.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Removed the separate admin/finesrules.pl script
to set the fines policy matrix: since admin/finesrules.pl
and admin/issuingrules.pl both touch issuingrules.pl, creating
a specific fine rule could silently override a default issuing
rule and prevent items from being checked out.
Circulation policy matrix settings for fines are now
handled in admin/smart-rules.pl
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
* Added ability to specify total loans allowed at a library
for the default patron category. If set, the default
limit is applied if no rule for the specific library
and patron category is set.
* Added ability to specify default total loans allowed
for the default library; this is applied if no rule
for the specify library is set.
* Form now indicates if the number of current checkouts
allowed is unlimited.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
The alternate issuing rules editor can now allow
defining the maximum number of loans that a borrower
of a given category can take out per branch, regardless
of item type.
The form for entering this limit now appears below
the form for setting loan rules per patron category
and item type. The form only appears if a specific
branch is chosen, not if the default branch is used.
Also, some terminology changes:
* "Amount Loanable" => "Current Checkouts Allowed"
* "Amount" => "Fine Amount"
* "Grace Period" => "Fine Grace Period"
* "Charging Interval" => "Fine Charging Interval"
* "Loan time" => "Loan Period"
Documentation change: new screenshots for the alternate
loan rules form.
squashme terminology
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Extended help on the alternate circulation rules
form to list the order of issuingrules lookup as
follows:
same library, same patron type, same item type</li>
same library, same patron type, default item type</li>
same library, default patron type, same item type</li>
same library, default patron type, default item type</li>
default library, same patron type, same item type</li>
default library, same patron type, default item type</li>
default library, default patron type, same item type</li>
default library, default patron type, default item type</li>
This includes modifying two routines in C4::Circulation to
follow this order: GetLoanLength() and GetIssuingRule().
The reason for this change is to have Koha exhaust all issuingrules
possibilities for a branch before checking the rules for
the default branch - this is consistent with what an admin
might expect from looking at the issuingrules forms, which display
settings a branch at a time, and is more consistent with how
circulation rules should work for indepdendent branches.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Issuing rules are now explicitly sorted by patron category,
then item type. The default patron category sorts last; within
a list of item types for a given patron category, the default
item type sorts last. This follows the order in which
the issuing rules are applied.
Since the primary sort is patron category, also moved that
to be the first column in the issuing rules table.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Improvements to smart-rules.pl to allow it to
replace issuingrules.pl.
* standardized "borrower type" to "patron category"
* made default item type and patron category ('Any')
translatable
* regularized construction of parameters for rule
deletion operatrion
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This patch modifies 13 HTML templates and includes that have lines in them longer than 998 characters. Lines this long are known to break git.
I believe that none of these change behaviour at all, but I'm concerned about one of them. It adds whitespace (carraige returns) inside a <title> tag. I'm not certain that all browsers will deal with this OK.
No documentation changes necessary here.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This applies to the list of system preferences in
the syspref editor - the OPACUserCSS syspref had
angle brackets in its description.
Used template change to accomplish this. Note that
syspref value is escaped by the script, note the template.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
[1] Added MARC-8 as an encoding choice on the target
administration page.
[2] Fixed TMPL coding errors.
[3] Set the correct encoding (as it happens, 'MARC-8')
for all of the English sample Z39.50 targets.
Documentation note: due to this patch and the ones from
Frederic, screenshots of the page for editing a Z39.50
target should be redone.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Third attempt to correct a bug affecting this page.
Combo lists wasn't reflecting DB content in modification.
To Joshua: You have to apply patch 2 first (patch 1 isn't required)
since I applied this quick fix without rolling back to original state!
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Improve previous patch which was badly coded as pointed out by
Henri-Damien. <TMPL_IF> clauses were included in HTML tags:
it fails translator tool.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
On /admin/z3950servers.pl page, modifying a z3950 host wasn't working
properly. Selected values in Syntax and Encoding combo boxes were hard
coded rather than selected based on record values.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Added new script under the Administration menu
to create, update, and delete patron attribute types.
Some things to note:
- once an attribute is created, its code cannot be changed
- the repeatibility and unique_id settings of an
attribute type cannot be changed after creation -
this is to avoid having to deal with changing
constraints if an attribute type is already in use
by patron records
- an attribute type cannot be deleted if it is
used by any patron records
- this administration page is always displayed regardless
of the value of the ExtendedPatronAttributes syspref. If
the syspref is off, the page will prompt the superlibrarian
to turn it on if desired.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Adding New Systempreference AddPatronLists
This systempreference allow administrator to choose if patrons are created on categorycode lists or category_type ones.
Overloading GetBorrowerCategory so that if no parameter provided, it returns the list of category records
Changing memberentry.pl in order to use the categorycode when provided.
Bug Fixing Circulation.pl so that doesnot come up with Error 500
with no category selected for GetBorrowerCategory
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This patch adds the ability to associate icon images with authorized values.
They're not displayed anywhere yet, though. There's also a database update
in here. I took version "3.00.00.075", but I can change that later if it gets
taken before I commit these patches.
DOCUMENTATION CHANGES: When you add or edit authorized values, you can now
associate image icons with them. These icons come from the same icon sets
that you can have with your itemtypes, such as media type. They don't show
up anywhere yet, but that's coming. Keep an eye on
http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=2047
for more updates.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
I'm extracting some of the icon manipulation logic so that I can get to it from the authorized values pages.
There should be no functionality or documentation changes with this commit.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
I've rearranged the two directories where media type icons live.
I've also added two more collections of icons, one from
http://apps.carleton.edu/campus/library/bridge_icons/
and one from liblime (Tina). The first has a license restriction that I added
to the "Licenses" tab on the "About" page.
Then, I've adjusted the Item Types Administration page so that it can deal
with multiple collections of icons.
I also added a test script to verify that the two identical icon directories
are actually identical.
DOCUMENTATION CHANGE: It's possible that we need to add something to the administration
documentation to indicate how you can add more sets of icons if you want. You simply add
directory to koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/ and to
koha-tmpl/opac-tmpl/prog/itemtypeimg. The icons should start showing up.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Check verifies that all subfields for each tag
are assigned to the same editor tab (or are ignored).
This situation can lead to data corruption, because
if an incoming MARC record has a field whose subfields
are assigned to different tabs, the first time that
record is saved in the bib editor, the field
will be split into multiple versions, each containing
the subfields assigned to a given tab.
Errors identified by this test known
in the MARC21 frameworks - I'm working on a patch to
correct those.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Also added template for "prog" set, and modified admin-home and -menu accordingly.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
this noprint class can be used for all buttons & other places where the screen display something you don't want to see on printer.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Adding encoding for z3950 server information.
Uses Text::Iconv for conversion (ISO6937 and ISO_5428 and ISO5427)
For ISO 5426 (ANSEL or MARC-8) new char_decode5426 based on marc4j tool.
Not Tested on LOC or any USMARC z3950 source. But tested OK on BNF and SUDOC.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
tmpl_process3.pl still throws some multi-byte warnings
but no markup errors
There are still quite a few places we could normalize
to reduce the size of the translation file
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Also put the prev/next page buttons in the same place relative to the
action links
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
solved by removing the "action" parameter which was useless and hardcoding a text
+ reindenting
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
replacing the @ by _ in the template, wich is valid.
I also have changed a little the behaviour : the New button appears only
for >010 fields (<10 have only the data, no real subfield)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
PLEASE : do not include tmpl_if in <input>, the translator too get confused
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Database schema definitions and system preferences support
for defining classification sources and filing rules.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Also added results of two subtests missing from the template.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
updating fines rules management :
- replacing '*' by default
- removing bottom line (*) that means nothing
- dealing correctly with .0000 fine values
- fixing fine storage
still fines.pl to do
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
IMPORTANT NOTE : all existing test database for 3.0 must manually delete ALL constraints on issuingrules table
(the update22to30.pl don't contain the constraints anymore, as kohastructure.sql, so are concerned only the existing 3.0 tests databases)
Filling issuingrules table :
- the issuingrules table can't have a constraint on categorycode, as we have a '*' categorycode (=default issuingrule)
- reintroducing the "default" issuingrule column
- changing some text ('*' replaced by something more explanatory)
- handling correctly the '0' (that is different from 'undefined'
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
Zebra (and NoZebra) doesn't deal with stopwords.
It search the exact string the user types.
This commit :
- reintroduces stopword management script that was in 2.2
- add stopword management to Zebra & NoZebra searches.
PS : fortunatly, the stopwords table was not removed by updatedatabase, so nothing to do here.
(& the table is in kohastructure.sql)
Signed-off-by: Chris Cormack <crc@liblime.com>
Output.pm: sanatizing variable names
ran perl -pi~ -e 's/\/includes\/calendar\//\/lib\/calendar\//' * in every staff template dir
Signed-off-by: Chris Cormack <crc@liblime.com>
