[koha-commits] main Koha release repository branch master updated. v18.05.00-1474-g15684a0
Git repo owner
gitmaster at git.koha-community.org
Tue Nov 13 22:29:00 CET 2018
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, master has been updated
via 15684a0f703735359a0c2aa4b084f6ba43f48d11 (commit)
via 446142cd2ba6b9ace602d918e5ef83b0b0ccfa6a (commit)
via 027f7b103b74e4823d018339f9eaa3f5bff0dbed (commit)
via 9d595e36a7844f99fa5d74aad418717d12eeae37 (commit)
via ea800323b70aceaa55df5b0fa96cdae8ebbc9579 (commit)
via 8d4136c7663d351268e8647da7189acacfc1b050 (commit)
via 4290426251bc805cdbfbe263ec0e6510d6010bbf (commit)
via 52111840d3fe28abac6b5eff167f88fe988d0b8c (commit)
via 90f915a8b220cc405ab51d006c773964494515a3 (commit)
via e08980974e9952cb6d80a48fcedb032dada63d7c (commit)
via b5cf4012ff0f208e57942e1fb8d6e713a2f3a98d (commit)
via 679930c8597680a870f7c9801b6dbd40e1254edf (commit)
via ef2c52b4a06172ed168bbee0ae98009a643435e2 (commit)
via 3a4b6c9142a3a355d6764c2da1fdb9037f9d1277 (commit)
via 9a011c58e7efa3afa674a6376e75e4a6697083f8 (commit)
via b9149799e36e1b34f8504cd57edf63f27f061d93 (commit)
via 75d5f496ed78d502be7b8008b798b04b0db38e1c (commit)
via 40267be0851309d926932e458317a9f10f5c38a2 (commit)
from 414aa0aef643d147a1901b55bfa4479b73652d52 (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 15684a0f703735359a0c2aa4b084f6ba43f48d11
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu Nov 1 13:38:35 2018 +0000
Bug 21799: Change wording for quantity input field on order receive page
Changes the label from "Quantity to receive" to "Quantity ordered".
The label below reads "Quantity received".
To test:
- Order something in acquisition
- Add a new shipment and create an invoice
- Receive an order line
- On the order receive form, check for the labels mentioned above
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>
commit 446142cd2ba6b9ace602d918e5ef83b0b0ccfa6a
Author: Dimitris Antonakis <diman at debian.diman>
Date: Sat Nov 10 13:24:27 2018 +0200
Bug 17597: Outdated translation credits
Updated translation credits for the Greek language.
Signed-off-by: Andreas Roussos <arouss1980 at gmail.com>
Works as expected, hyperlink to openhub tested OK.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 027f7b103b74e4823d018339f9eaa3f5bff0dbed
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 21 11:40:16 2018 +0100
Bug 9775: Unitprice should be hidden when creating an order
The actual cost box is effectively hidden from the order page.
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9d595e36a7844f99fa5d74aad418717d12eeae37
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Aug 29 17:26:14 2018 -0300
Bug 21282: Sync ordered and spent values with acqui home
The order list for each fund calculates using the ecost tax excl., but
it should be tax incl.
At the moment this means that the sum on the start page table and the
order list don't match up.
Test plan:
- Create and receive orders
- Values on acqui home and ordered/spent should be the same
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>
commit ea800323b70aceaa55df5b0fa96cdae8ebbc9579
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Tue Nov 13 15:17:09 2018 -0300
Bug 21777: (QA follow-up) Fix colspan in the footer
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8d4136c7663d351268e8647da7189acacfc1b050
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Nov 7 12:16:08 2018 +0000
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 at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 4290426251bc805cdbfbe263ec0e6510d6010bbf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 7 14:23:27 2018 -0300
Bug 21777: Add a regression test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 52111840d3fe28abac6b5eff167f88fe988d0b8c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 1 10:03:18 2018 -0300
Bug 21467: (follow-up) Display a summary line per parent_ordernumber
Wrong resolution conflict
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 90f915a8b220cc405ab51d006c773964494515a3
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Mon Oct 29 20:54:32 2018 +0000
Bug 21467: (QA follow-up) Move hint a little bit
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e08980974e9952cb6d80a48fcedb032dada63d7c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 1 09:51:23 2018 -0300
Bug 21467: Prevent tests to fail
The following error is raised if TestBuilder generates too big numbers:
Out of range value for column 'tax_value_on_ordering'
UPDATE aqorders
SET
tax_value_on_ordering = quantity * ecost_tax_excluded * tax_rate_on_ordering,
tax_value_on_receiving = quantity * unitprice_tax_excluded * tax_rate_on_receiving
WHERE ordernumber = ?
"] at /home/vagrant/kohaclone/C4/Acquisition.pm line 1484.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b5cf4012ff0f208e57942e1fb8d6e713a2f3a98d
Author: Koha instance kohadev-koha <kohadev-koha at kohadevbox>
Date: Sun Oct 28 15:17:25 2018 +0000
Bug 21467: (QA follow-up) Fix filter and variable declaration in .t
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 679930c8597680a870f7c9801b6dbd40e1254edf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 12 15:19:28 2018 -0300
Bug 21467: Display a summary line per parent_ordernumber
This will help to keep track of the different orders for a given
subscription.
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ef2c52b4a06172ed168bbee0ae98009a643435e2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 12 14:26:44 2018 -0300
Bug 21467: Fix default sort
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3a4b6c9142a3a355d6764c2da1fdb9037f9d1277
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 2 13:42:58 2018 -0300
Bug 21467: Display the quantity and adjust the amounts
On the subscription detail view we should display the amounts depending
on the quantity (can be different than 0 now!)
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9a011c58e7efa3afa674a6376e75e4a6697083f8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 2 13:31:20 2018 -0300
Bug 21467: Do not erase the internal note of the first order
For the subscription we would like to keep the original internal note
(from the first order), to display it unmodified each time we receive
issues.
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b9149799e36e1b34f8504cd57edf63f27f061d93
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Oct 2 12:39:38 2018 -0300
Bug 21467: Add subscription's info when ordering
When ordering from a subscription, there is now a "hint" to display the
number of issues and the frequency. It will be easier to estimate the
quantity to receive.
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 75d5f496ed78d502be7b8008b798b04b0db38e1c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 20:44:29 2018 -0300
Bug 21467: Add treetable to subscription detail to group orders by parent ordernumber
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 40267be0851309d926932e458317a9f10f5c38a2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 19:41:17 2018 -0300
Bug 21467: Allow several receipts for a given subscription
When a new order is created from a subscription the quantity is set to 1
and cannot be modified.
The idea was to order 1 subscription.
This behavior leads to a limitation: it is not possible to mark a
receipt as partially received. However it is how it works in real life,
the vendors send invoices throughout the year. The number of items can
also be changed.
The idea is be to rethink the "quantity" value for an order created
from a subscription and use it to track the number of invoices already
paid.
FIXME: This approach will not cohabit with standing orders.
This patch is a first draft to get feedback on the idea.
FIXME: What about cancelled orders?
Test plan:
- Create a new order from a subscription
- Enter the number of items you think you will receive for this
subscription (for instance 1 per month: 12)
- Close the basket
- Receive 3 items (a trimester) and create a specific invoice for this
receipt. Note that the price are per unit.
If you want to receive items with different prices you should make
split the receipt
- Receive more items. This time you will notice that the previous order
will be displayed on the "order receive" under a new block "Receipt
history for this subscription"
- Note that the "Quantity to receive" has been decrease by the number of
items you previously received
- Also you can notice that this "Quantity to receive" can be modified.
Indeed it can happen that the number of items to receive changed during
the year
- Go to the detail of the subscription and notice that the orders have
been grouped by "parent ordernumber"
- Continue to receive items until all have been received
Sponsored-by: BULAC - http://www.bulac.fr/
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 7 +-
acqui/finishreceive.pl | 7 +-
acqui/neworderempty.pl | 9 +-
acqui/ordered.pl | 4 +-
acqui/orderreceive.pl | 25 +++++-
acqui/spent.pl | 8 +-
admin/columns_settings.yml | 5 ++
.../prog/en/includes/checkouts-table-footer.inc | 2 +-
.../prog/en/includes/checkouts-table.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 +-
.../prog/en/modules/acqui/neworderempty.tt | 29 +++---
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 3 +-
.../prog/en/modules/acqui/orderreceive.tt | 80 +++++++++++++----
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 3 +-
.../prog/en/modules/serials/subscription-detail.tt | 70 +++++++++++----
serials/subscription-detail.pl | 18 +++-
t/db_dependent/Acquisition.t | 43 ++++++++-
t/db_dependent/selenium/regressions.t | 93 +++++++++++++++++++-
18 files changed, 345 insertions(+), 66 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list