Commit graph

11291 commits

Author SHA1 Message Date
Matthias Meusburger
6281ed6b91 MT 1801 : Opac shelves and basket are displayed the same way
This patch also fixes broken location display in both shelves and basket.
2010-01-28 15:11:47 +01:00
Henri-Damien LAURENT
f0aee34d3f followup : auto_truncation 3287252c0
truncated words bore a double * which would create an error

Conflicts solved :
	C4/Search.pm
2010-01-28 15:11:46 +01:00
Henri-Damien LAURENT
f6f80e1b8b Bug Fix : 3689
Disabling Query_AutoTruncate for NoZebra searches

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-01-28 15:11:46 +01:00
Henri-Damien LAURENT
640595651f (bug #3584) detect ccl queries
This patch C4::Search::buildQuery to detect ccl queries, and let zebra to parse them.
And set a default index "kw" if not specified.
This improve the detection of ccl queries, and do not duplicate the "ccl=" value.
Adding = as an index sign
Followup to 3037ff9e81

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-01-28 15:11:46 +01:00
Henri-Damien LAURENT
0fa37b5bb4 Translation scripts : Removing trailing / in scripts 2010-01-28 15:11:46 +01:00
Henri-Damien LAURENT
10c727edf3 Revert "C4/Search.pm followup auto_truncation 3.0.x cherry-pick"
This reverts commit 58406a5e4bb50e18c9620e91b90295d8219842b8.

Conflicts:

	C4/Search.pm
2010-01-28 15:11:46 +01:00
Paul Poulain
7d8b369ba4 Improved guided reports (#3929)
added runtime parameters for guided reports. Online help:

Can I have run-time defined parameters?

Yes, you can: there is a specific syntax that Koha will understand as 'ask for values when running the report'. The syntax is &lt;&lt;Question to ask|authorised_value&gt;&gt;.

The &lt;&lt; and &gt;&gt; are just delimiters. You must put &lt;&lt; at the beginning and &gt;&gt; at the end of your parameter
The Question to ask will be displayed on the left of the string to enter.
The authorised_value can be omitted if not applicable. If it contains an authorised value category, or <strong>branches</strong> or <strong>itemtype</strong> or <strong>categorycode</strong>, a list with the Koha authorised values will be displayed instead of a free field

Note that you can have more than one parameter in a given SQL
Note that entering nothing at run time won't probably work as you expect. It will be considered as "value empty" not as "ignore this parameter". For example entering nothing for : "title=&lt;&lt;Enter title&gt;&gt;" will display results with title='' (no title). If you want to have to have something not mandatory, use "title like &lt;&lt;Enter title&gt;&gt;" and enter a % at run time instead of nothing
Sample :
SELECT surname,firstname FROM borrowers WHERE branchcode=&lt;&lt;Enter patrons library|branches&gt;&gt; AND surname like &lt;&lt;Enter filter for patron surname (% if none)&gt;&gt;
2010-01-28 15:11:46 +01:00
Matthias Meusburger
94cca6a22b MT 2495 : Fix multiple occurences of itemtype in guided reports criteria
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-01-28 15:11:45 +01:00
Henri-Damien LAURENT
db4c107c73 Adding optgroup labels to translations 2010-01-28 15:11:45 +01:00
Henri-Damien LAURENT
697e8e7014 SearchInTable : problem with primary key searches
SearchInTable was filtering primary Key thus returning the whole table when asked a search on a primary key
2010-01-28 15:11:45 +01:00
Matthias Meusburger
20df800fae MT2232 : members/notices.pl and members/messaging.pl are doing the same thing 2010-01-28 15:11:45 +01:00
Jean-André Santoni
0ed6bcdabb [MT1234] Huge rewritte to use the API instead of hardcoded SQL in the script
Also fixes a bug in the template.
2010-01-28 15:11:44 +01:00
Jean-André Santoni
10c9610058 [MT1234] Code cleaning 2010-01-28 15:11:44 +01:00
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