Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Alex Arnaud	ce6ba9aac9	Bug 20194: Display both biblioitems.itemtype and items.itype in circulation screens Test plan: 1. Verify that biblioitems.itemtype, items.itype are mapped to a MARC field. Otherwise create those mappings. 2. Create a biblio with an itemtype 3. Create an item with a different itemtype for this biblio 4. Check out this item to a patron (P1) 5. Verify that both itemtypes are displayed in the checkouts table (moremember.pl, circulation.pl, returns.pl) 6. Create a patron whose guarantor is P1 and verify that both itemtypes and the ccode are displayed in the 'relatives checkouts' table Followed test plan, patch worked as described, also passes QA test tool Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	6 years ago
Kyle Hall	291f03fe65	Bug 14697: Enhance the return claims feature This adds a "Claims returned" feature that extends and enhances the claims returned lost status. To use this feature, a new LOST status to represent an item claimed as returned needs to be created. The value of this LOST authorised value should be set in the new syspref ClaimReturnedLostValue. Setting this system preference turns on the feature. Once the feature is enabled, you should be able to mark checked out items as return claims from the checkout and patron details pages, and also modify them from the new claims tab on those pages. Returning a claimed item will notify the librarian that the item in question has a claim on it. Setting the ClaimReturnedWarningThreshold will add an alert to make librarians aware that this patron has many return claims on the patron's record. Test Plan: 1) Create a "Claims Returned" lost value 2) Create some RETURN_CLAIM_RESOLUTION authorized values 3) Set ClaimReturnedLostValue 4) Set ClaimReturnedChargeFee 5) Set ClaimReturnedWarningThreshold 6) Create some checkouts 7) Claim some returns 8) Verify ClaimReturnedChargeFee works with all 3 options 9) Verify ClaimReturnedWarningThreshold shows a warning once the threshold has been exceeded 10) Edit notes on a claim 11) Resolve a claim 12) Delete a claim Sponsored-by: North Central Regional Library System Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	5 years ago
Andrew Isherwood	1c61e60a17	Bug 7088: (follow-up) Add pref to checkbox As per commit #29 here: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7088#c29 Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	5 years ago
Andrew Isherwood	770212d134	Bug 7088: (follow-up) Default hold checkbox display As per item 4 here: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7088#c24 Now, the checkbox for renewing on hold items behaves the same way as the checkbox for renewing items that have reached their renew limit. It is necessary to check the re-labelled "Override renewal restrictions" checkbox before it is possible to select on-hold items for renewal. Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	5 years ago
Nick Clemens	8d4136c766	Bug 21777: Fix circulation table alignment TO test: 1 - Check out an item to a patron 2 - Note the columns are misaligned 3 - Apply patch 4 - Updatedatabase 5 - Reload the patron 6 - Note the table is fixed Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Katrin Fischer	81875ab282	Bug 14786: Use MARC istead of ISO2709 everywhere This patch changes the term ISO2709 in the templates to use MARC instead. Test plan: - The term was changed on the following pages in staff: - Advanced catalouging editor > Save to catalog - Patron account > Check out (Activate ExportCircHistory) > Format - Patron account > Check out > Help page - Lists > Download list - Acquisitions > Add order to basket > From a staged file (breadcrumbs) - Administration > System preferences > ExportRemoveFields - Cart > Download - Tools > Export data > Output format Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Katrin Fischer	3c143b52ac	Bug 19719: (follow-up) Show description instead of code This follow-up changes the display from collection code to description, following the existing pattern for location. To test: - Repeat test plan from first patch - Verfiy now the collection descrption shows - Change column setting in administration - Verify they work as expected Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Jesse Maseto	fd4d17ace1	Bug 19719: Add new column for collection in the patron checkouts data tables This makes the collection visible in the checkouts table on the details and issues tab in the patron account in staff. TEST: 1. Check out a few items to patron. 2. View check outs on patron account in staff client. 3. Collection code is not present. 4. Apply patch 5. Notice that not Collection code is visible while viewing check outs. Signed-off-by: Severine QUEUNE <severine.queune@bulac.fr> Signed-off by: Maksim Sen <maksim.sen@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Jonathan Druart	dcd1f5d48c	Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	9 years ago
Jonathan Druart	b0dc5fc0f3	Bug 15498: Let the user choose the CSV profile to export circ history The way the export options are displayed at the bottom of the checkouts table was not consistent. Prior to this patch set, they are display if ExportRemoveFields or ExportWithCsvProfile is set. It does not make any sense, the user could want to export the checkouts in iso2709 format without having to define a csv profile and fill the pref. Moreover the behavior of this pref did not match its description: it's used as a default CSV profile when exporting records from the export tools or the command line. This patch set adds a new pref ExportCircHistory and remove ExportWithCsvProfile. The new pref is set if ExportWithCsvProfile or ExportRemoveFields were set. A new dropdown list with the CSV profile list will be displayed in the export area, at the bottom of the checkouts table. Note that now --csv_profile_id is mandatory for the export command line (misc/export_records.pl) if the export format is csv. Test plan: 0/ Do not execute the DB entry 1/ Clear both ExportWithCsvProfile and ExportRemoveFields prefs 2/ Execute the DB entry 3/ ExportCircHistory should not be set and the export options should not be displayed at the bottom of the checkouts table. 4/ Remove the pref DELETE FROM systempreferences WHERE variable='ExportCircHistory'; and reinsert the previous one, with a value: INSERT INTO systempreferences (variable, value) VALUES ('ExportWithCsvProfile', 'something'); Execute the DB entry again => The now pref should be now set 5/ Export some checkouts using the CSV entry 6/ Note that the export tool and commandline script still work using the csv format. You have to provide a --csv_profile_id option to make it work. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Jonathan Druart	c6e09ca387	Bug 18136: Fix ExportRemoveFields pre-fill behaviour Looks like it's caused by bug 13190. Variable export_remove_fields is not sent to the template, let's retrieve the syspref's value using the TT plugin. Test plan: Fill ExportRemoveFields with something (100a for instance) Go on a checkout list page At the bottom, the "do not export fields" input box should be pre-filled with the content of the syspref Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	7 years ago
Josef Moravec	804677265e	Bug 16239: Update templates Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Fridolin Somers	2b54196b72	Bug 17394 - exporting checkouts with items selects without items in combo-box In checkouts table, the is an export form (when some exports syspref are enabled). When selecting some checkouts and selecting "ISO2709 with items" in export format combo-box, clicking on "Export" will select "ISO2709 without items" in the export format combo-box. This is quite strange. Its because the form as 2 inputs with same name and id "output_format" : an hidden input (the wanted arg for tools/export.pl) and a select (the export format combo-box). So an action meant on the hidden input impacts the select. This patch corrects by changing id and name of the export format combo-box : issues-table-output-format TEST plan : - Enable checkouts exports by setting syspref ExportWithCsvProfile with a profile - Go to circ page of a patron with checkouts : /cgi-bin/koha/circ/circulation.pl?borrowernumber=xxx - Show checkouts table - Select some checkboxes in "Export" column - Select "ISO2709 with items" in export format combo-box - Click on "Export" => Without patch, the export format combo-box changes to "ISO2709 without items" => With patch, the export format combo-box does not changes - Check the export file contains the items - Check exports "ISO2709 without items" and "CSV" are OK Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Nick Clemens	99bdb7edbd	Bug 15975 - Add Owning Library Column to Checkouts To test: 1 - Checkout some items to a patron 2 - Note there is no 'Home library' column 3 - Apply patch 4 - Note there IS an 'Home library' column 5 - Use the columns configuration and ensure you can hide/display column at will Sponsored by: Coeur d'Alene Public Library (http://www.cdalibrary.org/) Works as expected (after clearing browser cache). Commit message amended (as of comment #7) Signed-off-by: Marc <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Kyle Hall	05be0f29cd	Bug 12920 [QA Followup] - Show override option below checkouts table when allowed Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Alex Arnaud	eb5fca30aa	Bug 15289 - borrowers permission allows to see patron's loans Test plan: - log with a user that have "borrowers" permission but not "Remaining circulation permissions" - go to a borrower's detail page (who has at least a loan) and click on "show checkouts" - check that you see loan(s) and that you can't renew and checkin - Do the same with a borrower that have "Remaining circulation permissions" - check that you see loan(s) and that you can renew and checkin Followed test plan. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	9 years ago
Katrin Fischer	00ed62bb83	Bug 14915: (QA followup) Replace fa-downlowd-alt with fa-download Fixes non-existing fa-download-alt by using fa-download instead. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Kyle Hall	0cab6f2ef3	Bug 14915: Use Font Awesome instead of Glyphicons for the staff intranet We should be using Font Awesome for our icons instead of Glyphicons, for the reasons discussed on bug 13696. Test Plan: 1) Apply this patch 2) Note all Glyphicons have been replaced with FA icons in the staff intranet 3) git grep "icon-" ./koha-tmpl/intranet-tmpl/prog/en/modules/ should give no results 4) git grep "icon-" ./koha-tmpl/intranet-tmpl/prog/en/includes/ should give no results Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> We need a follow-up to cover the files changes since this patch was written. Especially to cover the changes in the label creator modules. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Jonathan Druart	d7cfdb45e5	Bug 13492: Add the location column to the checkouts tables Test plan: 1/ Verify that the location column is correctly displayed on the checkouts tables (circ/circulation.pl and members/moremember.pl). 2/ Verify that you can hide/show this column (using the admin page and/or the ColVis DT plugin). Signed-off-by: Aleisha <aleishaamohia@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Rafal Kopaczka	901be3db53	Bug 9481 - charge not showing fines On 'Check out' and 'Details'. When looking at the patron record or the checkout screen the checkout summary is now showing 0 for all the Charges even if the item was overdue and has accrued fines. Removed unused(?) footer values in checkouts-table-footer.inc To test: 1/ Check out items with past due date 2/ Run fines.pl script (ensure finesMode is set to Calculate and Charge) 3/ Verify on Fines->Pay Fines screen that fines where calculated correct. 4/ Go to Patron record, charge column on Details and Check out screen should be 0 or rental charge amount only. But total amount row display right number, same as in pay fines screen. 4/ Apply patch. 5/ Now charges on display and check out screen shows all outstanding fees for each item. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Kyle Hall	45de696ce4	Bug 13495 [QA Followup] - Re-word "Renew or return" button as well Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	9 years ago
Jonathan Druart	2aebc84cc8	Bug 13190: Refactor the checkouts table template code This code is duplicated and should be centralised. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago

22 Commits (ce6ba9aac97689d296d46a200a95aa36a64a5201)