Commit Graph

274 Commits

Author SHA1 Message Date
Paul Poulain b5474b7f95 Bug 9064: fix statistics.ccode column
From updatedatabase.pl:
    $dbh->do("ALTER TABLE statistics ADD COLUMN ccode VARCHAR ( 10 ) NULL AFTER associatedborrower");
From kohastructure.sql:
  `ccode` int(11) default NULL, -- foreign key from the items table, links transaction to a specific collection code

The variant in updatedatabase.pl is probably what was wanted.

This patch fixes the kohastructure and add another updatedatabase.pl, in case someone has a broken install.
This should not happen, because 3.10.0 still not released, but just in case...

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-22 09:01:30 -05:00
Nuño López Ansótegui 57239bd345 Bug 6428 [Follow-up] refered column 'items.coded_location_qualifier' does not exist
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-11-13 09:45:09 -05:00
Nuño López Ansótegui 6b14cd71f6 Bug 6428 - refered column 'items.coded_location_qualifier' does not exist
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:36:04 -05:00
Paul Poulain 1fd99527bd Merge remote-tracking branch 'origin/new/bug_4118' 2012-10-17 18:04:30 +02:00
Nicole C. Engard b0b927f4f2 Bug 4118: Follow up: Add ccode to kohastructure for stats
CCode was added to the statistics table in this bug, but
was not added to kohastructure.sql. This patch adds it
with comment to the kohastructure.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-17 18:04:14 +02:00
Nicole C. Engard c21fd2a983 Bug 6716: Update biblioitems tables
This patch documents the cn_sort and agerestriction fields
in the biblioitems and deletedbiblioitems tables.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-04 17:55:26 +02:00
Nicole C. Engard 9ad0006c3e Bug 6716 - Fix alt contact field documentation
The borrowers table has the wrong documentation for the alternate
address3 and city fields. This fixes that.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-04 17:55:14 +02:00
Jonathan Druart 1b4b78a136 Bug 5356: delivery place and billing place centralised in basket management
- adding 2 select option in basdketheader.tmpl (delivery and billing
   place)
- adding 2 more fields in basket csv export

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested together with patches for bug 7302.
2012-09-24 20:46:39 +02:00
Jonathan Druart d7faf087a3 Bug 5335 - More granular VAT
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Larry Baerveldt <larry@bywatersolutions.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-20 18:09:53 +02:00
Jared Camins-Esakov 7ad5e203da Bug 2060: Update command line MARC import scripts
Expose authority import functionality to the command line import
scripts, and rename them from commit_biblios_file.pl and
stage_biblios_file.pl to commit_file.pl and stage_file.pl.

To test (note that these instructions assume you have a MARC21
installation and are using the provided sample file):
1. Find a file of authorities (a sample file with MARC21 authorities
   is attached to bug 7475) and download it to your server
2. Stage the file using the following command (replace <filename> with
   the name of the file you saved in step 1):
   > misc/stage_file.pl --file <filename> --authorities
3. Note the batch number the script assigns to your batch
4. Commit the records using the following command (replace <batchnumber>
   with the batch number you made note of in step 3):
   > misc/commit_file.pl --batch-number <batchnumber>
5. Index the authorities Zebraqueue (or wait)
6. Confirm that the new authorities appear.
7. Create a matching rule with the following settings:
   Code: AUTHTEST
   Description: Personal name main entry
   Match threshold: 999
   Record type: Authority record
   Search index: Heading-main
   Score: 1000
   Tag: 100
   Subfields: a
   Offset: 0
   Length: 0
   (note the ID of this matching rule)
8. Stage the authority file again, this time using the following
   command:
   > misc/stage_file.pl --file <filename> --authorities \
     --match <matchingrule>
7. Revert the import with the following command:
   > misc/commit_file.pl --batch-number <batchnumber> --revert
8. Index the authorities Zebraqueue (or wait)
9. Confirm that the records have been removed
10. Import an authority record with the Stage MARC/Manage staged MARC
    tools in exactly the way you would for a bibliographic record,
    but choose "Authority" instead of "Bibliographic" for the record
    type.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Testing plan delivers as it should.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on latest master 11 September 2012
2012-09-19 17:16:18 +02:00
Jared Camins-Esakov 91be607586 Bug 7475: Update configuration
In order to make matching rules more useful for MARC21 authorities,
this patch adds special indexes on previous see-from headings and
LCCN. This patch does not change UNIMARC authority configuration in
any way. Also modifies the Koha schema in preparation for adding
authority import and matching to the Staging tools.

