Commit graph

1483 commits

Author SHA1 Message Date
fc61bd3018 Bug 10120: Adding a syspref to control if overdue charges are updated on return
On by default.

To Test

1/ Create an overdue item, that should get fines
2/ Return the item
3/ Check the borrowers record to see if the fine has been added/updated

Apply patch
1/ Make sure preference is set to do
Repeat steps 1-3 above

2/ Switch the preference to don't
Repeat stes 1-2
3/ Check the fine hasn't been added/updated

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass, works as described.
I would categorize this a bug fix for libraries that don't want
the new changed  behaviour that was introduced by recalculating
fines on return.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-24 08:47:12 -07:00
Galen Charlton
27a1017e44 bug 10052: DBrev 3.13.00.005
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-23 09:04:44 -07:00
81937d1d79 Bug 10052: Db revision for intranetstylesheet
Report 10052 makes the intranetstylesheet prefs behave like the opac ones.
This patch contains an optional db revision: If the pref intranetstylesheet is
not blank, and does not start with http, https or /, then prefix it with a
slash to make it an absolute path.

Test plan:
Before applying this patch:
1) Put intranet-tmpl/prog/en/css/staff-global.css into intranetstylesheet.
This works in the current staff client, but will be interpreted as relative as
soon as both patches for this report have been applied.
Apply the patch. And run: /cgi-bin/koha/installer/install.pl?step=3&op=updatestructure
Check the webinstaller warning and the pref value. There should be a slash
in front now. The css should still work.

Continue after applying this patch with:
2) Clear the intranetstylesheet pref. Run updatestructure again. No message: OK
3) Put /intranet-tmpl/prog/en/css/staff-global.css in intranetstylesheet.
Run updatestructure again. No message: OK
4) Prefix intranetstylesheet with http://[your-server-here]. Test again.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-23 08:55:05 -07:00
Galen Charlton
3a29a06955 bug 9722: DBrev 3.13.00.004 to add OpacShowHoldNotes syspref
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-23 08:29:24 -07:00
847cc15650 Bug 9722: Allow users to add notes when placing a hold in opac (dbrev)
Database revision for report 9722, adding new pref OpacShowHoldNotes.
This development is part of a larger one (see umbrella report 9721).

Test plan:
Run [your server]/cgi-bin/koha/installer/install.pl?step=3&op=updatestructure
Optionally, run a new install to test sysprefs.sql.
Or:
Edit sysprefs.sql, leave at least the last few lines including the new one.
And run from command line:  mysql -p [yourdatabase] < [your-clone]/installer/data/mysql/sysprefs.sql

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-05-23 08:12:53 -07:00
Galen Charlton
ec3c8e95e0 prefer CheckVersion in updatedatabase.pl
Fixes an inconsistency with a couple recent
DBrev patches.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-22 11:57:33 -07:00
Galen Charlton
c62c36508d bug 7718: DBRev 3.13.00.003
- remove serial.itemnumber column

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-22 08:51:33 -07:00
67fb83d525 Bug 7718 - Remove itemnumber column from serials table
Remove the column 'itemnumber' from the table 'serial'. This is
a 1 to many relationship, and this reference does not make sense.
The 'serialitems' table handles the relationship between the 'items'
table and the 'serial' table.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Verify serial.itemnumber has been removed from the database

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Column removed. No errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-22 08:44:31 -07:00
Galen Charlton
33b6ed32b4 Bug 10080: DBRev 3.13.00.002
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-22 08:14:23 -07:00
b00ec06968 Bug 10080 - Change system pref IndependantBranches to IndependentBranches
Test Plan:
1) Enable IndependantBranches
2) Apply this patch
3) Run updatedatabase.pl
4) Verify that the system preference still functions correctly

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-22 07:58:23 -07:00
Galen Charlton
c199cc6ef9 bug 8215: DBRev 3.13.00.001 for course reserves
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-21 15:54:25 -07:00
be869ab279 Bug 8215 - Course Reserves
Adds a course reserves system for academic libraries.

