Commit graph

11278 commits

Author SHA1 Message Date
Jean-André Santoni
2a84ad3223 [MT1234] Fixed aqcontract breadcrumb 2010-01-28 15:11:44 +01:00
Jean-André Santoni
922ae0b782 [MT1234] Replaced useless selectbox in the title of contact form 2010-01-28 15:11:44 +01:00
Jean-André Santoni
50679ac182 [MT2345] New contract button 2010-01-28 15:11:44 +01:00
Jean-André Santoni
22f7fc269b [MT2343] Removed HTML heresy from aqplan template 2010-01-28 15:11:44 +01:00
Jean-André Santoni
612d5c0108 [MT2343] Moved currency up the table 2010-01-28 15:11:43 +01:00
Jean-André Santoni
4ba64ad0e1 [MT2343] Changed the red X for a green V in the root budget table 2010-01-28 15:11:43 +01:00
Jean-André Santoni
39904f9415 [MT2343] Changed the name of the Filter button, and lowered it 2010-01-28 15:11:43 +01:00
Jean-André Santoni
e7753ce465 [2343] Fix currency not showing in aqbudgets 2010-01-28 15:11:43 +01:00
Henri-Damien LAURENT
c8ff9618cd followup : auto_truncation 3287252c0
truncated words bore a double * which would create an error
2010-01-28 15:11:43 +01:00
Henri-Damien LAURENT
e5c8244009 C4/Search.pm followup auto_truncation 3.0.x cherry-pick
Auto_truncation is used even though exact search selected.
This patch removes this side effect

Conflicts solved:
	C4/Search.pm
Cherry-picked from 3.0.x :
	3287252c0
2010-01-28 15:11:42 +01:00
b6c043147f final fix for sysprefs merge, hopefully
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:33:14 -05:00
0c3fde5cd3 handle error if no active currency is defined
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:30:22 -05:00
2c9e28e63e fix silly typo
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 09:19:13 -05:00
880a2088ad bugfix - fix compilation error
Reflect change of GetLocalCurrency to GetCurrency
in new_acq

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-27 08:58:26 -05:00
8ad2c7d7ac Merge commit 'pianohacker-koha/prefs-submit' into master
Merge in Jesse Weaver's system preference editor changes.

Conflicts:
	C4/Bookfund.pm
	koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
	koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 20:26:17 -05:00
a25eb07178 Merge commit 'colin_campbell/dbupgrade3.2' into master
Fix various issues with database updating.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 20:16:23 -05:00
d6a36c5151 Fix for Bug 4065, patron extended attributes error
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 16:56:59 -05:00
3440912df9 Fixes for Bug 3943, Show add to cart link when lists off in the OPAC
- Also adds some missing conditionals for including javascript
- Also Removes an instance of TMPL_IF EXPR

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 15:36:51 -05:00
da60758b7d Fix for Bug 4061, Improve OPAC maintenance screen
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 15:36:34 -05:00
80e8602ba1 Extend Koha OAI Server to support other metadata formats
Currently Koha OAI server returns records in two formats: marcxml and
oai_dc (Dublin Core). This patch adds a new mode of operation where as
many as necessary metadata formats can be added via XSLT.

Documentation: See the end of oai.pl file to have an explanation of
how it works.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 15:12:40 -05:00
bbd28e096f Bug 3921 - Add Intranet MARC21 XSL file based on OPAC one
Tweak also intranet CSS file in order to have the same layout than on
OPAC.

For the futur: it would be required to group all XSL in one location.
For now if someone improve OPAC XSL, he/she will have not to forget to
take its modifications back to the intranet XSL.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 14:50:39 -05:00
8e0b1fe58f Merge commit 'biblibre/3.2_community' into to-push
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-01-26 14:46:10 -05:00
f049216f54 Fix for Bug 4058, opac-auth.tmpl body id causes layout problems 2010-01-25 18:37:12 +01:00
439c300f08 Removing obsolete help files (Bug 4059) 2010-01-25 18:37:12 +01:00
4b60c8a9aa Fixes for Bug 3958, Standardize vendor/supplier/bookseller terminology
Changing instances of "supplier" or "bookseller" to "vendor."
2010-01-25 18:37:12 +01:00
f8c1ee66a3 Fix for Bug 3984, Confusing note on transfers to receive
- Changing 'check this transfer' message to more informative
   'Transfer is XX days late'
 - Adding note in the case of late transfers: 'Transfers are
   considered late after XX [TransfersMaxDaysWarning] days.'
