[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-134-g3a5201f
Git repo owner
gitmaster at git.koha-community.org
Tue Feb 12 14:37:42 CET 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 18.11.x has been updated
via 3a5201fb90e51df7e5dd30cc2339c7d3dc2cfa31 (commit)
via d7c112bc0ecc380fa8621842bc02ff30d8e3c68c (commit)
via a6945032dab677dbba47c66f3116ba6a34d3ff0e (commit)
via 60b1a4f83611414a042651bea757dc7e96fde6f9 (commit)
via ecb86a84c13e4e5661f4c6683b7755c21d607bbe (commit)
via 1106c0fa595c8378807bc955b29c2f83c2af5ba9 (commit)
via 8f48da710b4363e44cc06788751e0c9e93143977 (commit)
via 26c59980fe123fc6033098ae374f57c4afd53aca (commit)
via 3638172077c95f0cba2f0e190f245e598e4b004d (commit)
via 7c881b32b5f7bfca6ccb17b8ddc8045ad37a3524 (commit)
via a69fd8912496c5d7335e0e4d8f113d2b2aeb7b61 (commit)
via fa4ed5e67744019d013a9374002ffde3956153c3 (commit)
via 38c960a6ef49ce8f95c5320fafcd4f334b24f81a (commit)
via 84052899398043f8dc29df0f6631ce7e5fd04f50 (commit)
via 8f18b5499c1a5698c6ecca18566cb4ef38442379 (commit)
via c9ca18549ca06c7443ee354b0aa74e56a020acb5 (commit)
via 981670c68cb3d12b30c410c12ed6488f5a555117 (commit)
via 350a9e475fb32d9b6ca16db573f9a0577ea087be (commit)
via f64d0d9038a58abe360744200348950688e834cd (commit)
via bf7524f0b1cebb68584eebf2d3acaec44126355d (commit)
from 99cd91ad2dbbc1c24bf4aea41865147013f947bb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3a5201fb90e51df7e5dd30cc2339c7d3dc2cfa31
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sat Jan 5 06:45:05 2019 +0000
Bug 22116: Add price formatting to rental charge and replacement price on items tab in staff
Adds formatting to replacement price and rental charge on items
tab.
To test:
- Add a rental charge to one or more of your item types
- Edit a record with some items, add replacement cost to some
- Find or create a record with your rental charged itemtype (MARC21:942$c)
- Go to the staff detail page of those records
- Check "Items" tab for
- Rental charge on top
- Replacement price for items
- Verify information is displayed correctly when toggling CurrencyFormat
system preference
Signed-off-by: Jack Kelliher <jke0429 at stacmail.net>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 89ae6cc3bfea81dea8d6995965a44b92c34764aa)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d7c112bc0ecc380fa8621842bc02ff30d8e3c68c
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Feb 5 00:42:34 2019 +0100
Bug 21441: Fix wrong reference to a 'holds' table on system information tab
It looks like a typo snuck in on the about page, listing a holds
table instead of reserves.
To test:
- Manually create the same PK (reserve_id) in reserves and old_reserves
- Verify that the message on about > system information now
correctly lists those tables (not holds and old_reserves)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit cfea47cb064362bbb1fc93769be4b7df3a8e2fae)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a6945032dab677dbba47c66f3116ba6a34d3ff0e
Author: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Date: Wed Jan 16 01:37:22 2019 +0000
Bug 21840: Fixed some typos in the templates
intranet-tmpl/prog/en/modules/ill/ill-requests.tt:13
Bibliograpic record ID --> Bibliographic record ID
intranet-tmpl/prog/en/modules/acqui/basket.tt:547
Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first
intranet-tmpl/prog/en/modules/acqui/parcel.tt
Can't cancel order, ([% loop_order.holds_on_order | html %]) holds are linked with this order cancel holds first --> ... with this order. Cancel holds first
intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt:32
Print this slabel --> Print this label
Test plan:
1. Check that the fixes in the patch are correct
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7a58d0215907c05b0b82944141f6f4d4595c3979)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 60b1a4f83611414a042651bea757dc7e96fde6f9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Feb 11 07:15:11 2019 -0500
Bug 21829: (QA follow-up) - Update the number of unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit f3f5b98fd909f9e13aa4e45a16dc275ef4ee8489)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ecb86a84c13e4e5661f4c6683b7755c21d607bbe
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 14 09:38:01 2018 -0300
Bug 21829: Correctly format dateexpiry in notices (date only)
dateexpiry is a date, we should not display the time
part in notice.
Test plan:
Create a notice with borrowers.dateexpiry, generate this notice.
The value should be displayed without the time part
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5b160af2a051dc3693f04dabf320d0995cf26160)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1106c0fa595c8378807bc955b29c2f83c2af5ba9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 14 09:37:58 2018 -0300
Bug 21829: Add tests for dateexpiry format in notices
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 04e121a741a442f5b557e11864eb69be9d0c3ded)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8f48da710b4363e44cc06788751e0c9e93143977
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Dec 20 23:37:02 2018 +0000
Bug 22009: Fix error messages for filing rules and splitting rules.
Some error messages were doubled up with different error codes.
To test:
I am not sure how to trigger those from the GUI, might
require a code review/code changes.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 558742577d3902cd5e2abf5c3f165c6425e163da)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 26c59980fe123fc6033098ae374f57c4afd53aca
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jan 13 10:06:22 2019 +0100
Bug 22119: Add price formatting in more places in circulation
This adds some missing Price filters to some places in circulation.
To check verify the amount are displayed according to setting
of CurrencyFormat (use FR or CH for seeing a change)
Use a patron account with no pending fines at the beginning
for all tests.
1)
- Switch RentalFeesCheckoutConfirmation to "Ask"
- Check out an item with a rental charge
- Verify message is formatted correctly:
Rental charge for this item: ...
2)
- Switch RentalsInNoissuesCharge to "Don't include"
- Make sure patron has only Rental fines on their account
- Check out another item
- Verify message is formatted correctly:
The patron has unpaid charges for holds, rentals etc ...
3)
- Switch BatchCheckouts to "Allow"
- Add the patron category of your test patron to BatchCheckoutsValidCategories
- Checkout any item
- Verify the message in the information column is formatted correctly:
The patron has unpaid charges for holds, rentals etc of ...
Signed-off-by: Jasmine Amohia <jasmineamohia.student at wegc.school.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit dc6be66e2b2ec5917d7bec020d4e94c40baa9f6c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3638172077c95f0cba2f0e190f245e598e4b004d
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Jan 13 11:15:27 2019 +0100
Bug 22120: Add price formattig to patron summary print
The patron summary print lists the replacement prices
and rental charges of items and totals them. With this
patch they will be formatted according to the
CurrencyFormat system preference.
To test:
- Find or create a patron with some checkouts
- Make sure some items have replacement price set
and some have a rental charge
- "Print summary" from the account in staff
- Verify that charges and prices in the checkouts
table are formatted correctly
- Toggle CurrencyFormat to different settings
Signed-off-by: helene hickey <hickeyhe at wgc.school.nz>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 3c2cc8da26f7a907c0b51f928ffb100eefbfa692)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7c881b32b5f7bfca6ccb17b8ddc8045ad37a3524
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Jan 14 05:41:48 2019 +0000
Bug 17347: Ignore whitespace before and after on renewing
When an item is checked out, Koha ignores whitespace
at the beginning and the end of the entered barcode.
This makes life easier, if a barcode is C&P from another
page. This patch makes the renewal page behave the same.
To test:
- Checkout an item
- Renew the item from the renew tab or renewal page
entering the barcode with leading and trailing
whitespace
- "Barcode not found"
- Apply patch
- Try again
- Barcode should be found now
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Devinim <kohadevinim at devinim.com.tr>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 0e220869f5a3327eee8f9426d648fbcaaa0fd7fa)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a69fd8912496c5d7335e0e4d8f113d2b2aeb7b61
Author: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Date: Tue Nov 27 11:53:32 2018 +0200
Bug 21885: Calendar to-date starts before end-date
When adding new holidays to the calendar, you pick the start date,
and then the end date, but the end date calendar will start from
current date, not from the picked start date. Sometimes this means
many extra clicks to pick an end date.
Make the end date calendar start from the beginning date by default.
Test plan:
1) Go to the tools -> calendar
2) Pick a start date somewhere in the future, and then open the
end date calendar. Notice how it starts before the start date
of the date range.
3) Apply patch.
4) Pick a start date in the future. The end date calendar should
automatically default to the same date.
5) Change the start date a day backwards, note how the end date
does not change.
6) Change the start date after the end date, note how the end date
adjusts, so it is not in the past.
Signed-off-by: Pasi Kallinen <pasi.kallinen at joensuu.fi>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 0939d44c22cda569faf4c0c60fd67de04097b34d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fa4ed5e67744019d013a9374002ffde3956153c3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jan 30 09:44:21 2019 -0300
Bug 22235: (follow-up) Make koha-remove stop SIP server if required
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5bb04247477dce80fbacf9993be3164518c03df6)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 38c960a6ef49ce8f95c5320fafcd4f334b24f81a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jan 30 09:37:47 2019 -0300
Bug 22235: Make maintenance scripts use koha-sip instead of koha-*-sip
This patch makes all maintenance scripts use **koha-sip** instead of
the old **koha-*-sip** scripts.
To test:
- Run:
$ perl misc4dev/cp_debian_files.pl
$ sudo service koha-common stop
=> SUCCESS: No errors and the SIP-related sevices are stopped
$ sudo service koha-common start
=> SUCCESS: No errors and the SIP-related services are started
$ sudo service koha-common restart
=> SUCCESS: No erros and SIP-related services are running
$ sudo koha-create --create-db test
$ sudo koha-sip --enable test
$ sudo koha-sip --start test
$ sudo koha-disable test
=> SUCCESS: No errors, instance disabled, no SIP running for test
- Sign off :-D
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c0e6051ac5bd0190a6491ecc853614a156014d88)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 84052899398043f8dc29df0f6631ce7e5fd04f50
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jan 30 09:12:36 2019 -0300
Bug 18562: Tab completion in bash
This patch adds the fancy tab completion in bash.
To test:
- Run:
$ source debian/koha-common.bash-completion
$ sudo koha-sip <tab>
- Play with all the options
=> SUCCESS: The combinations make sense (e.g. only SIP-enabled instances
are completed for --start, --stop, --restart, -v and --verbose are not
offered if the other one is already in there, --enable only applies to
SIP-disabled instances, etc).
- Sign off :-D
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 74b6a659e5ec831e99beaad2f9ce6dad6409a3a0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8f18b5499c1a5698c6ecca18566cb4ef38442379
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jan 30 09:12:25 2019 -0300
Bug 18562: Add manpage for koha-sip
This patch adds the manpage for koha-sip.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove xt/verify-debian-docbook.t
=> SUCCESS: Tests pass!
- Run:
$ misc4dev/cp_debian_files.pl
$ man koha-sip
=> SUCCESS: The man page shows correctly.
- Sign off :-D
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 713f873626404e7904bebd0b97dee1d9f67745fc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c9ca18549ca06c7443ee354b0aa74e56a020acb5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Wed Jan 30 08:42:53 2019 -0300
Bug 18562: Add koha-sip maintenance script
This patch introduces a single script to handle all actions on SIP
servers for Koha instances. It is intended to be a replacement for:
- koha-start-sip
- koha-stop-sip
- koha-enable-sip
It adds a function called is_sip_running to koha-functions.sh.
To test:
- Apply this patch
- Run:
$ misc4dev/cp_debian_files.pl
$ sudo koha-sip --enable kohadev
$ sudo koha-sip --start kohadev
$ sudo koha-sip --status kohadev
=> SUCCESS: The SIP server is running for kohadev
- Run:
$ sudo koha-sip --restart --verbose kohadev
$ sudo koha-sip --status kohadev
=> SUCCESS: The SIP server is running for kohadev
- Run:
$ sudo koha-sip --stop kohadev
$ sudo koha-sip --status kohadev
=> SUCCESS: The SIP server is not running for kohadev
- Play with other combinations like enabling an already enabled
instance, etc. Remember you need to remove the
/etc/koha/sites/kohadev/SIPconfig.xml file so it is considered disabled.
- Sign off :-D
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 6ec979057b2b4f10fe469d2655fa0fcb47af1cb7)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 981670c68cb3d12b30c410c12ed6488f5a555117
Author: Liz Rea <liz at catalyst.net.nz>
Date: Thu Jan 31 22:41:29 2019 +0000
Bug 22282: Fix PDF issue when exporting PDF in French format.
Fixing up QA comments, keeping 1st instance and removing the 2nd.
Original test plan by Christophe Croullebois.
To test :
Without the patch :
1° select in Acquisitions preferences/OrderPdfFormat French 3-page
2° restart plack if needed
3° In acqui/basketgroup.pl select closed tab
4° Click on "Export as PDF" button
5° You should see a blank page saying "Internal Server Error"
With the patch :
Do the same
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 0844f2c174c83ce3da11be07511730b0c220e5ad)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 350a9e475fb32d9b6ca16db573f9a0577ea087be
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Jan 14 12:47:25 2019 +0000
Bug 22110: Fix editing of adjustments for CurrencyFormat != US
When using CurrencyFormat FR or CH the editing an amount behave
badly. Example: changing displayed 1,00 to 1,11 would save as 1,00.
At the moment Koha only understands decimal dot, not comma.
So every time data is entered, we use decimal dot.
1) Add an adjustment to an invoice
2) Change system preference CurrencyFormat to FR or CH
3) Verify the amount displays with a decimal comma
4) Try changing the amount to something like 1,11
5) Save the amount
6) Verify it shows 1.00
7) Apply patch
8) Refresh the invoice page if necessary
9) Verify amount is now shown as 1.00
10) Repeat test, use 1.11
11) Verify it will be stored correctly.
Signed-off-by: Mackey Johnstone <mackeyfj at gmail.com>
Signed-off-by: mikael <mikael.Olangcay-Brisebois at inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 619d97b91d075bd7d48c95102029a8d89269be6f)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f64d0d9038a58abe360744200348950688e834cd
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Feb 6 12:49:58 2019 +0000
Bug 22278: Clear cache when creating new report groups or subgroups
When a user adds a new group we create it, then fetch the groups from the cache. However, we aren't clearing the cache on creation. This patch fixes that
To test:
0) Start a new report
1) Pick create for the group
2) Enter code and value
3) Save
4) You remain on the page and value and code are now empty (ok)
5) BUT: The pull down for the group remains "None" instead of reflecting
the new group
6) Open a new tab and browse to reports - note the group exists and the report is in it
7) On original tab save report again, the group was not selected so is lost
8) Apply patch
9) Retest with a new report
10) Group is created, saved, and selected upon save
11) Subsequent edits include the new group
12) Test with subgroups as well
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit ea36265697c85cfb1f7de0b2344ef8647dc31387)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bf7524f0b1cebb68584eebf2d3acaec44126355d
Author: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos at inLibro.com>
Date: Thu Jan 17 16:41:58 2019 -0500
Bug 18723: Change dot into comma
This fixes the regression that multiplies the amount entered by 100
when CurrencyFormat is set to FR. It replaces the last dot with a
comma before dealing with the value of ActualCost and ReplacementCost.
Test Plan:
a)Replicate the issue:
0- Set CurrencyFormat to FR
1- Go to Acquisitions
2- Search for a Vendor
3- Click on "New basket"
4- Give basket a name and click "Save"
5- Click on "Add to basket"
6- Add an order through preferred method
7- In Accounting details, enter a vendor price with dot decimal (i.e. 19.44)
8- Save your order line
9- Click on "Close this basket"
10- Confirm closing of basket by clicking on "Yes, close"
11- Click on "Receive shipment"
12- Enter an invoice number and click "Next"
13- Click on "Receive" to the right of your order
14- In Accounting details, notice the Actual cost is written with a decimal dot.
15- Change the Actual cost, using a dot decimal (i.e 20.99)
16- Receive the order
17- Click on "Save"
18- In "Already received" notice the price is multiplied by 100 (i.e. 2099,00)
19- Click on "Cancel receipt"
20- Click on "Receive" to the right of your order
21- In Accounting details, change the Actual cost, using a comma decimal (i.e. 20,99)
22- Receive the order
23- Click on "Save"
24- In "Already received", notice the price is correct.
b)Apply the patch
c)Test the patch:
1- Click on "Cancel receipt"
2- Click on "Receive to the right of your order
3- Change the Actual cost/Replacement cost, using a dot decimal (21.99)
4- Receive the order
5- Click on "Save"
6- Notice that the Actual cost and the Replacement cost use commas
7- Change the Actual cost, using a comma decimal (21,99)
8- Click on "Save"
9- In "Already received", notice the price is still correct.
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit c7f47ea36a8992356c6c055a22891ea168cbdc9c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 2 +-
Koha/pdfformat/layout3pagesfr.pm | 2 +-
acqui/finishreceive.pl | 10 ++
catalogue/moredetail.pl | 4 +-
circ/renew.pl | 1 +
debian/docs/koha-common.xml | 6 +
debian/docs/{koha-zebra.xml => koha-sip.xml} | 35 +++--
debian/koha-common.bash-completion | 38 +++++
debian/koha-common.init | 9 +-
debian/koha-common.install | 1 +
debian/scripts/koha-disable | 2 +-
debian/scripts/koha-functions.sh | 14 ++
debian/scripts/koha-remove | 4 +
debian/scripts/{koha-zebra => koha-sip} | 146 ++++++++++++--------
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +-
.../prog/en/modules/acqui/orderreceive.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +-
.../prog/en/modules/admin/classsources.tt | 4 +-
.../prog/en/modules/catalogue/moredetail.tt | 5 +-
.../prog/en/modules/circ/circulation.tt | 4 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 2 +-
.../prog/en/modules/ill/ill-requests.tt | 2 +-
.../prog/en/modules/labels/spinelabel-print.tt | 2 +-
.../prog/en/modules/members/moremember-print.tt | 8 +-
.../prog/en/modules/tools/holidays.tt | 24 +++-
members/summary-print.pl | 2 +-
reports/guided_reports.pl | 8 +-
t/db_dependent/Letters.t | 17 ++-
30 files changed, 254 insertions(+), 108 deletions(-)
copy debian/docs/{koha-zebra.xml => koha-sip.xml} (61%)
copy debian/scripts/{koha-zebra => koha-sip} (57%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list