The course reserves system allows libraries to create courses
and put items on reserves for those courses.

Each item with at least one reserve can have some of its attributes
modified while it is on reserve for at least one active course.
These attributes include item type, collection code, shelving location,
and holding library. If there are no active courses with this item
on reserve, it's attributes will revert to the original attributes
it had before going on reserve.

Test Plan:
  1) Create new authorised value categories DEPARTMENT and TERM
  2) Create a new course, add instructors to that course.
  3) Reserve items for that course, verify item attributes have changed.
  4) Disable course, verify item attributes have reverted.
  5) Enable course again, verify item attributes again.
  6) Delete course, verify item attributes again.
  7) Create two new courses, add the same item(s) to both courses.
  8) Disable one course, verify item attributes have not reverted.
  9) Disable both courses, verify item attributes have reverted.
 10) Enable one course, verify item attributes are again set to the
     new values.
 11) Edit reserve item attributes, verify.
 12) Disable all courses, edit reserve item attributes, verify
     the item itself still has its original attributes, verify
     the reserve item attributes have been updated.
 13) Verify the ability to remove instructors from a course.
 14) Verify new permissions, top level coursereserves, with
     subpermissions add_reserves and delete_reserves.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

http://bugs.koha-community.org/show_bug.cgi?id=8125
2013-05-21 15:50:55 -07:00
Galen Charlton
d51d6c5feb DBrev 3.13.00.000 -- onwards to Koha Pi!
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-05-20 10:18:03 -07:00
Jared Camins-Esakov
d28d1ef0fa Increment version for 3.12.0 release
(cherry picked from commit 85a1b8a50b)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-19 17:57:28 -04:00
Magnus Enger
e7571a1a1c Bug 10134 - set XSLT usage ON as default, for new Koha installs
Currently, new installs are created with XSLT display set to "off",
but XSLT seems to be the preferred way to display records, so
having the default be "on" instead seems to make sense. This patch
will of course only affect new installs.

To test:
- Apply the patch
- Run through the webinstaller on an empty database
- Log in to the staff client and search for "xslt" in system
  preferences
- Verify that XSLTDetailsDisplay, XSLTResultsDisplay,
  OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay are all set to
  "default"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Passes test plan correctly.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes syspref.sql for new installations to use XSLT views
by default. No changes to existing installations, no
string changes.
Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-12 10:05:18 -04:00
Jared Camins-Esakov
5a9a82dcc3 Bug 9681: Increment version number
Database update for bug 9681 has been given version 3.11.00.301
2013-05-08 10:03:26 -04:00
Paul Poulain
68ff49bb7d Bug 9681: Add some indexes in database
Some table columns should have an index to speed SQL queries :
- statistics table has only one index (used to make heavy queries for reports)
- itemtype should have an index in items and biblioitems (this is used in circulation to check the number of existing issues of a specific item type)
- issue.branchcode and issue.issuingbranch

Test plan :
- Create a new database using kohastructure.pl
=> check there is no SQL error and that new indexes are present (mysql> show create table)
Apply update database on a master version
=> check there is no SQL error and that new indexes are present (mysql> show create table)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Indexes created as described. No errors.
Fixing small merge conflict.
Test presence of new indexes on all affected tables.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-08 10:03:23 -04:00
Julian Maurice
30d067400e Bug 10185: Add missing columns in update 3.09.00.025
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL only changes fixing an important database update.

IMPORTANT: Patches must be backported to all versions containing
the database update 3.09.00.025.

I used the test plan provided by Julian with some additions:
1/ Do a fresh 3.8 install
2/ Do some reserves
3/ Check your old_reserves table is empty
4/ Update your sources to 3.10
5/ Run updatedatabase.pl
6/ Your reserves table is now empty!

I made sure I had item level and title level holds, also
suspended holds.

I repeated the test with entries in my old_reserves table
(cancelled and filled holds) to make sure this is also still
working correctly.

Before the patch we lost all suspended holds and when the
old_reserves table was empty also all holds in general.
After the patch the reserve_id is added but the other data
in both tables is not altered.

