Commit graph

13770 commits

Author SHA1 Message Date
Stéphane Delaune
4c70627e9e (MT #1654) followup : Adding jquery.tablesorter and jquery.tablesorter.pager support for branches.pl 2010-12-21 21:18:11 +13:00
Stéphane Delaune
d950e509ff (MT #1654) Adding jquery.tablesorter and jquery.tablesorter.pager support for authorised_values.pl 2010-12-21 21:18:11 +13:00
Stéphane Delaune
1242ec7cc4 (MT #1577) complete langages checkbox for unique id 2010-12-21 21:18:11 +13:00
Henri-Damien LAURENT
77426c9ef1 MT4009: followup removing systempreferences
searching a systempreferences was disabled owed to the fact that it is now systempreferences which is used.
2010-12-21 21:18:11 +13:00
Paul Poulain
79ad2a0e17 Removing usage of preferences.pl 2010-12-21 21:18:11 +13:00
Henri-Damien LAURENT
fb804b6020 Followup admin/categorie.pl
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-12-21 21:17:30 +13:00
Matthias Meusburger
c00a51468e MT 2310 : New subfield for fields < 10 is now in a tab
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-12-21 21:17:30 +13:00
Matthias Meusburger
710993d0e7 MT 2446 : Cancel authority edition for a field goes back to this field 2010-12-21 21:17:29 +13:00
Chris Cormack
a1c6cbbb77 Merge remote branch 'kc/new/enh/bug_5106' into kcmaster 2010-12-21 20:52:28 +13:00
Chris Cormack
1729177587 Bug 5106: Tidy up code in opac-showmarc.pl 2010-12-21 17:12:49 +13:00
3f0eeb9c28 Proposed fix for Bug 5106 - Simplify MARC view choices in the OPAC (Conflict marker fix 2nd try)
- Eliminates the "Extended MARC View" tab
- Points the "MARC View" tab to opac-MARCDetail.pl as it is when XSLT is off
- Offers a "view plain" link on opac-MARCDetail.pl. Clicking this link
  replaces the standard labeled MARC view with an unformatted view similar to the
  one displayed in the pop-up modal MARC view.
- When viewing the "plain view," clicking the "view labeled" link will return
  you to the standard labeled MARC view.
- Adds a new XSL file for displaying MARC data in a slightly-more-formatted
  manner (compared to one big <pre></pre> block).

Removed a conflict marker line from Owen's patch (Marcel).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 17:01:33 +13:00
6b3e4f19f4 Bug 4838 Allow to choose which authority heading to copy into biblio record
With this patch, in biblio record data entry form, when ... is clicked for an
authority controlled field, it's possible to select which heading repetion to
copy if the authority has repeated headings.

When there is just one authority repetition, the first one is displayed to
choose, as previously.

This patch is REQUIRED by French libraries following SUDOC UNIMARC format, and
cataloguing multilingual materials ie all Higher Educational and Research
libraries.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 16:50:45 +13:00
Chris Cormack
9b2cfae017 Merge remote branch 'kc/new/bug_5035' into kcmaster 2010-12-21 16:48:42 +13:00
Nicole Engard
a45eb8fb78 bug 5035 remove default opaccolorstylesheet value for new installs
Per the bug, the color.css file is blank and so this preference
should have no value by default. This patch only fixes this for
new installs. There is no way to know if people have added values
to the color.css file in existing installs, so removing that value
in those cases might break things.

This patch does not remove the blank color.css file, it only
edits the default system preference.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 16:48:14 +13:00
Robin Sheat
8e5ee007db Bug 5186 - allow tax rates to be set to zero (master)
This allows the tax rate for a vendor to be set to zero. Previously, a
zero meant that the system default was used. Now, zero means no tax, and
to have it be the default the field should simply be left empty.
Additionally:
* this will now show on the vendor display if the tax value is from the
  system default
* this includes a database update that changes all the existing 0.00 tax
  settings to be NULL, which preserves existing behaviour.
* this now saves the tax value supplied for new vendors

Note: this patch applies against master

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 14:34:05 +13:00
Robin Sheat
3775854158 Bug 5522 - allow google preview to open in a new window
If the OPACURLOpenInNewWindow system is set, then google preview links
will obey it.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 14:23:49 +13:00
Christopher Hall
023d6b9e36 fix for umlauts in templates, XSLT still buggy 2010-12-21 11:14:59 +13:00
Chris Cormack
9693db7bff Merge remote branch 'kc/new/enh/bug_2965' into kcmaster 2010-12-21 08:51:31 +13:00
Katrin Fischer
cf4d851907 Bug 2965: Follow up - fixing problem with barcode field
The scanned barcode stayed in the checkout field instead of being
deleted after checkout or confirmation.

This patch reverts the template change, so the barcode is deleted.

Please test!

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-21 08:44:46 +13:00
Chris Cormack
9e9d8dbe2c Merge remote branch 'kc/new/enh/bug_4473' into kcmaster 2010-12-21 08:34:51 +13:00
Chris Cormack
f5e65148ac Bug 4473: Making a change to TmplTokenizer.pm to stop translation error 2010-12-21 08:31:07 +13:00
Chris Cormack
8fe46f3dc1 Merge remote branch 'kc/new/bug_5143' into kcmaster 2010-12-20 13:24:40 +13:00
Liz Rea
c25aaf1ca4 Bug 5143: Help file revisions per Owen Leonard
Nice changes, thanks. :)

LR

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 13:23:05 +13:00
Chris Cormack
3c19f22f86 Merge remote branch 'kc/new/enh/bug_5283' into kcmaster 2010-12-20 10:44:03 +13:00
Chris Cormack
206e0709d7 Bug 5283 Follow up, fixing broken template syntax 2010-12-20 10:42:59 +13:00
Amit Gupta
21cae2609d Bug 5489: Send hold email to branch email address if it exists instead of koha email address
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 10:24:53 +13:00
75762a63e9 Fix for Bug 3262 - OPAC needs syspref to show homebranch on detail page
Revised version of Liz Rea's fix adding homebranch by default. This
revision displays the homebranch name instead of branchcode.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 10:12:34 +13:00
Chris Cormack
c9465ed9df Revert "Merge remote branch 'kc/new/bug_5373' into kcmaster"
This reverts commit bf5a328af6, reversing
changes made to a904a9bac7.
2010-12-20 10:08:02 +13:00
Jesse Weaver
88d3d09897 Add .packages file for Ubuntu 10.10
Ubuntu 10.10 has all of Koha's Perl dependencies packaged (aside from a
couple small version issues); add a dpkg --set-selections compatible
file to reflect that.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 09:57:30 +13:00
814795da60 Bug 5506 Improve translation script
[1] Update all .po files in once with this command:

    translate update

[2] For sysprefs, quoted text wasn't properly retrieved from .po file and so
    quoted strings wasn't translatable.

[3] The install process (translate -p install de-DE) was rewriting syspref
    .po file which isn't required anymore.

MUST be applied to [3.2] to get all syspref proper translation.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-20 08:48:37 +13:00
Chris Cormack
8902ee5684 Merge remote branch 'kc/new/bug_5446' into kcmaster 2010-12-19 21:26:06 +13:00
9a048e2b12 Bug 5446 Fix a bug introduces by previous patch
When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...

Alert commented.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:25:09 +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
276e1c3430 Fix for Bug 5518 - Add to shelf icon doesn't appear in OPAC results page
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:14:22 +13:00
Chris Cormack
1349b46320 Merge remote branch 'kc/new/bug_4908' into kcmaster 2010-12-19 21:11:54 +13:00
c4f8b9d636 Follow-up patch for Bug 4908, show patron's home library in OPAC
Adding home library to list of details when OPACPatronDetails pref
is set to "don't allow"

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:10:51 +13:00
Chris Cormack
826eda9d70 Merge remote branch 'kc/new/enh/bug_5285' into kcmaster 2010-12-19 21:08:41 +13:00
c64e286d3d Follow-up fix for Bug 5285, adding missing CSS
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 21:07:51 +13:00
Chris Cormack
53d4c87c46 Adding another developer to history 2010-12-19 08:22:13 +13:00
Edward Allen
4519186653 bug 5516: Corrected git url in Install Documentation Corrected the git clone url for INSTALL.ubuntu, INSTALL.ubuntu.lucid
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 08:19:21 +13:00
be70444f68 Fix for Bug 5470 - improvements to results display in the staff client
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:44:49 +13:00
080f693c48 Fix for Bug 5513 - staff client display screwy if you don't have all permissions
The cause of this bug was the removal of a closing <!-- /TMPL_IF -->
in a recent commit.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:40:21 +13:00
Chris Cormack
306c1a17af Adding another developer to the history 2010-12-19 07:32:24 +13:00
Robin Sheat
13bc505c5f bug4891 - sort facets in search sidebar (OPAC and staff client)
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:24:16 +13:00
396c2143d9 Fix for Bug 3987 - New Sys Prefs Branch - Alphabetize prefs in sections
Adding jquery tablesorter, sorting on sys pref variable by default

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:20:25 +13:00
Srdjan Jankovic
1c86e93cec Bug 5510: prepend output with system name
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 07:10:06 +13:00
Serhij Dubyk {Сергій Дубик}
bd8f379d70 Deleted old sample budget sql-data for Ukrainian and Russian
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-19 06:52:18 +13:00
402240bbe2 Fix for Bug 4997, More searches menu not on OPAC MARC and ISBD detail pages
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 10:50:07 +13:00
324991fefd Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:

- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out

I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-17 09:45:03 +13:00
Chris Cormack
9c17e9305a Merge remote branch 'kc/new/enh/bug_5283' into kcmaster 2010-12-17 09:43:17 +13:00