97f6d9a087
This fixes regression caused by "Bug 12362: Cancel transfer with hold cancelation" where cancelled hold's transfer didn't show up in intranet and opac because it create a new transfer that was not yet put in in-transit state. The original idea of bug 12362 was to be able to trigger transfer back home if a hold was cancelled (a regression caused by bug 26078). However, we can do it more simply by setting the $validTransfer variable true in the item check-in code when we are dealing with Reserve transfers. More down in the AddReturn() code there is also a check "and !$resfound" to make sure we only try to trigger the transfer back home automatically if there is no hold waiting at the current location the item arrived in. It should be noted however that now we only display generic message for the automatic transfer reason. Bug 12362 made the return display as the reason "Transfer was cancelled whilst in transit". However, since this fixes the original regressions caused by bug 26078 and restores similar behaviour to that I think giving a more descriptive message for example regarding a hold being cancelled can be considered a further enhancement. To test: 1) Apply patch 1) Have biblio with item in branch A 2) Create a new hold with a pickup library to branch B 3) Check-in the item at branch A and confirm the hold and transfer 4) Cancel the hold 5) Check-in the hold at branch B and notice it prompt to return it to branch A Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> |
||
|---|---|---|
| .. | ||
| Acquisition | ||
| Biblio | ||
| Budgets | ||
| Circulation | ||
| data | ||
| db_dependent | ||
| edi_testfiles | ||
| etc | ||
| External | ||
| Koha | ||
| lib | ||
| Members | ||
| Number | ||
| Search | ||
| Serials | ||
| SIP | ||
| Test | ||
| 00-checkdatabase-version.t | ||
| 00-deprecated.t | ||
| 00-load.t | ||
| 00-merge-conflict-markers.t | ||
| 00-testcritic.t | ||
| 00-valid-xml.t | ||
| Auth.t | ||
| Auth_with_shibboleth.t | ||
| AuthoritiesMarc_MARC21.t | ||
| AuthoritiesMarc_UNIMARC.t | ||
| Barcodes_annual.t | ||
| Barcodes_EAN13.t | ||
| Barcodes_hbyymmincr.t | ||
| Barcodes_incremental.t | ||
| Biblio.t | ||
| Biblio2.t | ||
| Budgets.t | ||
| Calendar.t | ||
| Charset.t | ||
| Circulation_barcodedecode.t | ||
| ClassSortRoutine.t | ||
| ClassSortRoutine_Dewey.t | ||
| ClassSortRoutine_Generic.t | ||
| ClassSortRoutine_LCC.t | ||
| ClassSource.t | ||
| Context.t | ||
| Contract.t | ||
| Creators.t | ||
| DateUtils.t | ||
| Debug.t | ||
| dummy.t | ||
| Edifact.t | ||
| EdiInvoice.t | ||
| Ediorder.t | ||
| Ediordrsp.t | ||
| EdiTransport.t | ||
| Form_MessagingPreferences.t | ||
| HtmlTags.t | ||
| ImportBatch.t | ||
| Installer_PerlModules.t | ||
| Installer_pm.t | ||
| ItemCirculationAlertPreference.t | ||
| Koha.t | ||
| Koha_MetadataRecord.t | ||
| Koha_SearchEngine_Elasticsearch_Browse.t | ||
| Koha_Template_Plugin_Cache.t | ||
| Koha_Template_Plugin_HtmlId.t | ||
| Koha_Template_Plugin_Koha.t | ||
| Koha_Util_FrameworkPlugin.t | ||
| Koha_Util_MARC.t | ||
| Labels.t | ||
| Labels_split_ccn.t | ||
| Labels_split_ddcn.t | ||
| Labels_split_lccn.t | ||
| Labels_split_Regex.t | ||
| Languages.t | ||
| Letters.t | ||
| Logger.t | ||
| Makefile.t | ||
| Matcher.t | ||
| Members_Messaging.t | ||
| OpenLibrarySearch.t | ||
| Output.t | ||
| Output_JSONStream.t | ||
| Patron.t | ||
| Patroncards.t | ||
| Patroncards_Batch.t | ||
| Patroncards_Lib.t | ||
| Patroncards_Patroncard.t | ||
| Patroncards_Profile.t | ||
| Patroncards_Template.t | ||
| Prices.t | ||
| RecordProcessor.t | ||
| Ris.t | ||
| Scheduler.t | ||
| Scrubber.t | ||
| Search.t | ||
| Search_PazPar2.t | ||
| SimpleMARC.t | ||
| SMS.t | ||
| SocialData.t | ||
| Stats.t | ||
| SuggestionEngine.t | ||
| SuggestionEngine_AuthorityFile.t | ||
| template_filters.t | ||
| timezones.t | ||
| TmplToken.t | ||
| Token.t | ||
| XSLT.t | ||