NOTE: Adding the reserve_id first to old_reserves and then
to reserves we are missing one id in between.
old_reserves: 1,2,3
reserves: 5,6
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-08 10:00:10 -04:00
Julian Maurice
37c52367b0 Bug 10185: Fix update 3.09.00.025
It can remove all reserves from reserves table when there is no entries
in old_reserves.
This is due to @ai which is set to NULL in
  SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )
and reserve_id > NULL returns no results in
  INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > @ai

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan and comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-08 10:00:10 -04:00
Jared Camins-Esakov
fa69f553ee Increment version for 3.12.0-beta3 release
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 23:07:40 -04:00
Magnus Enger
361e5f83e2 Bug 7055 - NORMARC: Fix 008 position 15-17 and 35-37
This patch does several things:
- Set the default for 008/15-17 to "no " (yes, there is space at the end)
- Link from 008/15-17 in the value builder to NORMARC country codes
- Set the default for 008/35-37 to "nor" (by setting the
  DefaultLanguageField008 syspref)
- Link from 008/35-37 in the value builder to NORMARC language codes
- Fix a missing <tr> around field 35-37

To reproduce:
- Run through the Web-installer in Norwegian and choose NORMARC as
  the MARC flavour
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
  130415t        xxu||||| |||| 00| 0 eng d
                 ^^^                 ^^^
- Reload the page and open the value builder for 008. Problems:
  - The text for 15-17 links to MARC21 country codes
  - The default for 15-17 is xxu
  - The text for 35-37 links to MARC21 language codes
  - The default for 35-37 is eng
  - If you choose e.g. "Monografier" in the top dropdown then click
    on "OK" the window does not close

To test:
- Apply the patch and run through the Web-installer again, selecting
  Norwegian and NORMARC
- Go to Home > Cataloging > Add MARC record and add a new record
- Click in the field for 008. The default should look like:
  130415t        no ||||| |||| 00| 0 nor d
                 ^^^                 ^^^
- Reload the page and open the value builder for 008.
- Check that...
  - The default for 15-17 is "no " (with a space at the end)
  - The link goes to NORMARC country codes
  - The default for 35-37 is "nor"
  - The link goes to NORMARC language codes
- Select something from the top dropdown and click "OK". Check that the
  window closes and that the values that are entered into the 008 field
  matches what you chose in the popup window.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Trusing Magnus is right, so testing for any regressions mainly, all good

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Only changes NORMARC specific plugin and system preferences
files. Changes all seem logical to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:45:21 -04:00
Jared Camins-Esakov
e1ecd7aa3f Bug 2046: Increment version number
Database update for bug 2046 has been given version 3.11.00.203
2013-04-27 08:11:39 -04:00
Kristina D.C. Hoeppner
7a5dc6eef5 Bug 2046 - Suggestions: Title Field too small
Increase both on staff and OPAC interface
from 80 to 255 characters to be saved in
the database. Shown will be 80 characters.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Clean patch, workes as described.

To test:
- Apply patch and run database update
- Check that the column in the database is now varchar(255)
- Enter a new suggestion in the OPAC
- Edit this suggestion in staff
- Confirm form has the new max value set
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 08:11:36 -04:00
Mirko Tietgen
faa93aff62 Bug 10103 UniqueItemFields is missing from sysprefs.sql
Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql.
Also fixes an unrelated  missing semicolon in sysprefs.sql

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:17:05 -04:00
Mathieu Saby
5959154bc1 Bug 9831: Correct and add authorised values un French UNIMARC installer
2d version, Correcting a typo

In French UNIMARC mandatory installer, some authorised values for languages, countries and unimarc function codes are wrong.
A lot of unimarc function codes and language codes are missing.
Reference for country codes is ISO 3166-1 standard
Reference for language codes is ISO 632-2 standard
Reference for Unimarc function codes are Unimarc Manual (french version online in BNF website and ABES website)

This patch correct wrong values and add new ones.
For the moment I keep some wrong codes, because they may be used by some librairies :
- language codes deu, lan, mla, sam
- function codes 571, 573, 574, 575

