[koha-commits] main Koha release repository branch master updated. v19.11.00-336-gf1df9f1
Git repo owner
gitmaster at git.koha-community.org
Mon Jan 13 15:38:53 CET 2020
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 f1df9f17287d47fbaef9085a2e969df170306249 (commit)
via ceba85dfd56b474594d0f6911d02f80621e8b74d (commit)
via 3fbe262eb2b8d79279f905ba764b0df4d275e309 (commit)
via ade421e89634b99f6e08f4c8c3e98f358c8621d0 (commit)
via 2d6801eb5ca024935ffaffb1488789fba08b2a50 (commit)
via 8767a6bc3565522c36c7b760675bcda7a82127bf (commit)
via 2210e9485faaea9ca3d6dcedceaa57a1cefd948e (commit)
via 12fce1495207a87af28345a72e4ff396ef6ed190 (commit)
via a65363acd50e8c1dae2797117d01f6b6687ee870 (commit)
via b151f71ddc084ff75008b2db07b123ed307b2241 (commit)
via e71b615cf63ed9c5f1cba1facbdce80f119ef7df (commit)
via 01faf14d8b0b0239e22d1b3a6ae3874b5597cdcc (commit)
via 4543156930c1074bdd929a1c9d340917feb4a148 (commit)
via 454d4745b72aaf339a86cc1cd4c12ec8e00c82e5 (commit)
via cae27cb5934005ce0ad1724e4447668739650f4e (commit)
via a63932af346b0d29f189a84bd7e30a8d38a65b9f (commit)
via dd996e1ff98d9e9013830ff877b036075da1ef94 (commit)
via 49e5debfc2a1f1c5a18704b6742fd0f27f063b7c (commit)
via cf27a62f707bbf474023fb5edf86960c7cf4e4b4 (commit)
via 9688209732e5e3498c6da5d2a1181fabfac11c64 (commit)
via dd2dc613a361b379a229e34cabdcb68493a46a8f (commit)
via deb596a210fb48e579cd790b33abbca72b305dac (commit)
via dd9cfda29f1b6007919506839eb83dbe1034a43f (commit)
via 3e6ef8614a5c7eaf47a903b68518c404cc657091 (commit)
via 7a7091d48c05020f2179184b7e50fdcd6d4b0ba3 (commit)
from 312e773d65624f37bc9597df2db471c3f7877127 (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 f1df9f17287d47fbaef9085a2e969df170306249
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jan 13 14:13:41 2020 +0000
Bug 23354: Compiled CSS
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ceba85dfd56b474594d0f6911d02f80621e8b74d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jan 13 14:12:47 2020 +0000
Bug 23354: DBRev 19.12.00.009
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3fbe262eb2b8d79279f905ba764b0df4d275e309
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Sun Jan 12 18:43:03 2020 +0000
Bug 23354: (QA follow-up) Fix spelling in templates
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ade421e89634b99f6e08f4c8c3e98f358c8621d0
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Sun Jan 12 18:41:30 2020 +0000
Bug 23354: (QA follow-up) Make db update idempotent
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2d6801eb5ca024935ffaffb1488789fba08b2a50
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 10 11:52:31 2020 +0000
Bug 23354: (QA follow-up) Rename test file
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8767a6bc3565522c36c7b760675bcda7a82127bf
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Jan 10 11:48:56 2020 +0000
Bug 23354: (QA follow-up) Allow manual receipt printing
This patch adds an alert message that allows receipt printing for
transactions when FinePaymentAutoPopup is not enabled.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2210e9485faaea9ca3d6dcedceaa57a1cefd948e
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Jan 10 09:16:21 2020 +0000
Bug 23354: (QA follow-up) Add missing filters, remove tab chars
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 12fce1495207a87af28345a72e4ff396ef6ed190
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Jan 10 09:11:30 2020 +0000
Bug 23354: (QA follow-up) Mark boolean columns in schema
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a65363acd50e8c1dae2797117d01f6b6687ee870
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Nov 20 12:52:13 2019 +0000
Bug 23354: Prevent negatives from being entered
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b151f71ddc084ff75008b2db07b123ed307b2241
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Nov 20 12:38:57 2019 +0000
Bug 23354: Format price on item add
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e71b615cf63ed9c5f1cba1facbdce80f119ef7df
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Nov 20 09:30:48 2019 +0000
Bug 23354: (follow-up) Fix for sending code instead of description
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 01faf14d8b0b0239e22d1b3a6ae3874b5597cdcc
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Nov 20 07:53:05 2019 +0000
Bug 23354: (follow-up) Update for bugs 23049 and 23805
Remove all mentions of accounttype and replace with debit_type_code and
credit_type_code as appropriate.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4543156930c1074bdd929a1c9d340917feb4a148
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 25 14:37:34 2019 +0100
Bug 23354: (follow-up) Ensure 'CASH' payment type is present
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 454d4745b72aaf339a86cc1cd4c12ec8e00c82e5
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 17 13:19:34 2019 +0100
Bug 23354: (follow-up) Make display of debit types configurable
This patch adds a the ability to define where a debit type will be
available as a option for use.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cae27cb5934005ce0ad1724e4447668739650f4e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 3 17:13:25 2019 +0100
Bug 23354: Update to account for bug 23049
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a63932af346b0d29f189a84bd7e30a8d38a65b9f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 3 14:39:00 2019 +0100
Bug 23354: Add Icon for POS system
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dd996e1ff98d9e9013830ff877b036075da1ef94
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Sep 23 14:12:13 2019 +0100
Bug 23354: (follow-up) Use 'format_price' for totals
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 49e5debfc2a1f1c5a18704b6742fd0f27f063b7c
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Sep 23 13:51:11 2019 +0100
Bug 23354: (follow-up) Input type on jEditable
Update the jEditable plugin to a maintained version and use the new
'number' type to enable increment arrows on click and remap onblur event
to submit.
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cf27a62f707bbf474023fb5edf86960c7cf4e4b4
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Sep 17 12:28:56 2019 +0100
Bug 23354: Add tests for Koha::Charges::Sales
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9688209732e5e3498c6da5d2a1181fabfac11c64
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Sep 11 10:44:56 2019 +0100
Bug 23354: Add permissions
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dd2dc613a361b379a229e34cabdcb68493a46a8f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Sep 5 10:13:57 2019 +0100
Bug 23354: (follow-up) Responses to feedback
This patch impliments a number of refinements requested after the first
round of feedback from the sponsors.
1) Fix padding on pay page
2) Switch 'items to add' from right to left on the page
3) Fix editable columns on pay page
4) Add explanitory text to pay page
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit deb596a210fb48e579cd790b33abbca72b305dac
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Aug 13 11:16:25 2019 +0100
Bug 23354: Add ability to remove items
This patch adds the ability to remove items from a transactions on the
new Point of Sale pay page.
Test plan:
1) Populate a transaction with at least one item.
2) Note the new button to 'Remove item' on the items table.
3) Click the button and confirm the item is removed
4) Signoff
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dd9cfda29f1b6007919506839eb83dbe1034a43f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Sep 17 12:28:30 2019 +0100
Bug 23354: Add receipting to Pay page
This patch adds receipt printing to the new Point of Sale pay page.
Test plan:
1) Apply patch and run database update
2) Enable automatic receipt printing via the `` system preference.
3) Make a payment for an item via the new POS pay page.
4) Note that a receipt printing dialogue is shown automatically after
payment.
5) Note that a new notice is available under tools where you can alter
the content of the receipt.
6) Signoff
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3e6ef8614a5c7eaf47a903b68518c404cc657091
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jul 23 17:23:55 2019 +0100
Bug 23354: Add a Point Of Sale 'pay' screen
This patch adds a new Point Of Sale module to Koha's staff client front
page. The module button leads directly to a 'Pay' page giving the staff
user the ability to record anonymous payments for items that would not
normally require a patron to be registered at the library.
Test plan:
1) Enable `UseCashRegisters` via the system preferences.
2) Ensure your user has the 'manage_cash_registers' permission.
3) Add a cash register for your current branch.
4) Add at least one 'MANUAL_INV' authorized value.
5) Navigate to the new 'POS' pay page via the main menu.
6) Add an item to the 'sale' by clicking 'add' from the right side of
the screen.
7) Note that said item was added to the table of items this sale on the
left.
8) At this point you should be able to 'click to edit' the quantity or
price of the item in the table on the left.
9) Enter an amount greater than the price of the item into the 'amount
collected from patron' box.
10) Click 'Confirm'
11) Varify that the same change to give modal from the paycollect pages
appears here.
12) Click 'Confirm'
13) Payment will have been recorded (check the database) and you will be
back at a fresh 'Pay' page ready for the next transaction.
14) Signoff
Sponsored-by: PTFS Europe
Sponsored-by: Cheshire Libraries Shared Services
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7a7091d48c05020f2179184b7e50fdcd6d4b0ba3
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date: Wed Oct 9 15:34:24 2019 -0400
Bug 23790: fr-CA translation of ACCOUNT_DEBIT and ACCOUNT_CREDIT notices
This patch provides the fr-CA translation of the ACCOUNT_DEBIT and ACCOUNT_CREDIT notices.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Tested deleting from letter table, then loading the file.
File loads without problem, no errors.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/Charges/Sales.pm | 283 ++++++++++++++
Koha/Schema/Result/AccountDebitType.pm | 24 +-
admin/debit_types.pl | 6 +-
installer/data/mysql/account_credit_types.sql | 5 +-
installer/data/mysql/account_debit_types.sql | 30 +-
installer/data/mysql/account_offset_types.sql | 1 +
.../data/mysql/en/mandatory/sample_notices.sql | 66 ++++
.../mysql/fr-CA/obligatoire/sample_notices.sql | 28 +-
installer/data/mysql/kohastructure.sql | 3 +-
installer/data/mysql/updatedatabase.pl | 125 ++++++
.../lib/jquery/plugins/jquery.jeditable.mini.js | 39 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 9 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/permissions.inc | 5 +
.../intranet-tmpl/prog/en/includes/pos-menu.inc | 16 +
.../prog/en/modules/admin/debit_types.tt | 27 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 6 +
koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 408 ++++++++++++++++++++
.../printfeercpt.tt => pos/printreceipt.tt} | 4 +-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 8 +-
members/maninvoice.pl | 2 +-
pos/pay.pl | 91 +++++
circ/transfer-slip.pl => pos/printreceipt.pl | 64 ++-
t/db_dependent/Koha/Charges/Sales.t | 261 +++++++++++++
25 files changed, 1394 insertions(+), 121 deletions(-)
create mode 100644 Koha/Charges/Sales.pm
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/pos-menu.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
copy koha-tmpl/intranet-tmpl/prog/en/modules/{members/printfeercpt.tt => pos/printreceipt.tt} (84%)
create mode 100755 pos/pay.pl
copy circ/transfer-slip.pl => pos/printreceipt.pl (52%)
create mode 100644 t/db_dependent/Koha/Charges/Sales.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list