To install:
1. Run installer/data/mysql/atomicupdate/importauthorities.pl
2. Update the following four files in your koha-dev:
    etc/zebradb/authorities/etc/bib1.att
    etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml
    etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl
    etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
3. Reindex your authorities:
    misc/migration_tools/rebuild_zebra.pl -a -r -v

NOTE TO RM: this patch adds an atomicupdate file that needs to be
incorporated into updatedatabase.pl if bug 7167 is not pushed.

http://bugs.koha-community.org/show_bug.cgi?id=2060

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 1 August 2012
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on master 11 September 2012
2012-09-19 17:15:25 +02:00
Julian Maurice bf803c521f Bug 5339: Invoices management improvement
- New pages:
  - invoices.pl: allow to search in invoices on several criteria
  - invoice.pl: permit to view and modify invoice details
    - shipment date
    - billing date
    - shipment cost and budget used for shipment cost

Invoice informations are now stored in their own sql table and aqorders
have a link to it

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-09-18 22:42:15 +02:00
Srdjan 42acfbf75b Bug 7993: Save reports with Group/Subgroup hierarchy
This should make saved reports more manageable.
Group/Subgroup hierarchy is stored in authorised_values,
categories REPORT_GROUP and REPORT_SUBGROUP, connected by
REPORT_SUBGROUP.lib_opac -> REPORT_GROUP.authorised_value

Database changes:
* authorised_values: expanded category to 16 chars
* created default set of REPORT_GROUP authorised values to match
  hardcoded report areas
* reports_dictionary: replaced area int with report_area text, converted
  values
* saved_sql: added report_area, report_group and report_subgroup;
  report_area is not currently used, saved for the record

C4/Reports/Guided.pm:
* Replaced Area numeric values with the mnemonic codes
* get_report_areas(): returns hardcoded areas list
* created get_report_areas(): returns full hierarchy (groups with belonging
  subgroups)
* save_report(): changed iterface, accepts fields hashref as input
* update_sql(): changed iterface, accepts id and fields hashref as input
* get_saved_reports():]
- join to authorised_values to pick group and subgroup name
- accept group and subgroup filter params
* get_saved_report():
- changed iterface, return record hashref
- join to authorised_values to pick group and subgroup name
* build_authorised_value_list(): new sub, moved code from
  reports/guided_reports.pl
* Updated interfaces in:
cronjobs/runreport.pl, svc/report, opac/svc/report: get_saved_report()
reports/dictionary.pl: get_report_areas()
reports/guided_reports.pl

reports/guided_reports_start.tt:
* Reports list:
- added group/subgroup filter
- display area/group/subgroup for the reports
* Create report wizard:
- carry area to the end
- select group and subgroup when saving the report; group defaults to area,
  useful when report groups match areas
* Update report and Create from SQL: added group/subgroup
* Amended reports/guided_reports.pl accordingly

Conflicts:

    C4/Reports/Guided.pm
    admin/authorised_values.pl
    installer/data/mysql/kohastructure.sql
    installer/data/mysql/updatedatabase.pl
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
    koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
    misc/cronjobs/runreport.pl
    reports/dictionary.pl
    reports/guided_reports.pl

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 17:49:08 +02:00
Adrien Saurat adfbbfa0d1 Bug 8757: longer descriptions for authorised values
In the "suggestions" table, the "lib" and "lib_opac" sizes
has been raised from 80 chars to 200.
The GUI allowing the authorised values creation/update has
been changed accordingly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-18 12:22:49 +02:00
Stéphane Delaune a8b168dc63 Bug 7671 : add a real primary key accountlines_id in accountlines
Signed-off-by: Stéphane Delaune <stephane.delaune@biblibre.com>
Signed-off-by: Marc Veron <veron@veron.ch>

NOTE: After applying the patch I got following errors in members/pay.pl:
Global symbol "$writeoff_sth" requires explicit package name
Global symbol "$add_writeoff_sth" requires explicit package name

Added to lines at the begin of members/pay.pl:
our $writeoff_sth;
our $add_writeoff_sth;

Now the patch worked as expected.

However I am not quite sure if signing off is OK in this situation.