To test :
1) take a fresh new koha
2) apply patch
3) install Koha, choosing French UNIMARC settings
4) look if values are OK in authorised values and if you can use them in cataloguing module

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL change only, French installer installs authorised values
without problems.

Note: There is a problem loading sample labels unrelated to this
patch:

sample_labels.sql
ERROR 1146 (42S02) at line 3: Table 'koha.labels_templates' doesn't exist
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 22:13:25 -04:00
Katrin Fischer
d8d4d9973f Bug 10050: Update German web installer files for 3.12 - Language settings
Activate German and English for OPAC and intranet by default.

To test:
- Run the German web installer
- Check that when logging into Koha the German interface is shown
  and you can switch between English and German using the links
  at the bottom of the page
- Check language relevant settings in the system preferences
  are correctly set

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:22:12 -04:00
Katrin Fischer
60db9a9e24 Bug 10050: Update German web installer files for 3.12 - Optional
This patch updates the German web installer files from the
optional directory.

This includes:
- Adding the bridge/reference.gif to the REF itemtype
- Updating currency rates and setting EUR to active
- Adding branchcode MPL to the sample holidays
- Updating a few strings on the patroncard samples
- Fixing typos and rephrasing

To test:
- Run the web installer with German installed
- Verify all optional SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:22:12 -04:00
Katrin Fischer
40cd834c74 Bug 10050: Update German web installer files for 3.12 - Mandatory
This patch updates the German web installer files from the
mandatory directory.

This includes:
- CalendarFirstDayOfWeek defaults to Monday
- gist rates default to 0.07|0.19|0.00
- RoutlingListNote default text translation
- uniqueitemfields default set to barcode stocknumber
- Translation of new user flags and permissions
- Corrections to existing translations and typo corrections

To test:
- Run the web installer with German installed
- Verify all mandatory SQL files are installed correctly

Note: The German po files in master are buggy, please
use files from translate.koha-community.org for testing.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-25 21:22:12 -04:00
Jared Camins-Esakov
8101d83af6 Merge branch 'bug_7368' into 3.14-master 2013-04-18 09:48:06 -04:00
c134a3c5c3 Bug 7368: Typo in kohastructure.sql documentation line
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-18 09:47:58 -04:00
Magnus Enger
58f42441bc Bug 9414 - Fix sample letters for German and Norwegian
Some letters were missing or not translated in the German and
Norwegian data for the webinstaller. This patch adds them.

German
- RENEWAL (present, but not translated)
- OPAC_REG_VERIFY (missing)

Norwegian
- RENEWAL (present, but not translated)
- ISSUESLIP (missing)
- ISSUEQSLIP (missing)
- RESERVESLIP (missing)
- TRANSFERSLIP (missing)
- OPAC_REG_VERIFY (missing)

To test:
- Install Norwegian and German* translations
- Run through the web installer in German, making sure that
  the sample letters are selected
- Check that there are no errors in the web installer
- Check <intranet>/cgi-bin/koha/tools/letter.pl - that the
  letters look OK, and are translated
- Repeat the process for Norwegian

* = I had some problems with installing the German
translations that are in master, but now I can't reproduce
it. If you run into a problem where only some of the
subdirectories of koha-tmpl/intranet-tmpl/prog/de-DE/modules/
are cerated, try downloading and installing the 3.10 .po
files from Pootle.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-15 08:52:35 -04:00
Jared Camins-Esakov
d890977603 Bug 9381: Increment version number
Database update for bug 9381 has been given version 3.11.00.202
2013-04-07 13:48:46 -04:00
Bernardo Gonzalez Kriegel
e2651e15d5 Followup 2 - Bug 9381 - Add Catalan language
Sorry, this followup fulfills K. Fischer request to
base de-DE file in english one.

