Description
Jonathan Druart
2018-07-31 15:35:15 UTC
Created attachment 77340 [details] [review] Bug 21133: Add missing use C4::Accounts statement in Koha/Patron.pm It's a follow-up of commit 9c6f634469de4364d71bc0eb7520d04ead61fd00 Bug 16912: Koha::Patrons - Move AddEnrolmentFeeIfNeeded to->add_enrolment_fee_if_needed One of the known issue: > update categories set enrolmentfee=2; The use misc/devel/create_superlibrarian.pl to create a new superlibrarian patron Should be backported if patches from bug 16912 are there. Created attachment 77341 [details] [review] Bug 21133: Add missing use C4::Accounts statement in Koha/Patron.pm It's a follow-up of commit 9c6f634469de4364d71bc0eb7520d04ead61fd00 Bug 16912: Koha::Patrons - Move AddEnrolmentFeeIfNeeded to->add_enrolment_fee_if_needed One of the known issue: > update categories set enrolmentfee=2; The use misc/devel/create_superlibrarian.pl to create a new superlibrarian patron Signed-off-by: Victor Grousset <victor.grousset@biblibre.com> Fix confirmed. Without the patch I got {UNKNOWN}: Undefined subroutine &C4::Accounts::manualinvoice called at /home/koha/src/Koha/Patron.pm line 864. at /home/koha/src/Koha/Patron.pm line 347 With the patch, it now works. Created attachment 77344 [details] [review] Bug 21133: Add missing use C4::Accounts statement in Koha/Patron.pm It's a follow-up of commit 9c6f634469de4364d71bc0eb7520d04ead61fd00 Bug 16912: Koha::Patrons - Move AddEnrolmentFeeIfNeeded to->add_enrolment_fee_if_needed One of the known issue: > update categories set enrolmentfee=2; The use misc/devel/create_superlibrarian.pl to create a new superlibrarian patron Signed-off-by: Victor Grousset <victor.grousset@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Pushed to master for 18.11, thanks! We broke some tests with this patch, it adds circular dependencies. koha_1 | Undefined subroutine &C4::Items::ModZebra called at /kohadevbox/koha/C4/Items.pm line 302. koha_1 | Undefined subroutine &C4::Circulation::GetItem called at /kohadevbox/koha/C4/Circulation.pm line 1290. I am fixing this, in tests. Basically the idea is: 1. Undefined subroutine &C4::Items::ModZebra called at /home/vagrant/kohaclone/C4/Items.pm line 302. => Then use C4::Items before C4::Biblio 2. Undefined subroutine &C4::Circulation::GetItem called at /home/vagrant/kohaclone/C4/Circulation.pm line 1290 => Then use C4::Circulation before C4::Items Created attachment 77345 [details] [review] Bug 21133: Fix use statements order Basically the idea is: 1. Undefined subroutine &C4::Items::ModZebra called at /home/vagrant/kohaclone/C4/Items.pm line 302. => Then use C4::Items before C4::Biblio 2. Undefined subroutine &C4::Circulation::GetItem called at /home/vagrant/kohaclone/C4/Circulation.pm line 1290 => Then use C4::Circulation before C4::Items And sometimes these 2 rules do not work... Follow-up pushed as well, thanks Jonathan! This one is somewhat of a nightmare to backport. I'm going to hold off and see if there are any side effects in master before attempting a port. (In reply to Martin Renvoize from comment #11) > This one is somewhat of a nightmare to backport. I'm going to hold off and > see if there are any side effects in master before attempting a port. Even just the first patch ? "Add missing use C4::Accounts statement in Koha/Patron.pm" (In reply to Victor Grousset/tuxayo from comment #12) > (In reply to Martin Renvoize from comment #11) > > This one is somewhat of a nightmare to backport. I'm going to hold off and > > see if there are any side effects in master before attempting a port. > > Even just the first patch ? "Add missing use C4::Accounts statement in > Koha/Patron.pm" Then tests will fail? :) Bug 21396 has been pushed to 18.05.x and tests are failing: Undefined subroutine &C4::Items::ModZebra called at /home/vagrant/kohaclone/C4/Items.pm line 302. This error can be fixed with these patches. I have rebased and adjusted them to make them apply on 18.05 Created attachment 79889 [details] [review] Bug 21133: [18.05.x] Fix use statements order Basically the idea is: 1. Undefined subroutine &C4::Items::ModZebra called at /home/vagrant/kohaclone/C4/Items.pm line 302. => Then use C4::Items before C4::Biblio 2. Undefined subroutine &C4::Circulation::GetItem called at /home/vagrant/kohaclone/C4/Circulation.pm line 1290 => Then use C4::Circulation before C4::Items And sometimes these 2 rules do not work... I have *not* run the whole test suite locally to make sure everything was ok. Thanks for the 18.05.x patch, very much appreciated. I have now tested locally and all appears good. Pushed up for 18.05.05, cross fingers the Jenkins god will be appeased. Patch for 18.05 was easy to rebase on 17.11 Pushed to 17.11.x for 17.11.11 |