[koha-commits] main Koha release repository branch master updated. v3.22.00-768-g65c4694
Git repo owner
gitmaster at git.koha-community.org
Thu Mar 3 21:36:21 CET 2016
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 65c4694b7a4d0aba5fac055a12d171280a8b80ea (commit)
via 225fb60b40bf9893515930c76f491421c1cee686 (commit)
via 2325ef0cb8fd997c9fa258e672c3e1b740370a81 (commit)
via eceece8de2e3d9f6a137b7ea75779a0927431cbb (commit)
via a4013eee67fa186ca34c55d0bd73b5f12e84cc97 (commit)
via 85d08edddfc1dc418dc85f8cd4dfd525442a32d5 (commit)
via 1538e9ecf47642c4974693ff499c3e95e4d71977 (commit)
via 0423b82314d4178eff460c30a05664b3efc3cd3c (commit)
via b574b615919a6463708d4c1d7b1153a061c1ea0a (commit)
via 6cd3975f64bd8cf31d626c6061d33f1974df9ea8 (commit)
from 676d1e53b30e59854b672b0339d1ff7a1631d794 (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 65c4694b7a4d0aba5fac055a12d171280a8b80ea
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Mar 3 08:41:38 2016 +0000
Bug 15084: Fix conflict with bug 15446 (type vs _type)
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 225fb60b40bf9893515930c76f491421c1cee686
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Jan 22 18:23:59 2016 +0000
Bug 15084 [QA Followup] - Clean up test currencies after unit tests
Test currency left behind will cuase next run of the unit test to fail
as well as leaving db cruft.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 2325ef0cb8fd997c9fa258e672c3e1b740370a81
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 17 10:57:48 2015 +0000
Bug 15084: DBIx::Class - Shema changes
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit eceece8de2e3d9f6a137b7ea75779a0927431cbb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 29 14:55:23 2015 +0000
Bug 15084: DB Changes - add currency.archived and FK on aqorders.currency
See the comment for details.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit a4013eee67fa186ca34c55d0bd73b5f12e84cc97
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 29 14:54:40 2015 +0000
Bug 15084: Add tests for Koha::Acquisition::Currenc[y|ies]
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 85d08edddfc1dc418dc85f8cd4dfd525442a32d5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 29 14:51:37 2015 +0000
Bug 15084: Remove C4::Budgets::ConvertCurrency
This subroutine is unused and can be removed.
There is no trace left of currency in C4::Budgets.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 1538e9ecf47642c4974693ff499c3e95e4d71977
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 29 12:21:52 2015 +0000
Bug 15084: Replace C4::Budgets::GetCurrencies with Koha::Acquisition::Currencies->search
Most part of the code here is unnecessary complex. We should selected
the currency if it is selected, that's all :)
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 0423b82314d4178eff460c30a05664b3efc3cd3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 29 11:43:29 2015 +0000
Bug 15084: use Koha::Acquisition::Currenc[y|ies] in admin/currency
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit b574b615919a6463708d4c1d7b1153a061c1ea0a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 29 15:31:39 2015 +0000
Bug 15084: Make sure the previous active currency is marked as inactive
On inserting an active currency, others should be marked as inactive.
We can only have 1 active currency at the same time.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 6cd3975f64bd8cf31d626c6061d33f1974df9ea8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 29 11:43:17 2015 +0000
Bug 15084: Add Koha::Acquisition::Currenc[y|ies] classes
The first step of this patch set is to move the business logic code from
admin/currencies.pl to Koha::Acquisition::Currenc[y|ies].
Then a foreign key will be created on aqorders.currency as we want to
assure data integrity. Note that a aqbooksellers.currency also exists
but is never used. It could be removed in another bug report.
This update has to care about possible breaking relation. For instance
an old order has been made using a currency which is now deleted. To be
sure the update process won't break a new column currency.archived is
created and leave open the door for a further improvement (marked a
currency as archived from the interface: this won't be provided by this
enhancement).
These archived currencies won't appear on the interface for newly
created items (order/suggestion).
Once this is done it becomes easy to remove the subroutine from
C4::Budgets: GetCurrencies and GetCurrency.
ConvertCurrency will also be removed but is not used anymore.
Note that none of these subroutines were covered by tests. Now they are.
Test plan:
0/ Don't apply this patch
1/ Create a temporary currency and an order using it
2/ Remove the currency from your CLI
3/ Apply the patch and execute the DB entry
4/ Note that the currency is inserted and marked as archived.
5/ Edit the previous order and confirm that the correct currency is
still selected.
It won't never be displayed anywhere else.
6/ Test the admin script: on admin/currency.pl add/remove/edit
currencies.
You could not have 2 active currencies at the same time.
7/ Then on the different scripts of the acquisition module, focus on the
currencies values and create a new order, receive it.
Create/edit a suggestion
Other changes must be checked by the QAer.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 9 +-
C4/Budgets.pm | 74 ------
C4/Overdues.pm | 6 +-
Koha/{Biblios.pm => Acquisition/Currencies.pm} | 29 +--
Koha/{Borrower.pm => Acquisition/Currency.pm} | 36 +--
Koha/Number/Price.pm | 6 +-
Koha/Schema/Result/Currency.pm | 27 +-
about.pl | 3 +-
acqui/addorder.pl | 5 +-
acqui/addorderiso2709.pl | 39 +--
acqui/basket.pl | 6 +-
acqui/basketgroup.pl | 1 -
acqui/invoice.pl | 3 +-
acqui/neworderempty.pl | 40 +--
acqui/supplier.pl | 24 +-
admin/aqbudgetperiods.pl | 7 +-
admin/aqbudgets.pl | 7 +-
admin/aqplan.pl | 7 +-
admin/currency.pl | 262 +++++++-------------
admin/preferences.pl | 6 +-
.../atomicupdate/bug_15084-add_fk_for_currency.sql | 8 +
.../prog/en/modules/acqui/addorderiso2709.tt | 14 +-
.../prog/en/modules/acqui/neworderempty.tt | 17 +-
.../prog/en/modules/acqui/supplier.tt | 26 +-
.../prog/en/modules/admin/currency.tt | 175 ++++++-------
.../prog/en/modules/suggestion/suggestion.tt | 29 ++-
misc/cronjobs/overdue_notices.pl | 1 +
opac/sco/sco-main.pl | 5 +-
suggestion/suggestion.pl | 25 +-
t/Number/Price.t | 14 +-
t/db_dependent/Biblio.t | 18 +-
t/db_dependent/Koha/Acquisition/Currencies.t | 66 +++++
t/db_dependent/MungeMarcPrice.t | 6 +-
33 files changed, 432 insertions(+), 569 deletions(-)
copy Koha/{Biblios.pm => Acquisition/Currencies.pm} (72%)
copy Koha/{Borrower.pm => Acquisition/Currency.pm} (62%)
create mode 100644 installer/data/mysql/atomicupdate/bug_15084-add_fk_for_currency.sql
create mode 100644 t/db_dependent/Koha/Acquisition/Currencies.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list