The differences are small corrections and added languages.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Rebased to master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:48:44 -04:00
Bernardo Gonzalez Kriegel
ce1ca0a1dc Followup Bug 9381 - Add Catalan language
This followup adds Catalan language into languages
other than english.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Rebased to master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:48:44 -04:00
Bernardo Gonzalez Kriegel
ae4881a5b6 Bug 9381: Add Catalan language
Simply add catalan language.

No translation yet, so can't be really tested.
But it will come soon.

Until then, to test:
1) cp misc/translator/po/es-ES* to ca-ES*
2) do perl translate install ca-ES,
3) apply the patch
4) run updatedatabase.pl
5) enable language and display on system preferences.
6) check labels

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Rebased to current master

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 13:48:44 -04:00
Jared Camins-Esakov
44a9916303 Bug 9498: Increment version number
Database update for bug 9498 has been given version 3.11.00.201
2013-03-30 22:52:50 -04:00
65283eb2bd Bug 9498 QA Followup for updatedatabase
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Small followup to update servers. No errors
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 22:52:27 -04:00
Magnus Enger
459c809243 Bug 9498 - Update encoding for Norwegian sample Z39.50 servers
This patch
- Updates the sample servers installed by the web installer
- Does a database upgrade that changes the encoding for the servers
  in question

To test:
- Do a Norwegian installation and make sure to choose the optional
  sample Z39.50 targets
- Check that encodings for the Norwegian targets (BIBSYS, SAMBOK,
  NORBOK and DEICHMAN) are all set to ISO_6937 (which is the wrong
  encoding)
- Apply this patch and make sure updatadatabase.pl is run
- Check that the encoding for the four targets mentioned above are
  now ISO_8859-1
- Do one search against each target and check that there are no
  "strange" chars in the result list. Searching each of the targets
  for "hessen" should give results that include "norwegian vowels"
- Log on to the MySQL of the test installation and empty the table
  of Z39.50 targets:
  mysql> delete from z3950servers;
- Load this file into MySQL from the command line:
  installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql
  and check that it loads without errors and that the four
  Norwegian targets are still set to have encoding = ISO_8859-1

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No errors.
No koha-qa errors

Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 22:52:27 -04:00
Magnus Enger
2ebf0fd631 Bug 9837 - Fix Norwegian authorized values for the web installer
This patch fixes the file of authorized values that is used when
the web installer is run in Norwegian:

Not translated: BOR_NOTES
Missing: REPORT_GROUP

To test:
- Install the Norwegian translation
- Run through the web installer in Norwegian
- Make sure the auth_val.sql file is included
- Check that there are no errors in the web installer
- Check that the BOR_NOTES and REPORT_GROUPS values are present
  in Home > Administration > Authorized values

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

I can't test the validity of the translation, but it doesn't break
anything :)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL and NORMARC only, works alright.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 22:49:48 -04:00
Bernardo Gonzalez Kriegel
ed52069332 Bug 9610 - Spanish translation of MARC21 default bibliographic framework
This (large) patch adds spanish translation to default
MARC21 bibliographic frameworks.

Based on final EN default framework of Bug 5858,
strings from http://www.bne.es/es/Micrositios/Guias/Marc21/index.html

Automated substitution of strings, to change as
little as possible the original file and ensure
that no entry is removed.

Only to new installs.

To test
1) Delete default framework.
2) Load installer/data/mysql/es-ES/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
   into database. Must load without errors.
3) Edit a record y choose default framework, legends must be in spanish
   (save for obsoleted fields, left untranslated on pourpose)

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL changes only.
Dropped my database and ran the Spanish web installer with
all sample files. No errors and frameworks in Koha look fine.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 08:46:14 -04:00
Liz Rea
79e8b928ab Bug 9745 - don't nuke translated strings in permissions on DB upgrade
To test:

