Commit graph

12045 commits

Author SHA1 Message Date
Kyle M Hall
af5ad339f7 Bug 3482 Print Notices via HTML
Modified overdue_notices.pl to support output of html for printing.
The -html option will e-mail notices to those with e-mail, and output
html to print for borrowers without e-mail.

When system preference PrintNoticesMaxLines is set to a positive
integer, it will limit the number of items on the notice to that
number, and append a message to the end telling the borrower to
check his or her account for the full listing of items.  This only
affects print notices, not emailed ones.

Mandatory SQL:

INSERT INTO `systempreferences`
  ( `variable` , `value` , `options` , `explanation` , `type` ) i
  VALUES ( 'PrintNoticesMaxLines', '0', '', i
  'If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.',
  'Integer' );

Conflicts:

	installer/data/mysql/en/mandatory/sysprefs.sql
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	misc/cronjobs/overdue_notices.pl
2010-02-22 10:51:26 -05:00
Garry Collum
a37545eb14 Bug 2655: Fixes availabilty counts if items are on hold shelf. Patch (2/2)
This fixes the opac results - non xsl transformed - and the intranet result lists.

Also fixes opac-detail which was showing all items 'on hold' if there was a bib level request, whether items were on the hold shelf or not.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 20:12:16 -05:00
Garry Collum
9fa69bff82 Bug 2655: Partial fix for Items on hold shelf showing as available.
Fixes the opac results (opac-search.pl), if using xsl to transform data.  I have no way to test UNIMARC results, if someone could test it for me.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 20:12:12 -05:00
5c6632a893 Fixing history.txt was biblibre not bywater
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 20:09:39 -05:00
8140c45aa5 Updated history
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 20:09:36 -05:00
dd187e0943 Merge branch 'translation' of git://git.workbuffer.org/git/koha into master
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 20:07:40 -05:00
807c1a51dc Last 2 pref files 2010-02-22 12:20:41 +13:00
c061b15646 Russian prefs 2010-02-22 12:17:23 +13:00
cbfc3e8f43 Last of the syspref fixes 2010-02-22 12:14:19 +13:00
4bade723ef Revert "(bug #3778) GetBranchesLoop and searchMyLibraryFirst"
Reverting this commit to resolve bug 4016.  This revert has the
same effect as a patch submitted by Garry Collum on 20 February 2010.

This reverts commit 2345dc7c27.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 18:04:15 -05:00
c13ead066d More pref fixing, somehow the french got used rather than the english 2010-02-22 11:39:42 +13:00
487f536177 Fixing arabic and maori prefs 2010-02-22 11:34:32 +13:00
d73936ce7d Fixing Malaysian preferences 2010-02-22 11:30:35 +13:00
7540389f09 Removing doubled up file 2010-02-22 11:27:58 +13:00
d3e36ed533 Systempref files 2010-02-22 11:27:58 +13:00
17f3a2ab68 Last of the template updates 2010-02-22 11:27:56 +13:00
a21d476d30 Adding a few new languages and more updates 2010-02-22 11:27:54 +13:00
2f5c85aefd Continuing updates 2010-02-22 11:27:52 +13:00
8a46c87eb3 Continuing po updates 2010-02-22 11:27:48 +13:00
b9325ff260 Continuing language updates 2010-02-22 11:27:38 +13:00
0327a0fcdc More language updates 2010-02-22 11:27:36 +13:00
6349385d82 Language updates 2010-02-22 11:27:26 +13:00
8ae65c0aaa More updated po files 2010-02-22 11:27:23 +13:00
c64a7f812a Adding preference po files 2010-02-22 11:27:16 +13:00
25cf7fbc22 Updating templates 2010-02-22 11:27:16 +13:00
f71b8e6202 French updates 2010-02-22 11:27:08 +13:00
38dd795cd9 Intranet po files before updating 2010-02-22 11:27:05 +13:00
095895f4c1 Opac files before updates 2010-02-22 11:27:05 +13:00
a2b11f5f9d German updates 2010-02-22 11:27:04 +13:00
eae2174493 German Updates 2010-02-22 11:27:02 +13:00
2267253afa Dutch (Nederlands) updates 2010-02-22 11:27:02 +13:00
0c30ac49e5 Dutch (nederlands) and German updates 2010-02-22 11:27:02 +13:00
ecc2d13efb Nepalese and Dutch (Nederlands) 2010-02-22 11:27:01 +13:00
fd6d7a3063 Dutch flemish opac update 2010-02-22 11:27:01 +13:00
f9678594b5 Language updates 2010-02-22 11:27:00 +13:00
af8f7fc3b1 Shifting dutch to dutch, flemish 2010-02-22 11:26:53 +13:00
Michael Hafen
43c0277ac5 Bugfix Makefile.PL check for dollar signs
Missed the lines where dollar signs are quoted for DB_PASS and ZEBRA_PASS.
Don't need to quote (double-quote) those two lines now.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:56:02 -05:00
Michael Hafen
62f43c04e9 Add instructions to INSTALL and README.robots about robots.txt
Instructions are given in INSTALL and README.robots about adding a robots.txt
file to the opac to prevent search engines from indexing Koha.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:55:59 -05:00
e4210cdbc7 Bug 3609 Fix fr-FR user permissions
- Translation
- Add missing permissions: execute_reports, create_reports
- Rename properly: batchmod and batchdel

This has to be done for other languages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:15 -05:00
46b4f60255 Add pl-PL to syspref test
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:11 -05:00
597bb1bb65 Bug 3609 Test for user permissions translated values
This new test identifies incoherences between 'en' user permissions and
translated versions.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:06 -05:00
d38a716fc1 Removing bogus style declaration
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:01 -05:00
Nicole Engard
b86c58d5c6 move ReservesMaxPickUpDelay to Holds Policy on Circ Prefs
This preference didn't make sense in Interface - it's a holds
policy related preference and so I've moved it to that area.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 09:59:07 -05:00
c12ff97647 bug 3242 follow-up: fix crash when emailLibrarianWhenHoldIsPlaced is ON
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:56:44 -05:00
752d1c712f bug 4182: add emailLibrarianWhenHoldIsPlaced to preferences editor
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:51:47 -05:00
d82bc5f0ce bug 3242: insert new HOLDPLACED letter template (DBrev 124)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:47:50 -05:00
Nahuel ANGELINETTI
8168ccb4c7 (bug #3242) send email when hold is placed
[cherry-picked from 3.0.x]

This add a new letter in database, and each time a new hold is placed, a new mail is enqueued.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-02-19 05:41:08 -05:00
ab54b07ad6 bug 2970: extend new hold priority change permission
Now covers the new hold request priority buttons.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:23:42 -05:00
c411928b12 bump to DBrev 123
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:13:45 -05:00
e31b7bd9a5 Fix for Bug 2970, Create a permission for modifying holds priority
Adding two new granular permissions under 'reserveforothers,' place_holds
and modify_holds_priority. If a user does not have modify_holds_priority
permission, the option to change the priority of a hold is hidden.
Revised patch includes changes to mandatory data files including
properly translated fr-FR version.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:12:58 -05:00