Marc

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2012-09-15 07:31:58 +02:00
Jonathan Druart 087b9665ae Bug 8002: FIX Change datatype from varchar 1 to 10 for borrower_attribute_types.category_code
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-09-14 15:33:11 +02:00
Julian Maurice d4cda293b4 Bug 7583: Cancel a receipt
In acqui/parcel.pl, there is now the possibility to cancel a receipt.
In "Already received" table, just click on "Cancel receipt" and the
order line will go back to pending orders.
If it was a partial receipt, order line is merged to its 'parent' line.
Attached items are modified so that they become attached to the merged
order line.
If AcqCreateItem is 'receiving', attached items are deleted.
If an order line was first partially received, and then completed. You
must cancel the 'parent' order line before cancelling the 'child'.

Signed-off-by: Marc Veron <veron@veron.ch>

The patch behaves like expected, and the feature is really helpfull.

Just a tiny remark about the following message:

-------------
Cannot cancel receipt. Possible reasons :
You are trying to cancel the receipt of an order line whose parent order line is already received. Cancel this parent order line and retry.
-------------

Maybe it would be good
- to explain a little bit more why it happend and re-word the message for non technical people (not everybody understands 'parent' the same way)

- prevent the situation to happen (e.g. forbid order lines to be deleted if they are already received) - but that would be in the scope of an other bug, I think.

I think such things could be fixed in the future during the ongoing work for Acquisitions module. Signing off.
2012-09-13 18:29:20 +02:00
Kyle M Hall 9dada89776 Bug 8431 - Increase the borrower attribute field size from 64 characters to 255
Some libraries would like to store more verbose data in a borrower attribute field.
This commit increases the maximum length of a borrower attribute from 64 characters
to 255 characters.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-09-13 11:04:59 +02:00
Srdjan 86c2c4626d bug_5911: Transport Cost Matrix
Create transport_cost table,  added UseTransportCostMatrix syspref.
transport_cost table contains branch to branch transfer
costs. These are used for filling inter-branch hold transfers.

Moved GetHoldsQueueItems() from .pl to HoldsQueue.pm

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-12 14:49:25 +02:00
Marc Veron 01a7188d6a BUG 7621 [ENH] Circulation: Match age restriction of title with borrower's age without using categories
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

New version implementing Paul's advice.
See Wiki http://wiki.koha-community.org/wiki/Age_restrictiotion

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

New fix updatedatabase.pl to apply to current master by Marc Veron veron@veron.ch
...and fixed missing curly bracket after merging updatedatabase.pl

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-05 14:32:53 +02:00
Nicole C. Engard dcc5f6f938 update 'onloan' in items and deleteditems
This field said it was a 1 or 0 value, but it's
a date field.