(this is best done by someone who has a database with translated
strings for user permissions - I'm looking towards Katrin. :))

Get a 3.6-3.8 era database loaded as test data - also please use
a low value test database.

Translate or change the strings in the database for the user
permissions that follow in mysql client (for those who didn't
install with a different language that has translated files
at install time) -

update userflags set flagdesc="Translated text 1" where flag
IN('catalogue','editauthorities','reports','management','serials',
'updatecharges','circulate','parameters','borrowers','tools',
'staffaccess','edit_patrons');
(you will notice that this changes all of the permission labels
in the interface to "translated text 1" for the affected
permission flags. This is why I don't want you to use a high
value test database.)

Update that to master + this patch - your "translations"
should be intact.

Blow that database away, and make a brand new one 3.6-3.8 era
with the english database definitions. Run the update again with
this patch, the strings should be updated correctly.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
There was a typo in the patch, the first database update had to be
changed from this: $dbh->do{(q{ to this: $dbh->do(q{

* Test 1:
- git checkout v3.06.05
- Run through the web installer in Norwegian, installing all
  Norwegian sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- Almost all of the permissions are still in Norwegian. The ones
  that are in English are not touched by the database update for
  3.11.00.016, so they must have been introduced by other updates.

* Test 2:
- git checkout v3.06.05
- Run through the web installer in English, installing all English
  sample data
- git checkout <master + patch for bug 9745>
- Run web installer/upgrade
- All permissions have been updated as expected, except "Perform
  batch modification of patrons" which is not in the 'userflags'
  table, but in the 'permissions' table. I have amended the patch
  to account for this.

Two fixes to the original patch, please give a shout if this
makes a second signoff necessary!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I tested this on an English and a German sample base updating
from 3.06.07 successfully.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected incorrect field names in the last query (it's
permissions.description not permissions.flagdesc).
2013-03-30 08:24:59 -04:00
Peter Crellan Kelly
07228e5080 Bug 9919: Correct syntax error caused by missing comma.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple fix for a bad problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-25 08:43:26 -04:00
Jared Camins-Esakov
3293434c23 Bump version for Koha 3.12.00-beta1 release 2013-03-23 09:54:28 -04:00
Jared Camins-Esakov
8b1e66cd44 Correct 3.11 updates to use CheckVersion rather than TransformToNum 2013-03-23 09:52:58 -04:00
Jared Camins-Esakov
b9db6ae0f7 Revert "Merge branch 'bug_7688' into 3.12-master"
This reverts commit 60508cb03d, reversing
changes made to 8579d07f14.

The patches for bug 7688 caused a failure in t/db_dependent/Serials.t:
not ok 8 - test getting history from sub-scription

Conflicts:

	installer/data/mysql/kohastructure.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2013-03-23 00:36:37 -04:00
Jared Camins-Esakov
44d285b1c5 Bug 5343: Increment version number
Database update for bug 5343 has been given version 3.11.00.116
2013-03-22 23:56:51 -04:00
Jonathan Druart
ed63c13957 Bug 5343: Link serial and acqui modules
DB changements:
- Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid.
- Removes 2 unused fields: aqorders.serialid and aqorders.subscription.

Main test plan:
1) Create a subscription
2) Create a bookseller and a basket
3) Add a new order 'from a subscription'
4) Search your subscription and check if results are correct
5) Click on the "order" link
6) Check the biblio information are filled in the form
7) Select a budget and fill some price information.
8) retry steps 3 and 4. Verify you cannot order the same subscription.
Message:Outstanding order (only one order per subscription is allowed).
9) click on your subscription (already added) and check you have a new
table "Acquisition details" with your price information in the "Ordered
amount" line.
10) receive this order
11) On your subscription detail page, the "Spent amount" line must be
filled with your price information.
12) Re order the same subscription. Now you are allowed to. Prices
information have to be filled with the previous information.
13) Retry some orders and click on a maximum of links in order to find a
bug :)

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-22 23:54:43 -04:00
Jared Camins-Esakov
92433747b5 Merge branch 'bug_7740' into 3.12-master 2013-03-22 23:22:42 -04:00
Jared Camins-Esakov
d9916b5635 Merge branch 'bug_9900' into 3.12-master 2013-03-22 23:21:57 -04:00
6e8baf6f88 Bug 9900 - Plugins should not be enabled by default
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple changes, all ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-22 23:21:34 -04:00