[koha-commits] main Koha release repository branch master updated. v19.05.00-673-gdc6ebfa
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 23 13:12:11 CEST 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, master has been updated
via dc6ebfadb8f4a15101be1357a3139dac882e6d14 (commit)
via 7ee71c09c1e74cecb33d86359235b8725d8c7305 (commit)
via 6eb3c86cbd7db10eb568d2b4bb59739acdd7eb78 (commit)
via 8457fb1cf99754b5783fc2351ca1468aea68100d (commit)
via 306fcf6bce7ac26b498d1b2fda93760ae447dc97 (commit)
via 9aefd5845af2d927bf4c000c2334f7945070a388 (commit)
via f24597d2a0d3459310d529b94738e5e621c32f3b (commit)
via 1d42b5fbff3f43fb9bf326d06bf772ae3a44b02f (commit)
via db66a57f2bc77fed009fbf56ca6e5a3593adb0ed (commit)
via 57a93704c00dadb389defffdd64400fa00e1a283 (commit)
via 1a740fda1ea9d2f9be828481e075d4105701f275 (commit)
via 6461dc1a179451a34492c39178df9cbf6704f9d1 (commit)
via 0b72c3c068c47efd02dd18505e6c677cf518fa4d (commit)
via 4360c56621597cf09966679c90487b3978cfaf1b (commit)
via 9247a33f869879b195a825d7213d9d7d2b348931 (commit)
via 4563877e3545812a028c223344b92d68d7e9a6a2 (commit)
via fd56dce7afdfb125d65ebc268ec2343053731ec5 (commit)
via ac89be111a96c8b0fabfa7b5f98fb3daf7d366ee (commit)
from 98e4b5c04a1f89fb168fbc6e7dc40f374cb40ad1 (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 dc6ebfadb8f4a15101be1357a3139dac882e6d14
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Sep 23 11:48:54 2019 +0100
Bug 23321: DBRev 19.06.00.029
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7ee71c09c1e74cecb33d86359235b8725d8c7305
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 20 15:56:45 2019 -0300
Bug 23321: (QA follow-up) Accounts vs. Accounting
The UI uses 'Accounting' in several places (patron details tab, admin
page section name, breadcrumbs, etc). Use the same name on the sysprefs.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6eb3c86cbd7db10eb568d2b4bb59739acdd7eb78
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 20 15:50:14 2019 -0300
Bug 23321: Add Koha::Object(s) info to the schema
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8457fb1cf99754b5783fc2351ca1468aea68100d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 20 15:30:29 2019 -0300
Bug 23321: (QA follow-up) Add missing TT filters
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 306fcf6bce7ac26b498d1b2fda93760ae447dc97
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 20 15:26:08 2019 -0300
Bug 23321: (QA follow-up) Booleans
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9aefd5845af2d927bf4c000c2334f7945070a388
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Sep 20 15:06:38 2019 -0300
Bug 23321: (QA follow-up) Make atomic update idempotent
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f24597d2a0d3459310d529b94738e5e621c32f3b
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 13 17:04:00 2019 +0100
Bug 23321: (follow-up) Add test for Koha::Account change
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1d42b5fbff3f43fb9bf326d06bf772ae3a44b02f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 13 17:03:02 2019 +0100
Bug 23321: (follow-up) Correction to exception logic
This patch reduces the noisy warning of uninitialised variables
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit db66a57f2bc77fed009fbf56ca6e5a3593adb0ed
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 13 16:28:38 2019 +0100
Bug 23321: (follow-up) Add cash register to admin-menu
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 57a93704c00dadb389defffdd64400fa00e1a283
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jul 19 09:20:49 2019 +0100
Bug 23321: (follow-up) Require cash registers for payments
This follow-up catches the case where no cash registers have been
defined for the current branch and as such payments cannot be processed.
Test plan:
1) Ensure you have 'UseCashRegisters' set to 'Do'
2) Attempt to make a payment for a fee whilst logged into a branch that
has not yet had cash registers configured.
3) Note that you are shown a warning and cannot proceed.
4) Signoff
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1a740fda1ea9d2f9be828481e075d4105701f275
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Sep 17 12:24:27 2019 +0100
Bug 23321: Add cash register support to paycollect
This patch ties in the cash registers system to the paycollect payment
pages in the staff client.
Test plan:
1) Add some manual fees to a test patron
2) Select some fees to pay off
3) Note the addition of a select box for selecting your cash register
upon payment.
4) Set a branch default cash register for the current branch
5) Repeat step 3 and note that the pre-selected cash register is the one
set in step 4.
6) Unset the branch default cash register for the current branch
7) Repeat step 3 and note that there is no cash register pre-selected
8) Set 'UseCashRegisters' to 'Do not'
9) Repeat step 3 and note that there is no longer an option to select a
cash register
10) Signoff
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6461dc1a179451a34492c39178df9cbf6704f9d1
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Sep 17 12:24:18 2019 +0100
Bug 23321: Allow setting of branch default
This adds the ability to set a cash register as the default selected
option when making payments at a particular branch.
1) Note the addition of a 'Make branch default' button in each row of
the table under 'Manage cash registers'
2) Click the button and note that the button has changed.
3) Click on an alternative cash register for the same branch and note
that the default has been switched to the new register.
4) Click the 'unset' button on the default branch and note that there is
no longer a default register for this branch.
5) Signoff
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0b72c3c068c47efd02dd18505e6c677cf518fa4d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Sep 17 12:24:01 2019 +0100
Bug 23321: Koha::Library additions
This patch adds the relationship accessor for Cash::Registers to the
Koha::Library class and include the relevant tests.
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4360c56621597cf09966679c90487b3978cfaf1b
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Sep 17 12:23:49 2019 +0100
Bug 23321: Add cash register management
Add in administrative interfaces to allow the management of cash
registers.
Test plan:
1) Enable the use of cash registers by setting 'UseCashRegisters' to
'Do'
2) Check that the 'Accounts > Manage cash registers' option now appears
in the 'Administration' area.
3) Click through to 'Manage cash registers' and note the message
suggesting you add your first register
4) Add you're first cash register
5) Note that the message has now been replaced by a table of cash
registers including the one you have added in the previous step.
6) Edit the cash register created in step 4 and note that the table
reflects the changes
7) Signoff
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9247a33f869879b195a825d7213d9d7d2b348931
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Jul 17 14:03:30 2019 +0100
Bug 23321: Add cash register permission
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4563877e3545812a028c223344b92d68d7e9a6a2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jul 18 08:02:31 2019 +0100
Bug 23321: Add cash register preference
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fd56dce7afdfb125d65ebc268ec2343053731ec5
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jul 16 15:16:18 2019 +0100
Bug 23321: Add cash_registers table
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ac89be111a96c8b0fabfa7b5f98fb3daf7d366ee
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jul 16 17:11:26 2019 +0100
Bug 23321: DBIC Classes
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Account.pm | 51 +++--
Koha/Cash/Register.pm | 134 ++++++++++++
Koha/{ApiKeys.pm => Cash/Registers.pm} | 21 +-
Koha/Exceptions/Account.pm | 11 +-
Koha/Exceptions/Object.pm | 8 +
Koha/Library.pm | 12 ++
Koha/Schema/Result/Accountline.pm | 32 ++-
Koha/Schema/Result/Branch.pm | 19 +-
Koha/Schema/Result/CashRegister.pm | 165 +++++++++++++++
admin/cash_registers.pl | 168 +++++++++++++++
installer/data/mysql/kohastructure.sql | 22 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 49 +++++
installer/data/mysql/userflags.sql | 3 +-
installer/data/mysql/userpermissions.sql | 3 +-
koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss | 8 +-
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 9 +
.../intranet-tmpl/prog/en/includes/permissions.inc | 9 +
.../intranet-tmpl/prog/en/includes/prefs-menu.inc | 1 +
.../prog/en/modules/admin/admin-home.tt | 10 +
.../prog/en/modules/admin/cash_registers.tt | 220 ++++++++++++++++++++
.../en/modules/admin/preferences/accounting.pref | 21 ++
.../en/modules/admin/preferences/circulation.pref | 14 --
.../prog/en/modules/members/paycollect.tt | 46 ++++
members/member-flags.pl | 1 +
members/paycollect.pl | 34 ++-
t/db_dependent/Koha/Account.t | 44 +++-
t/db_dependent/Koha/Cash/Register.t | 110 ++++++++++
t/db_dependent/Koha/Libraries.t | 37 +++-
30 files changed, 1209 insertions(+), 56 deletions(-)
create mode 100644 Koha/Cash/Register.pm
copy Koha/{ApiKeys.pm => Cash/Registers.pm} (75%)
create mode 100644 Koha/Schema/Result/CashRegister.pm
create mode 100755 admin/cash_registers.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref
create mode 100644 t/db_dependent/Koha/Cash/Register.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list