http://bugs.koha-community.org/show_bug.cgi?id=6716
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-09-04 18:21:25 +02:00
Elliott Davis 381794ff4e [PATCH] bug_7420: Added overduefinescap to issuingrules
Replaced existing MaxFine syspref logic with overduefinescap.
Repurposed MaxFine to be the overall overdue limit for all items
overdue. Implemented new MaxFine logic in UpdateFine().

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Tested according to Srdjan's test plan and everything worked like he said it would.  I set fined equal to $2 and max fine equal to $1.      When I ran the fines script for overdue items fines assessed were only $1.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-25 18:33:20 +02:00
Paul Poulain 4feb0a6246 Bug 6716 tiny follow-up, mysql want a space after the -- 2012-07-23 18:26:21 +02:00
Nicole C. Engard 7f7599ea05 Bug 6716: Update z3950servers documentation
The new timeout field was not documented.
2012-07-23 18:23:38 +02:00
Nicole C. Engard 479c490676 Bug 6716: Document search_history table 2012-07-23 18:23:37 +02:00
Nicole C. Engard 98f539f7aa Bug 6716: Document saved_sql table 2012-07-23 18:23:36 +02:00
Nicole C. Engard 7b1676895a Bug 6716: Update reserves table
This table had one field that I hadn't documented
before and two new fields for hold suspensions. All
of these are now updated.
2012-07-23 18:23:35 +02:00
Nicole C. Engard 89a4ae4076 Bug 6716: Update documentation for the letter table
The letter table is now for slips and notices, and
had other changes necessary.
2012-07-23 18:23:34 +02:00
Nicole C. Engard f3160d1005 Bug 6716: document import_record_matches table 2012-07-23 18:23:33 +02:00
Nicole C. Engard 67bd83d180 Bug 6716: Document import_batches table 2012-07-23 18:23:32 +02:00
Nicole C. Engard 929fee5f8c Bug 6716: Document tags tables
I did not document the 'tags' table in this patch
because it looks like this table is unused, so I
need confirmation of that before marking it as
'unused.'
2012-07-23 18:23:31 +02:00
Nicole C. Engard 5ab6d0ccd9 Bug 6716: Document patronimage table 2012-07-23 18:23:29 +02:00
Nicole C. Engard f32d7e6483 Bug 6716: document issuingrules table 2012-07-23 18:23:28 +02:00
Nicole C. Engard 707d5a5e68 Bug 6716: Document branch_borrower_circ_rules table 2012-07-23 18:23:27 +02:00
Nicole C. Engard e7816ad31e Bug 6716: Document branch_item_rules table 2012-07-23 18:23:26 +02:00
Nicole C. Engard a3a6407e51 Bug 6716: Document the biblio_framework table 2012-07-23 18:23:25 +02:00
Nicole C. Engard 1b0e6938ad Bug 6716: Document aqbasket table 2012-07-23 18:23:24 +02:00
Nicole C. Engard 73def1a24a Bug 6716: Document action_logs table 2012-07-23 18:23:23 +02:00
Nicole C. Engard bfaef0bb19 Bug 6716: Update ratings table documentation
This patch adds a comment to the table and updates the field
descriptions with a bit more information.
2012-07-23 18:23:22 +02:00
Nicole C. Engard 86392dde00 Bug 6716: Document branchtransfers table 2012-07-23 18:23:21 +02:00
Nicole C. Engard 1a3102ce91 Bug 6716: Document aqorders_items table 2012-07-23 18:23:20 +02:00
Nicole C. Engard bb1d8dd960 Bug 6716: Document the aqorders table
This table has a lot of fields that I never see any values in.
All have been noted in the documentation and I welcome any
additional info about how these fields might be used.
2012-07-23 18:23:19 +02:00
Nicole C. Engard 3b78048645 Bug 6716: Document aqbudgets and aqbudgetperiods tables 2012-07-23 18:23:18 +02:00
Kyle M Hall 2662e4c069 Bug 7065 - reserves table needs a primary key
Adds the primary key reserve_id to reserves and old_reserves.

Thanks to gmcharlt and jcamins for contributions.

Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>

Updated DBrev to start with 3.09... instead of 3.08...
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-10 12:09:01 +02:00
Alex Arnaud b20ffe15bb Bug 5981 - OPAC: Add limits to search history
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed a conflict in updatedatabase and removed kohaversion.pl from the patch.

Patch works nicely, tested with different searches and limits.

Note: Sort options don't get into the history still.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-07-04 16:26:33 +02:00
Julian Maurice 203757e353 Bug 7304: More permissions for budgets
- Possibility to add users to a budget
- Restrictions changed to:
  - None
  - Owner
  - Owner and users
  - Owner, users and library
- Restricted users cannot spent on these budgets (they cannot modify them
  either)

Modified pages:
 - admin/aqbudgets.pl
 - admin/aqplan.pl
 - suggestion/suggestion.pl
 - acqui/acqui-home.pl
 - acqui/addorderiso2709.pl
 - acqui/basket.pl
 - acqui/neworderempty.pl

Unit tests in t/Budgets/CanUserUseBudget.t and t/Budgets/CanUserModifyBudget.t

Bug 7304 tmp

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-06-27 16:25:44 +02:00
Matthias Meusburger 7f957077dd Bug 5337: EAN management : Adds ean for various searches
- in various acquisition pages and serials home
  - in database : biblioitems.ean
  - adds ean and its mapping in default english bibliographic framework
  - adds ean mapping in default french bibliographic framework
  - ean search is not enabled for MARC21

The required mapping between the ean marc field and the biblioitems.ean
database field will be automatically added on an existing unimarc installation.

However, if you already have records with ean, you will have to
run misc/batchRebuildBiblioTables.pl to populate biblioitems.ean

Signed-off-by: jmbroust <jean-manuel.broust@univ-lyon2.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Passed QA at second run. Removed a merge marker only.
2012-06-09 18:26:34 +02:00
Jared Camins-Esakov 64f933a2fa Bug 8159: Fix error in kohastructure.sql
Adds a missing semicolon.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-31 18:12:34 +02:00
Paul Poulain 838269d1e7 Bug 7792:redefine the field branchcode as PRIMARY KEY of branches
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-05-28 11:59:44 +02:00
Stéphane Delaune 90928e1404 Bug 7794:redefine the field id as PRIMARY KEY of sessions
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-28 11:46:47 +02:00