[koha-commits] main Koha release repository branch master updated. v19.05.00-1077-gf4254cc
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 24 18:58:04 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 f4254cca37cc455795a5e2a7f88eb722a09da287 (commit)
via 87621206dd1e89cf9e01a8ec2ebf1fb5f80af2e2 (commit)
via 261e887dc07569944dfcc8733ee3d891b948e790 (commit)
via 12568a20dbc9ab1749df2d649ea87be36de38e51 (commit)
via 66bdfbc0a3597c4452f8adfd502a6fc6cfeb19c8 (commit)
via 9a9576dbd1b325800994520c2a436c8be282d78f (commit)
via 5fbf423e94b3482eb0521b53eac9ef1f3ff8d0f2 (commit)
via 6bfd41eb0addf7e1d02c898696de31187320c30e (commit)
via ce479d7a7d0b3fac21994662592690fad83dab0e (commit)
via 2665dc909453277636eee99ec797233f473a0ae1 (commit)
via 40613eb3c870f941e941280ab7c222a20bf778aa (commit)
via b7900423a23c85edf09a5651f7b6d9d740577bde (commit)
via 25047ce341500fa55903e88ef283e6508bd28423 (commit)
via d31e5c2a87279d57df1256ebf62134b6268cee17 (commit)
via 8cca4fbd3797d893496a5b3cf7c4a00f19a05e33 (commit)
via dbd72dcfa1cc51072a48cabea9b7ce244db8b3b8 (commit)
via 08e4de2e3d77d063249e20c62bc7ab52ad8bb925 (commit)
via 55595e200b4f6a6ec2767071d95f96c24a4584ae (commit)
via 962cebd4844183be447f7b43cbe6c353f924bd30 (commit)
via 24c0f3015474aeccb51610b47d7adae631432dab (commit)
via a7dba215bc846015eddaa255f8a9ae8270591ced (commit)
via 331c80d7b0516eb03701ae92501e757120880f56 (commit)
via a91f178d52b26332cbb74c1798d89f974680c9db (commit)
via 7189c4f0a23eee85e915cc7ea15407a5c6e7c427 (commit)
via 00970925ae848aa13b2a239b1fa3655d8ffb8441 (commit)
via aec46d0c3c5bf1dd20d155a814056c2702e52f5c (commit)
via 9f13d9fb335e617dc8232f52fa9f41e89245f7d7 (commit)
via f91fafbbcb1d5a978092ca7bcb2a859ec59ba4d0 (commit)
via 7555441ace13ff32cbefa890d8a7e35f5a5dc9ac (commit)
via b2b651d13db5471f674e82c7ff0693f2ad7ec410 (commit)
via f046b5073e3305f1a4231ff981d8ff30eaef280b (commit)
via cf1904bb0844da28d49c1543f233afed35ae0554 (commit)
via ff66171ee289b5352c1633ef74f79d3d335ff241 (commit)
via 87b166e38167a6f0cf1c58881956d03f620813c7 (commit)
via 0bd6e03c657f1d671e02f86a4279b059e13841a3 (commit)
via 6d4ae2d47eead1984f9bcd9052ec5df6cee5b99f (commit)
via 7f0cdb83cfb7dacd3978f4bb7124cd87d96e4c50 (commit)
via af6464d05b00656474b7bd0211dd540f48a12bc1 (commit)
via 1eeb9d179d2f1db39eb370269e882a0a087552ad (commit)
via 70268d49de9351243ad5bb8c594838c64ca0d442 (commit)
via fbd640fa326a838d6406a333bfdfe4d618190d98 (commit)
via 56b38464bde416b0ebab81bcbbdb5cc276424e11 (commit)
via 11bc80922855f64d94647cbf16c59ec7bcd23cba (commit)
via c97705d1903110680ccd7fe7367bd1b05fb3a464 (commit)
via 950074fa7e112e81415dce221824cf9e6b859e78 (commit)
via d661141890dbd56ca2511f435c263395c65bf55e (commit)
via 8356c56cc27d628ac23758facdb559f38e77cfb9 (commit)
via f48a467fbc2949f80e478b7996caf062c2cef8a4 (commit)
via 9641b3c8c7f078562cf7d07500780cbcc09f7fa1 (commit)
via 86ece7d2e547032458757c5850c5c4d48ea4df37 (commit)
via 4c7181ed3bf8fd7647b7f7066e6cc8ef139e9c96 (commit)
via 72e10519e3b7185c0322c144df5e54d5b203b995 (commit)
from 48ec99e0fc4918428ed0811f72132fbe33ae1a6d (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 f4254cca37cc455795a5e2a7f88eb722a09da287
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 24 17:30:43 2019 +0100
Bug 23805: DBRev 19.06.00.044
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 87621206dd1e89cf9e01a8ec2ebf1fb5f80af2e2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 24 16:53:11 2019 +0100
Bug 23805: (QA follow-up) Add missing mappings in Koha::Account::Line
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 261e887dc07569944dfcc8733ee3d891b948e790
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Oct 15 12:00:41 2019 +0100
Bug 23805: (follow-up) Handle unexpected types
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 12568a20dbc9ab1749df2d649ea87be36de38e51
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Oct 15 09:45:33 2019 +0100
Bug 23805: Update mancredit to use the new credit types
Test plan
Ensure the manual credit page continues to work as it did before this
patchset.
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 66bdfbc0a3597c4452f8adfd502a6fc6cfeb19c8
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 18:19:18 2019 +0100
Bug 23805: (follow-up) Lowercase credit type for UpdateStats
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9a9576dbd1b325800994520c2a436c8be282d78f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 18:01:55 2019 +0100
Bug 23805: Drop type lookup as it's now a foreign key
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5fbf423e94b3482eb0521b53eac9ef1f3ff8d0f2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 17:07:11 2019 +0100
Bug 23805: Update 'W' to 'WRITEOFF' for consistency
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6bfd41eb0addf7e1d02c898696de31187320c30e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 16:54:56 2019 +0100
Bug 23805: Update 'Pay' to 'PAYMENT' for consistency
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ce479d7a7d0b3fac21994662592690fad83dab0e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 16:36:34 2019 +0100
Bug 23805: Update 'lost_item_return' to 'LOST_RETURN' for consistency
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 2665dc909453277636eee99ec797233f473a0ae1
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 16:33:43 2019 +0100
Bug 23805: Update 'FOR' to 'FORGIVEN' for consistency
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 40613eb3c870f941e941280ab7c222a20bf778aa
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 16:20:31 2019 +0100
Bug 23805: Update 'C' to 'CREDIT' for consistency
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b7900423a23c85edf09a5651f7b6d9d740577bde
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 11:42:57 2019 +0100
Bug 23805: Update accounttype references in tests
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 25047ce341500fa55903e88ef283e6508bd28423
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 11:27:31 2019 +0100
Bug 23805: Update references to accounttype to credit_type_code
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d31e5c2a87279d57df1256ebf62134b6268cee17
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Oct 15 09:43:46 2019 +0100
Bug 23805: DBIC Classes
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8cca4fbd3797d893496a5b3cf7c4a00f19a05e33
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 10:57:13 2019 +0100
Bug 23805: Add account_credit_types tables
Signed-off-by: Kyle Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dbd72dcfa1cc51072a48cabea9b7ce244db8b3b8
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 24 17:28:40 2019 +0100
Bug 23049: DBRev 19.06.00.043
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 08e4de2e3d77d063249e20c62bc7ab52ad8bb925
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 24 09:41:52 2019 +0100
Bug 23049: (follow-up) Remove duplicate of mandatory data
This patchset originally introduced the manadatory data into
/en/mandatory/account_debit_types.sql. However, it was later decided to
maintain the system types description strings in the templates and as
such the database data file was moved to the top level. This patch
removes the now superflous /en/mandatory version.
Once we have the sql files easily translated via the standard
translate.koha-community.org toolchain we should restore this approach
and update the templates to use the descriptions from the database.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 55595e200b4f6a6ec2767071d95f96c24a4584ae
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 23 16:40:31 2019 +0100
Bug 23049: (QA follow-up) Catch '0' case debits
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 962cebd4844183be447f7b43cbe6c353f924bd30
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 23 16:39:39 2019 +0100
Bug 23049: (QA follow-up) Explicitly set accounttype/debit_type in tests
This patch corrects an incorrect ternary and move the definitions into
the test_data array to clarify their intent.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 24c0f3015474aeccb51610b47d7adae631432dab
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 23 16:23:48 2019 +0100
Bug 23049: (QA follow-up) Silence noisy warnings
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a7dba215bc846015eddaa255f8a9ae8270591ced
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 23 14:51:28 2019 +0100
Bug 23049: Add DBIC Classes
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 331c80d7b0516eb03701ae92501e757120880f56
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 23 14:16:20 2019 +0100
Bug 23049: (QA follow-up) Fix for missing types in test inserts
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a91f178d52b26332cbb74c1798d89f974680c9db
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Oct 23 13:22:12 2019 +0100
Bug 23049: (QA follow-up) ILSDI test data correction
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7189c4f0a23eee85e915cc7ea15407a5c6e7c427
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Oct 22 11:14:43 2019 +0100
Bug 23049: (QA follow-up) Fix swagger spec for account line
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 00970925ae848aa13b2a239b1fa3655d8ffb8441
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 21 18:37:07 2019 +0100
Bug 23049: (QA follow-up) Check constraint test corrections
TestBuilder adds random data which breaks the check constraint rule. The
simplest way to correct this situation is to override testbuilder by
passing in explicit undefs for accounttype or debit_type_code in the
tests.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit aec46d0c3c5bf1dd20d155a814056c2702e52f5c
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 21 14:51:39 2019 +0100
Bug 23049: (QA follow-up) Correction for missed archived filter
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9f13d9fb335e617dc8232f52fa9f41e89245f7d7
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 18 13:24:48 2019 +0100
Bug 23049: (QA follow-up) Correction to patrons_accounts.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f91fafbbcb1d5a978092ca7bcb2a859ec59ba4d0
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 18 13:12:39 2019 +0100
Bug 23049: (QA follow-up) Correction for 'M' => 'MANUAL'
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7555441ace13ff32cbefa890d8a7e35f5a5dc9ac
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 18 13:02:16 2019 +0100
Bug 23049: (QA follow-up) DB Update Improvements
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b2b651d13db5471f674e82c7ff0693f2ad7ec410
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 17 12:28:18 2019 +0100
Bug 23049: (follow-up) Types should not be deletable
This patch rmeoves the 'delete' option from the debit_types system and
replaces it with an 'archive/restore' workflow. This will help
maintained referential integrity.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f046b5073e3305f1a4231ff981d8ff30eaef280b
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Oct 15 12:00:24 2019 +0100
Bug 23049: (follow-up) Handle unexpected types
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit cf1904bb0844da28d49c1543f233afed35ae0554
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 14 11:30:48 2019 +0100
Bug 23049: (follow-up) Correction to includes
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ff66171ee289b5352c1633ef74f79d3d335ff241
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 11 12:33:55 2019 +0100
Bug 23049: (follow-up) VARCHAR(80) + ac -> account
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 87b166e38167a6f0cf1c58881956d03f620813c7
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 11 08:20:24 2019 +0100
Bug 23049: More thorough param checking
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 0bd6e03c657f1d671e02f86a4279b059e13841a3
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 17:09:21 2019 +0100
Bug 23049: Update API
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6d4ae2d47eead1984f9bcd9052ec5df6cee5b99f
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:58:23 2019 +0100
Bug 23049: Drop type lookup as it's now a foreign key
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7f0cdb83cfb7dacd3978f4bb7124cd87d96e4c50
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:53:52 2019 +0100
Bug 23049: Update 'N' to 'NEW_CARD' for consistency
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit af6464d05b00656474b7bd0211dd540f48a12bc1
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:48:41 2019 +0100
Bug 23049: Capitalise type passed to add_debit for `overdue`
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1eeb9d179d2f1db39eb370269e882a0a087552ad
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:43:48 2019 +0100
Bug 23049: Remove manual_debit as it's never called
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 70268d49de9351243ad5bb8c594838c64ca0d442
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:41:22 2019 +0100
Bug 23049: Capitalise type passed to add_debit for lost_item
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fbd640fa326a838d6406a333bfdfe4d618190d98
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:38:24 2019 +0100
Bug 23049: Update 'HE' to 'RESERVE_EXPIRED' for consistency
This patch updates all cases where debit_type_code was 'HE' to
'RESERVE_EXPIRED' which is more informative and consistent with the
new style guidelines.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 56b38464bde416b0ebab81bcbbdb5cc276424e11
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:31:17 2019 +0100
Bug 23049: Capitalise type passed to add_debit for `account`
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 11bc80922855f64d94647cbf16c59ec7bcd23cba
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 17:15:39 2019 +0100
Bug 23049: Update 'PF' to 'PROCESSING' for consistency
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c97705d1903110680ccd7fe7367bd1b05fb3a464
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:17:48 2019 +0100
Bug 23049: Capitalise type passed to add_debit for `rent`
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 950074fa7e112e81415dce221824cf9e6b859e78
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 16:10:07 2019 +0100
Bug 23049: Update debit_type_code 'Res' to 'RESERVE'
This patch updates all cases where debit_type_code was 'Res' to
'RESERVE' which is more informative and consistent with the new style
guidelines.
The patch also ensure all calls to add_debit with a type or 'reserve'
now pass the capitalised code instead.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d661141890dbd56ca2511f435c263395c65bf55e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 17:15:10 2019 +0100
Bug 23049: Update existing code to use debit_type
* Update C4::Accounts::chargelostitem
* Update C4::Accounts::manualinvoice
* Update C4::Circulation::_FixOverduesOnReturn
* Update C4::Circulation::_FixAccountForLostAndReturned
* Update C4::Overdues::UpdateFine
* Update C4::Overdues::GetFine
* Update C4::Overdues::GetOverduesForBranch
* Update Koha::Account->pay
* Update Koha::Account->add_debit
* Update Koha::Account->non_issues_charges
* Update Koha::Account::Line->apply
* Update Koha::Account::Line->adjust
* Update controller scripts
* Update reports scripts
* Update tests
Test Plan
1) Run the test suit and ensure everything still passes
2) Test reports/cash_register_stats still works
3) Test that adding manual invoices still works
4) Test that making payments still works
5) Test that lost item fee handling still works
6) Test that invoice printing still works
7) Test that the sco still works
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8356c56cc27d628ac23758facdb559f38e77cfb9
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 17:14:47 2019 +0100
Bug 23049: Add tests
Test plan:
prove t/db_dependent/Koha/Account/DebitType.t
prove t/db_dependent/Koha/Account/DebitTypes.t
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f48a467fbc2949f80e478b7996caf062c2cef8a4
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 17:14:39 2019 +0100
Bug 23049: Update maninvoice to reference debit types
Test plan:
1) Naviage to a patron record and select the accounts > manual invoice
tab
2) Add some manual invoices and confirm they are working as expected
3) Signoff
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9641b3c8c7f078562cf7d07500780cbcc09f7fa1
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 09:08:55 2019 +0100
Bug 23049: Filter out system types by default
Test Plan
1) Navigate to the debit types management page added in previous patches
2) Note that system types are now filtered out by default
3) Click on the new unfilter button to include system types
4) Signoff
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 86ece7d2e547032458757c5850c5c4d48ea4df37
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 10 17:14:23 2019 +0100
Bug 23049: Account types configuration - Admin page
Test plan:
1) Go to admin home, note there is new Debit types page in Accounting
section
2) Go to any other admin page and confirm there is link to Debit types
in the admin menu as well
3) Go to Debit types page
4) You should see a datatable listing existing debit types, ensure they
are working as expected.
5) Try to create, edit and delete some debit types. Note: Some debit
types cannot be deleted as they are needed for koha functionality.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 4c7181ed3bf8fd7647b7f7066e6cc8ef139e9c96
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Sep 26 14:36:06 2019 +0100
Bug 23049: Add CHECK constraint to accountlines
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 72e10519e3b7185c0322c144df5e54d5b203b995
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Feb 28 16:58:06 2019 +0000
Bug 23049: Add debit_type
* Add account_debit_types table
* Add ac_debit_types_branches table
* Add account_debit_types defaults
* Add Koha::Account::DebitType and Koha::Account::DebitTypes
* Prevent deletion of defaults
* Migrate MANUAL_INV values
* Remove MANUAL_INV references
* Migrate accounttype values
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 14 +-
C4/Circulation.pm | 26 +-
C4/Installer.pm | 2 +
C4/Overdues.pm | 8 +-
C4/Reserves.pm | 2 +-
C4/SIP/ILS/Transaction/FeePayment.pm | 2 +-
Koha.pm | 2 +-
Koha/Account.pm | 472 ++++++++++----------
.../Attribute/Type.pm => Account/CreditType.pm} | 36 +-
Koha/{Biblios.pm => Account/CreditTypes.pm} | 41 +-
.../Attribute/Type.pm => Account/DebitType.pm} | 36 +-
.../Hold/PatronHolds.pm => Account/DebitTypes.pm} | 45 +-
Koha/Account/Line.pm | 39 +-
Koha/Hold.pm | 2 +-
Koha/Patron.pm | 2 +-
Koha/REST/V1/Patrons/Account.pm | 10 +-
Koha/Schema/Result/AccountCreditType.pm | 122 +++++
...goriesBranch.pm => AccountCreditTypesBranch.pm} | 32 +-
Koha/Schema/Result/AccountDebitType.pm | 139 ++++++
...egoriesBranch.pm => AccountDebitTypesBranch.pm} | 32 +-
Koha/Schema/Result/Accountline.pm | 60 ++-
Koha/Schema/Result/Branch.pm | 34 +-
admin/debit_types.pl | 133 ++++++
api/v1/swagger/definitions/account_line.json | 12 +-
.../swagger/definitions/patron_account_credit.json | 2 +-
catalogue/moredetail.pl | 2 +-
installer/data/mysql/account_credit_types.sql | 6 +
installer/data/mysql/account_debit_types.sql | 14 +
installer/data/mysql/en/optional/auth_val.sql | 3 -
installer/data/mysql/kohastructure.sql | 62 ++-
installer/data/mysql/mandatory/auth_val_cat.sql | 1 -
installer/data/mysql/updatedatabase.pl | 381 ++++++++++++++++
.../intranet-tmpl/prog/en/includes/accounts.inc | 52 ++-
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 7 +-
.../prog/en/modules/admin/admin-home.tt | 66 +--
.../prog/en/modules/admin/authorised_values.tt | 2 -
.../prog/en/modules/admin/debit_types.tt | 230 ++++++++++
.../en/modules/admin/preferences/circulation.pref | 2 +-
.../prog/en/modules/members/mancredit.tt | 69 +--
.../prog/en/modules/members/maninvoice.tt | 102 +++--
.../prog/en/modules/members/moremember-print.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +-
.../prog/en/modules/members/paycollect.tt | 8 +-
.../prog/en/modules/reports/cash_register_stats.tt | 74 +--
.../bootstrap/en/includes/account-table.inc | 53 ++-
members/mancredit.pl | 88 ++--
members/maninvoice.pl | 153 ++++---
members/pay.pl | 12 +-
members/paycollect.pl | 8 +-
members/printinvoice.pl | 4 +-
misc/cronjobs/staticfines.pl | 2 +-
misc/devel/populate_db.pl | 1 +
opac/opac-user.pl | 4 +-
opac/sco/sco-main.pl | 8 +-
reports/cash_register_stats.pl | 36 +-
t/db_dependent/Accounts.t | 327 +++++++++-----
t/db_dependent/Circulation.t | 90 ++--
.../Circulation/NoIssuesChargeGuarantees.t | 4 +-
t/db_dependent/Circulation/Returns.t | 2 +-
t/db_dependent/Circulation/issue.t | 2 +-
t/db_dependent/ILSDI_Services.t | 2 +-
t/db_dependent/Koha/Account.t | 196 +++++---
t/db_dependent/Koha/Account/DebitType.t | 95 ++++
t/db_dependent/Koha/Account/DebitTypes.t | 82 ++++
t/db_dependent/Koha/Account/Lines.t | 54 ++-
t/db_dependent/Koha/Account/Offsets.t | 7 +-
t/db_dependent/Koha/Patron.t | 6 +-
t/db_dependent/Members.t | 15 +-
t/db_dependent/Reserves.t | 2 +-
t/db_dependent/SIP/Transaction.t | 4 +-
t/db_dependent/api/v1/patrons_accounts.t | 12 +-
71 files changed, 2658 insertions(+), 1001 deletions(-)
copy Koha/{Patron/Attribute/Type.pm => Account/CreditType.pm} (61%)
copy Koha/{Biblios.pm => Account/CreditTypes.pm} (58%)
copy Koha/{Patron/Attribute/Type.pm => Account/DebitType.pm} (62%)
copy Koha/{Club/Hold/PatronHolds.pm => Account/DebitTypes.pm} (59%)
create mode 100644 Koha/Schema/Result/AccountCreditType.pm
copy Koha/Schema/Result/{CategoriesBranch.pm => AccountCreditTypesBranch.pm} (60%)
create mode 100644 Koha/Schema/Result/AccountDebitType.pm
copy Koha/Schema/Result/{CategoriesBranch.pm => AccountDebitTypesBranch.pm} (61%)
create mode 100755 admin/debit_types.pl
create mode 100644 installer/data/mysql/account_credit_types.sql
create mode 100644 installer/data/mysql/account_debit_types.sql
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
create mode 100644 t/db_dependent/Koha/Account/DebitType.t
create mode 100644 t/db_dependent/Koha/Account/DebitTypes.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list