2010-01-25 18:37:11 +01:00
Colin Campbell
7f68a2440f delay dropping of aqbookfund
aqbookfund cannot be dropped before aqorderbreakdown
due to fk cobstraints
remove drop of column bookfundid from aqbudget
column no longer exists at this point
2010-01-25 14:24:03 +00:00
Colin Campbell
411aae1a87 Can only add column reservesallowed to issuingrules once 2010-01-25 09:30:15 +00:00
Colin Campbell
12c5508d99 Remove an invalid db update
Update tries to drop two fk constraints which
don't appear to exist
2010-01-25 09:30:15 +00:00
Colin Campbell
87a3a627f1 column was added in two separate updates
3.01.00.068 duplicates the operations of 3.01.00.065
Because one column has already been created, populated and dropped
the rest of the update fails
2010-01-25 09:30:15 +00:00
Colin Campbell
9e42d04cb7 remove duplicate column add
Change 3.01.00.089 duplicated 3.01.00.070
2010-01-25 09:30:14 +00:00
Colin Campbell
7e07fa5d12 102 needs to be an update not an insert 2010-01-25 09:30:14 +00:00
Colin Campbell
5cc7c1db9a remove duplicate addition of casAutherntication preference 2010-01-25 09:30:14 +00:00
Jane Wagner
4afcc03655 Bug 4057 Fix spacing in XSLT OPAC display for 245 subfield f
If a 245 has a subfield f (or any of the displayed fgknps subfields after a, b,
or h) there is no spacing and the display runs together.  This happens in both
the XSLT results list and the XSLT individual title display.  I've added a
space between the a, b, h displays and the beginning of the fgknps set.
2010-01-23 15:33:23 +01:00
Garry Collum
b5533726ec Bug 4056: Fixes invalid xhtml in opac-messaging.tmpl if SMS is disabled.
There is a </td> tag which is outside of the block of code which defines checks to see if SMS is enabled.  If SMS is disabled it causes several extra </td> tags.
2010-01-23 15:33:23 +01:00
Jane Wagner
885c68e269 Bug 3294 Use cn_sort field to sort inventory list output
The inventory tool was using itemcallnumber, title to sort; modified
Items.pm to use cn_sort, itemcallnumber, title so that call numbers
sorted on the padded sort field instead.
2010-01-23 15:33:23 +01:00
95e05c0499 Improve behavior of manual history checkbox behavior. 2010-01-21 20:51:29 +01:00
ec5764afd3 Fix for Bug 3908, Edit subscription page shows manual history block by default
Changing template check for "history" var to check for "manualhistory."
2010-01-21 20:49:31 +01:00
c46466ad15 Revised for biblibre/3.2_community: Fix for Bug 3939, Issuing rules clone button looks like a submit
This patch incorporates a drop-down for choosing the "clone to" library
directly from issuing-rules.pl. This eliminates the extra step of choosing
the library after submitting the "clone" action and clarifies the purpose
of the two different controls.
2010-01-21 20:49:30 +01:00
Henri-Damien LAURENT
d339abf0bf Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community
Conflicts solved:
	Makefile.PL
	installer/data/mysql/en/mandatory/sysprefs.sql
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2010-01-20 23:16:34 +01:00
b97d970791 Revised for biblibre/3.2_community: Fix for Bug 3780, various OPAC pages have no unique <body> id 2010-01-20 22:39:37 +01:00
Kyle M Hall
2d1d4cd6e7 OpacAddMastheadLibraryPulldown
In the current OPAC, there is no easy way to search a particular library.
By default, a user searches all libraries, or with SearcMyLibraryFirst turn on,
the user's home library. In dev_week, a library pulldown menu existed in the search masthead.

This commit adds the option to bring that pulldown menu back
by turning on the system preference OpacAddMastheadLibraryPulldown
2010-01-20 22:38:23 +01:00
b7b6bf3bb5 Rotating Collection > DB upgrade to 102 2010-01-20 22:36:40 +01:00
f650aad34b Rotating Collections
This feature is designed to manage collections of items that move
from library to library periodically. Koha can already track who *has*
and item, and who *owns* and item, but not who *should have* an item.
That is the issue this feature addresses.

It allows a persion to create a collection, and add any number of items
to that collection. The collection can then be transferred from library
to library. If an item shows up at a library that does not currently
'hold' that collection, Koha will ask you to transfer it to the library
that does currently 'hold it. In that way, one can even transfer
collections where some of the items are currently checked out. As soon
as they make it back to a library, they will get transferred to the
current library holding that collection.

The feature consists of 4 main pages.
'Home' Page: The landing page, lists collections and provides access to
the rest of the tools.
  Access is via the Tools page.
Edit Collections: Add/Delete new rotating collections
Add/Remove Items: Add/Remove items from a given collection
Transfer Collection: Set the current 'holder' of a given collection.

Librarian access is controlled by 'CAN_user_tools_rotating_collections'
2010-01-20 22:35:15 +01:00
d45ee12e5c Revised for biblibre/3.2_community: Reformat of suggestions management interface (Bug 3844)
Changes and fixes include:

- Moving filters forms into left-hand sidebar
- Making filter forms collapsed by default (click to show)
- Converting "check all" to text link to match similar controls on other pages
- Correcting case of tab labels
- Fixing display of custom reason field
- Converting radio buttons to drop-down for more compact display
- Table-sorter column exclusions
- Markup corrections
2010-01-20 22:32:11 +01:00
0db8f233df Revised for biblibre/3.2_community: Putting CSV export sections into tabs 2010-01-20 22:31:59 +01:00
a078297d1f Fix for Bugs 3998, 3968. Includes other markup corrections and reformats
Bug 3998: Confusing warning on budget add page
Bug 3968: Empty Blue Box Pop Up

- Removed warning, made budget amount a required field.
- Added conditional logic to prevent display of tooltip when there is no content
- Moved filter form into sidebar
- Changed Budgets.pm to pass an ID to a form field
- Improvements to breadcrumbs and title tags
- Restructured budgets admin toolbar to match existing toolbar patterns:
  "new," "edit," etc.
2010-01-20 22:31:58 +01:00
3dc501a0b3 Markup tweaks to better style the patron search filter 2010-01-20 22:31:58 +01:00
Henri-Damien LAURENT
f3868bf6fe Adding Extended Attributes management to Auth_with_LDAP 2010-01-20 22:29:10 +01:00
Chris Nighswonger
ff13d25bb3 Bugfix: Various Label Creator bugs
This fixes:

* A bug which caused the label template editor to throw
an error when saving when no previous profile was applied.

* A typo which caused a 'fetch without execute' error in Labels.pm

It also comments out several useless warns
2010-01-19 22:27:09 -05:00