Revert "Bug 8230: (follow-up) update POD for C4::Acquisition::GetHistory"

This reverts commit 303cad8f1fa1fc633be0d0ae79e4f830462d343e.
Revert "Bug 8230: (follow-up) repair regression on order search"

This reverts commit 896a62b43b3556e49fdff2fd941f122e75e85f28.
Revert "Bug 8230: (follow-up) fix detection of cancelled orders"

This reverts commit 0929a7e2b6625de40c560619a68ec91c1615852a.
Revert "Bug 8230: (follow-up) don't link to basket unless user has appropriate permissions"

This reverts commit ca75ea2959988b2fbc831b77c0c9bdc7aadaea75.
Revert "Bug 8230: DBrev 3.14.01.002"

This reverts commit 7870c0d8fe715fabc5dd7df87337f2300dedcc1b.
Revert "Bug 8230: (follow-up) reflect the fact that order statuses are now alphabetic codes"

This reverts commit a2a87e04e20e98374225de87a84c5db6043f1f55.
Revert "Bug 8230: Display acquisition details on the catalogue detail page"

This reverts commit 72aad868b2385d60ec59cab045aeda133a233435.
Bug 10852: serials search improvements

This patch adds 3 filters for the serials search:
- location
- callnumber
- expiration date

To test:
- Search serials by location and/or callnumber and/or expiration date
  and check that results are consistent.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4651bbff213996c3c1e9364855de02de568596f4)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10852: (follow-up) rename the "expiration date" filter name

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d20489c874fb62415ad0aa9489aa07817d5a7091)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10852: (follow-up) switch from KohaAuthorisedValues to AuthorisedValues

Bug 10626 will remove the KohaAuthorisedValues plugin and keep the
AuthorisedValues plugin.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 28e4a4a69946c3e30c054467ca3465e835841aac)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10852: (follow-up) tweak wording of serials search form

* "Callnumber" => "Call number"
* "Expire before" => "Expires before"

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c88d7d831877895cc74c5bf90730530a65cc9f98)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10852: (follow-up) fix POD for C4::Serials::NewSubscription

The error in the POD was discovered in the course of writing
test cases for the main patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8a5ce95916fad6f73b8d5be2908ead65b78a7f2f)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10852: (follow-up) regression tests

This patch adds regression tests for the changes to
C4::Serials::SearchSubscriptions().

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 659ac6a904dbfe9c5e535963a4717fd183ffb7e6)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10852: (follow-up) update the POD for C4::Serials::SearchSubscriptions

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 945dbfc490e7bc8849f7b5f741856131c765cc75)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10626 - Remove doubled up TT plugins - Merge KohaBranchName and Branches

Looking at the TT plugin directory I notice we have some plugins that
seem to do the same thing:

KohaBranchName.pm
Branches.pm

This patch drops KohaBranchName in favor of Branches

Test Plan:
1) Apply this patch
2) View a basket group, note the branch name is displayed
3) View a subscription's details, note the branch name is displayed
4) View suggestions, note the branch names are displayed
5) Return an item that needs transfered, note the branch name is displayed
6) Run 'prove t/db_dependent/Koha_template_plugin_Branches.t'

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Also tested with a branch name with umlauts.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 6000bfdf87db3f7f43feb21efd3cac8b7de9c048)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10626: (follow-up) replace another use of KohaBranchName

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
Make sure
- independentbranches is turned on
- Your user doesn't have superlibrarian permission
Then
- Try to check out an item with home and holding branch !=
  logged in branch

Patch works alright.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 4a7bb58b1daf5edc47581f17b3dfef1e7beac601)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10626: Remove doubled up TT plugins - Merge KohaAuthorisedValues and AuthorisedValues

This patch removes the KohaAuthorisedValues TT plugin; uses of it are
replaced by the AuthorisedValues plugin, which does the same thing.

Test Plan:
1) Apply this patch
2) View the pages that this patch has modified, make sure the branch
   name is still visible

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on second patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b5b3d4c403f3df91578a3d49ed15811cd1386e52)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10626: (follow-up) replace an instance of KohaAuthorisedValues

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Trying to write my own test plan here:

1) AllowNotForLoanOverride = Allow
   Mark single item not for loan and try to check it out.
   Check item not for loan status shows up correctly in message:
   Item is normally not for loan (Staff Collection). Check out anyway?

2) Toggle AllowNotForLoanOverride = Not Allow
   Try to check out your not for loan item again.
   Message has changed, but not for loan status should still show:
   Item not for loan (Staff Collection).

3) Check out item that is marked damaged.
   Check damaged status shows correctly in list of checkouts.

4) Mark item as lost and check it out.
   Check lost status shows up correctly in message:
   This item has been lost with a status of "Lange überfällig (Verloren)".

5) Create your own custom SUGGEST_STATUS and check that it shows
   up correctly on the suggestion page.

6) Test item status show up correctly on OPAC detail page (lost, not
   for loan, damaged, etc). Requires follow-up patch to be applied.

7) Mark a suggestion with your custom status and make sure it shows
   up in the patron account in OPAC correctly.

Passes tests and QA script - needs a follow up for item-status-schema-org.inc.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0958ec11ce00a6274e8257ddb5cd2f2539b9069a)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10626: (follow-up) remove final invocation of KohaAuthorisedValues

Removes USE KohaAuthorisedValues plugin from
item-status-schema-org.inc as it does not seem to be used
in the file.

Couldn't detect regressions removing it on OPAC detail page.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 0c19c582187f59eda19b2b97865d0d5a3b13a8dd)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Bug 10626: (follow-up) replace use of KohaAuthorisedValues in the Bootstrap theme

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit e334aed702634b8c73aa28c467b585202c7ab117)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>

Conflicts:
	koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc