Created attachment 24473 [details] item_description_charges Hi, In description of charges on an account, a title of a item is written twice (see capture). Why? It would be nice if each instance can set the information on Description of charges. For example, if we want to see call number, barcode, etc. Thanks, Marjorie
Hi Marjorie, Thanks for your report. As a general note, when taking a screenshot it's useful for us to see the whole page, including the URL, so we know exactly what page you are looking at. Cheers, Liz
Created attachment 24485 [details] [review] Bug 11573 - Make fine display more consistent for rentals To test: 1. Set up an item type with a rental charge 2. issue an item from that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. This change is proposed in order to get rid of some double ups in the title on the boraccount template.
Created attachment 24486 [details] [review] Bug 11573 - removing title double ups on boraccount.tt To test: 1. Create a bunch of fines (or view your existing fines data) - it should have lost entries, rentals, rental renewals, and regular fines and fine updates. 2. View the fines tab for your borrower with fines 3. without the patch, it will look like the submitted screenshot 4. with the patch, there will be few, if any, doubleups of title This patch may be incomplete - there may be cases that still need work. I'm happy to do followups. Rental fees and rental renewals will not look wholly consistent without the other attached patch, but this one does not require it.
I can't sign off on this, can someone outside of catalyst take a look please
I generated a rental, and renewal of rental item: 26/02/2014 Rent, Renewal of Rental Item A heart for God / 1111 View item A heart for God / 5.00 5.00 Print 26/02/2014 Rent, Rental View item A heart for God / 5.00 5.00 Print then applied patches 26/02/2014 Rent, Renewal of Rental Item A heart for God / 1111 View item 5.00 5.00 Print 26/02/2014 Rent, A heart for God / 1111 View item 5.00 5.00 Print Overall this patch seems to make the Patron Fines Account tab more succinct not showing the duplicate title info. It also appends the barcode number for Rentals and renewal entries. ---But The Pay Fines tab now has title duplicated in parenthesis, which might need to be taken off, now that its part of the accountlines description from this patch. koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt could have line 129 removed, [% IF line.title %]([% line.title |html_entity %])[% END %] but we need to preserve historical context for the historically generated accountline that may not have a title. We could: a) test to see if the title is already in the description and if not, append it. (but what if the title changes in the item record? does that matter) b) perform a one time database update, appending the title to the accountline description if its not already in there - gotta think about this. -- BIG UPDATE for some follks.
Created attachment 25715 [details] [review] Followup Bug-11573-display-derived-account-fines-tab-description Tested 24485 and 24486 patch ids, but could not signoff so I added a floowup patch. Followup patch 'display-derived-account-fines-tab-description'. After applying patches 24485 and 24486 above, this patch will adjust things so that the fines realated Account and Pay Fines tabs will show a description column that is more concise without the duplicated title problem that this bug attempts to address. The templates have been expanded to handle accounttype codes that I could find mentioned in the existing codebase. In the case of the renewal, where no explicit accounttype code exists as of yet, the template checks for 'enewal' in the accountline.description field and adjusts accordingly. The original code that is building description can be historically preserved (though not shown), and we will just depend on the other columns to formulate a description. A barcode is shown if one exists, alongside the title. The set of accounttype codes handled in the template has been expanded. Unhandled codes will just appear untransformed as it does now. Someone with a long history of fines usage can 'select distinct accounttype from accountlines;' to confirm the set is sufficiently handled in the pay.tt and boraccount.tt templates. The reason for this followup was because the original two patches fixed things by modifying accountlines, but indirectly cause 'Pay fines' tab to have duplicate titles. One could work on the 'enewal' hack, but that would require a new accounttype and testing of other circulation/account/reserve code to consider it in their where clauses. Also, this may put us in a better position to translate the description in a later patch.
Account tab lines look like: Rental Renewal ( A heart for God / 1111 ) View item Pay Fine tab lines look like: Rental Renewal ( A heart for God / 1111 ) With the followup patch. See patch for accounttype transformations
I think my followup partially fixed bug 11301 (barcode display, but not assession number). It also should have fixed bug 2696, since I show the (Title / barcode) when an item exists for a payment/accountline. If folks want to keep adding fields, we could add a View Item link to the Pay fines tab, just like the Account tab has.
'new feature' is not right for the attached patches - looks more like something between a bug fix and an enh. hm.
The third patch on this patch set does not apply, and also has some problems. - capitalization, not including OPAC templates. I'd suggest we split this up into some smaller steps. Starting with fixing the rentals.
Comment on attachment 25715 [details] [review] Followup Bug-11573-display-derived-account-fines-tab-description Obsoleting here - moving it to another bug later.
Created attachment 27822 [details] [review] [SIGNED OFF] Bug 11573 - Make fine display more consistent for rentals To test: 1. Set up an item type with a rental charge 2. issue an item from that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. This change is proposed in order to get rid of some double ups in the title on the boraccount template. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Tested with rental lines created before and after applying the patch. After applying the patch it's better, but old lines will still look ok. There is still a double up on the title on the 'pay' tab, as we get the title from the itemnumber and also display the description. I think getting all the information from the itemnumber for display would be a bit nicer in the future. Butthis is an improvement. Passes tests and QA script.
Created attachment 27823 [details] [review] [SIGNED OFF] Bug 11573 - removing title double ups on boraccount.tt To test: 1. Create a bunch of fines (or view your existing fines data) - it should have lost entries, rentals, rental renewals, and regular fines and fine updates. 2. View the fines tab for your borrower with fines 3. without the patch, it will look like the submitted screenshot 4. with the patch, there will be few, if any, doubleups of title This patch may be incomplete - there may be cases that still need work. I'm happy to do followups. Rental fees and rental renewals will not look wholly consistent without the other attached patch, but this one does not require it. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Created attachment 27824 [details] [review] Bug 11573: Follow-up: Include changes in OPAC templates Patch adds changes from earlier patches to OPAC prog and bootstrap templates. Patch radds a description for FU - Accrued fine. Removes a stray space before the comma, using some TT magic. To test: - Test like the other patch, display in OPAC prog, OPAC bootstrap, Staff Pay fines tab and Staff Accounts tab should be the same. - No ' , ' should be seen. - FU fines should now display a description.
Wajasu, I am not sure about your patch, as there are some problems with, would you mind going step by step? We could also check then that the other codes are still in use and have test plans for each. I haven't moved your patch to another bug yet, but happy to do so if you want me to.
What is the status of this bug? It is just waiting for a signoff on attachment 27824 [details] [review]?
I had originally went to sign off after reading comment4. Then I took a shot at the fix. Comment6 was my attempt to fix it. I also saw afterward that accountlines was being worked on. The fix I did was an attempt to consistently display the descriptions that I could find through the system codebase at that time without resorting to trying to change user data. At least the obsolete patch documented my attempt to centralize a mapping of descriptions for the set of codes I researched. It was to lay a groundwork for future accountlines rewrite or such to know what would need to be handled in schema design. I can barely remember if a messy part was the storage of a code in the description field, which required a string scan. Well it looks like a newer effort is pending signoff.
Needs a rebase, and I am unclear on whether to apply just the last three patches, or all 5? I hit conflicts in both scenarios
Created attachment 47236 [details] [review] Bug 11573 - Make fine display more consistent for rentals To test: 1. Set up an item type with a rental charge 2. issue an item from that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. This change is proposed in order to get rid of some double ups in the title on the boraccount template. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Tested with rental lines created before and after applying the patch. After applying the patch it's better, but old lines will still look ok. There is still a double up on the title on the 'pay' tab, as we get the title from the itemnumber and also display the description. I think getting all the information from the itemnumber for display would be a bit nicer in the future. Butthis is an improvement. Passes tests and QA script.
Created attachment 47237 [details] [review] Bug 11573 - removing title double ups on boraccount.tt To test: 1. Create a bunch of fines (or view your existing fines data) - it should have lost entries, rentals, rental renewals, and regular fines and fine updates. 2. View the fines tab for your borrower with fines 3. without the patch, it will look like the submitted screenshot 4. with the patch, there will be few, if any, doubleups of title This patch may be incomplete - there may be cases that still need work. I'm happy to do followups. Rental fees and rental renewals will not look wholly consistent without the other attached patch, but this one does not require it. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Created attachment 47238 [details] [review] Bug 11573: Follow-up: Include changes in OPAC templates Patch adds changes from earlier patches to OPAC prog and bootstrap templates. Patch radds a description for FU - Accrued fine. Removes a stray space before the comma, using some TT magic. To test: - Test like the other patch, display in OPAC prog, OPAC bootstrap, Staff Pay fines tab and Staff Accounts tab should be the same. - No ' , ' should be seen. - FU fines should now display a description.
Created attachment 47239 [details] [review] Bug 11573 - Make fine display more consistent for rentals To test: 1. Set up an item type with a rental charge 2. issue an item from that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. This change is proposed in order to get rid of some double ups in the title on the boraccount template. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Tested with rental lines created before and after applying the patch. After applying the patch it's better, but old lines will still look ok. There is still a double up on the title on the 'pay' tab, as we get the title from the itemnumber and also display the description. I think getting all the information from the itemnumber for display would be a bit nicer in the future. Butthis is an improvement. Passes tests and QA script.
Created attachment 47240 [details] [review] Bug 11573 - removing title double ups on boraccount.tt To test: 1. Create a bunch of fines (or view your existing fines data) - it should have lost entries, rentals, rental renewals, and regular fines and fine updates. 2. View the fines tab for your borrower with fines 3. without the patch, it will look like the submitted screenshot 4. with the patch, there will be few, if any, doubleups of title This patch may be incomplete - there may be cases that still need work. I'm happy to do followups. Rental fees and rental renewals will not look wholly consistent without the other attached patch, but this one does not require it. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Created attachment 47241 [details] [review] Bug 11573: Follow-up: Include changes in OPAC templates Patch adds changes from earlier patches to OPAC prog and bootstrap templates. Patch radds a description for FU - Accrued fine. Removes a stray space before the comma, using some TT magic. To test: - Test like the other patch, display in OPAC prog, OPAC bootstrap, Staff Pay fines tab and Staff Accounts tab should be the same. - No ' , ' should be seen. - FU fines should now display a description.
Created attachment 47242 [details] [review] Bug 11573: Follow-up: Include changes in OPAC templates Patch adds changes from earlier patches to OPAC prog and bootstrap templates. Patch radds a description for FU - Accrued fine. Removes a stray space before the comma, using some TT magic. To test: - Test like the other patch, display in OPAC prog, OPAC bootstrap, Staff Pay fines tab and Staff Accounts tab should be the same. - No ' , ' should be seen. - FU fines should now display a description.
It now applies, and should be identical to before. Admittedly, the commit messages probably should be tweaked to reflect minor changes, but that would make comparing patches more difficult. :)
Created attachment 47288 [details] [review] [SIGNED-OFF] Bug 11573 - Make fine display more consistent for rentals To test: 1. Set up an item type with a rental charge 2. issue an item from that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. This change is proposed in order to get rid of some double ups in the title on the boraccount template. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Tested with rental lines created before and after applying the patch. After applying the patch it's better, but old lines will still look ok. There is still a double up on the title on the 'pay' tab, as we get the title from the itemnumber and also display the description. I think getting all the information from the itemnumber for display would be a bit nicer in the future. Butthis is an improvement. Passes tests and QA script.
Created attachment 47289 [details] [review] [SIGNED-OFF] Bug 11573 - Make fine display more consistent for rentals To test: 1. Set up an item type with a rental charge 2. issue an item from that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. This change is proposed in order to get rid of some double ups in the title on the boraccount template. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Tested with rental lines created before and after applying the patch. After applying the patch it's better, but old lines will still look ok. There is still a double up on the title on the 'pay' tab, as we get the title from the itemnumber and also display the description. I think getting all the information from the itemnumber for display would be a bit nicer in the future. Butthis is an improvement. Passes tests and QA script.
Created attachment 47290 [details] [review] [SIGNED-OFF] Bug 11573 - removing title double ups on boraccount.tt To test: 1. Create a bunch of fines (or view your existing fines data) - it should have lost entries, rentals, rental renewals, and regular fines and fine updates. 2. View the fines tab for your borrower with fines 3. without the patch, it will look like the submitted screenshot 4. with the patch, there will be few, if any, doubleups of title This patch may be incomplete - there may be cases that still need work. I'm happy to do followups. Rental fees and rental renewals will not look wholly consistent without the other attached patch, but this one does not require it. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Created attachment 47291 [details] [review] [SIGNED-OFF] Bug 11573: Follow-up: Include changes in OPAC templates Patch adds changes from earlier patches to OPAC prog and bootstrap templates. Patch radds a description for FU - Accrued fine. Removes a stray space before the comma, using some TT magic. To test: - Test like the other patch, display in OPAC prog, OPAC bootstrap, Staff Pay fines tab and Staff Accounts tab should be the same. - No ' , ' should be seen. - FU fines should now display a description. Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Comment on attachment 47289 [details] [review] [SIGNED-OFF] Bug 11573 - Make fine display more consistent for rentals Review of attachment 47289 [details] [review]: ----------------------------------------------------------------- I am not sure I have understood what is expected. I get: Without the patch: Rental, Rental (my_title_99) Rent 0 0 1.00 1.00 Rental, Renewal of Rental Item my_title_99 my_barcode_992 (my_title_99) Rent 0 0 1.00 1.00 With the patch: Rental, my_title_99 my_barcode_992 (my_title_99) Rent 0 0 1.00 1.00 Rental, Renewal of Rental Item my_title_99 my_barcode_992 (my_title_99) I still get the title displayed twice. ::: C4/Circulation.pm @@ +3189,4 @@ > my $dbh = C4::Context->dbh; > my $nextaccntno = getnextacctno( $borrowernumber ); > my $manager_id = 0; > + my $item = GetBiblioFromItemNumber($itemnumber); GetBiblioFromItemNumber returns a biblio, not an item.
*** This bug has been marked as a duplicate of bug 21953 ***
This one hasn't received any love for a while and there are new reports (and patches) in it's place.. I'm going to look at the more recent efforts and see fi those resolve it. Marking as duplicate.
Not sure if this is a duplicate to bug 21953 - Rental vs. Lost. It looks like Rental might still have issues: C4/Circulation.pm if ( $charge > 0 ) { my $description = "Rental"; AddIssuingCharge( $issue, $charge, $description ); } if ( $accumulate_charge > 0 ) { my $type_desc = "Renewal of Daily Rental Item " . $biblio->title . " $item_unblessed->{'barcode'}"; AddIssuingCharge( $issue, $accumulate_charge, $type_desc ) } And same without Daily.
Created attachment 88549 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. 7. Repeat steps 1-6 for an item type with a daily rental charge Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
OK, I've re-written this from scratch as a fair bit has changed under the hood since the last time it was submitted. Still to do: 1) DB update to update old accountlines to reflect the new accounttypes 2) Update any tests to reflect the description output Submitting just this patch to get some initial feedback
Created attachment 88600 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines - the rental charge does not show the title of the issued item 4. Renew that item, the renewal charge does show the title of the issued item 5. Apply the patch 6. Repeat steps 1-4, both should show the title of the issued item in the description. 7. Repeat steps 1-6 for an item type with a daily rental charge Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88601 [details] [review] Bug 11573: Update existing accountlines for 'Rent' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88602 [details] [review] Bug 11573: Update of unit tests This patch updates the unit tests to reflect the changes to the core routines. The relevant changes are the removal of a hard coded 'description' and the splitting up of the 'Rent' accounttype into 'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
All ready to go now :)
Created attachment 88603 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines, a charge of type 'Rent' will be visible with a description of 'Rental'. 4. Renew the item 5. Check fines, a charge of type 'Rent' will be visible with a description of 'Renewal of Rental Item TITLE BARCODE' where TITLE and BARCODE are the items title and barcode. 5. Apply the patch 6. Repeat steps 1-4, charge descriptions should now be empty and charge types should display 'Rental fee' and 'Renewal of rental item'. 7. Repeat steps 1-6 for an item type with a daily rental charge and note the charge types are now 'Daily rental fee' and 'Renewal of daily rental item' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88604 [details] [review] Bug 11573: Update existing accountlines for 'Rent' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88605 [details] [review] Bug 11573: Update of unit tests This patch updates the unit tests to reflect the changes to the core routines. The relevant changes are the removal of a hard coded 'description' and the splitting up of the 'Rent' accounttype into 'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88606 [details] [review] Bug 11573: (follow-up) Correction to accountype search on opac-user.pl With the update of accountype from 'Rent' to four distinct accountypes we need to update the search here to catch all four types of charge. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88726 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines, a charge of type 'Rent' will be visible with a description of 'Rental'. 4. Renew the item 5. Check fines, a charge of type 'Rent' will be visible with a description of 'Renewal of Rental Item TITLE BARCODE' where TITLE and BARCODE are the items title and barcode. 5. Apply the patch 6. Repeat steps 1-4, charge descriptions should now be empty and charge types should display 'Rental fee' and 'Renewal of rental item'. 7. Repeat steps 1-6 for an item type with a daily rental charge and note the charge types are now 'Daily rental fee' and 'Renewal of daily rental item' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88727 [details] [review] Bug 11573: Update existing accountlines for 'Rent' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88728 [details] [review] Bug 11573: Update of unit tests This patch updates the unit tests to reflect the changes to the core routines. The relevant changes are the removal of a hard coded 'description' and the splitting up of the 'Rent' accounttype into 'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 88729 [details] [review] Bug 11573: (follow-up) Correction to accountype search on opac-user.pl With the update of accountype from 'Rent' to four distinct accountypes we need to update the search here to catch all four types of charge. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Hi Martin, I was testing these patches and followed the test plan. Everything went as expected, except for step 6. 6. Repeat steps 1-4, charge descriptions should now be empty and charge types should display 'Rental fee' and 'Renewal of rental item'. The Description column in the table is not empty, but instead contains the title in brackets: (TITLE). Is this the expected behaviour? If so, I will sign it off
Created attachment 90231 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines, a charge of type 'Rent' will be visible with a description of 'Rental'. 4. Renew the item 5. Check fines, a charge of type 'Rent' will be visible with a description of 'Renewal of Rental Item TITLE BARCODE' where TITLE and BARCODE are the items title and barcode. 5. Apply the patch 6. Repeat steps 1-4, charge descriptions should now be empty and charge types should display 'Rental fee' and 'Renewal of rental item'. 7. Repeat steps 1-6 for an item type with a daily rental charge and note the charge types are now 'Daily rental fee' and 'Renewal of daily rental item' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 90232 [details] [review] Bug 11573: Update existing accountlines for 'Rent' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 90233 [details] [review] Bug 11573: Update of unit tests This patch updates the unit tests to reflect the changes to the core routines. The relevant changes are the removal of a hard coded 'description' and the splitting up of the 'Rent' accounttype into 'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 90234 [details] [review] Bug 11573: (follow-up) Correction to accountype search on opac-user.pl With the update of accountype from 'Rent' to four distinct accountypes we need to update the search here to catch all four types of charge. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 90246 [details] [review] Update release notes for the 19.05.00 release Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Hi Arthur, I think something went wrong here - the last file should not be attached here. Let me know if I can help
Created attachment 90256 [details] [review] Update release notes for the 19.05.00 release Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 90313 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines, a charge of type 'Rent' will be visible with a description of 'Rental'. 4. Renew the item 5. Check fines, a charge of type 'Rent' will be visible with a description of 'Renewal of Rental Item TITLE BARCODE' where TITLE and BARCODE are the items title and barcode. 5. Apply the patch 6. Repeat steps 1-4, charge descriptions should now be empty and charge types should display 'Rental fee' and 'Renewal of rental item'. 7. Repeat steps 1-6 for an item type with a daily rental charge and note the charge types are now 'Daily rental fee' and 'Renewal of daily rental item' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 90314 [details] [review] Bug 11573: Update existing accountlines for 'Rent' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 90315 [details] [review] Bug 11573: Update of unit tests This patch updates the unit tests to reflect the changes to the core routines. The relevant changes are the removal of a hard coded 'description' and the splitting up of the 'Rent' accounttype into 'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 90316 [details] [review] Bug 11573: (follow-up) Correction to accountype search on opac-user.pl With the update of accountype from 'Rent' to four distinct accountypes we need to update the search here to catch all four types of charge. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 91529 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines, a charge of type 'Rent' will be visible with a description of 'Rental'. 4. Renew the item 5. Check fines, a charge of type 'Rent' will be visible with a description of 'Renewal of Rental Item TITLE BARCODE' where TITLE and BARCODE are the items title and barcode. 5. Apply the patch 6. Repeat steps 1-4, charge descriptions should now be empty and charge types should display 'Rental fee' and 'Renewal of rental item'. 7. Repeat steps 1-6 for an item type with a daily rental charge and note the charge types are now 'Daily rental fee' and 'Renewal of daily rental item' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 91530 [details] [review] Bug 11573: Update existing accountlines for 'Rent' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 91531 [details] [review] Bug 11573: Update of unit tests This patch updates the unit tests to reflect the changes to the core routines. The relevant changes are the removal of a hard coded 'description' and the splitting up of the 'Rent' accounttype into 'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 91532 [details] [review] Bug 11573: (follow-up) Correction to accountype search on opac-user.pl With the update of accountype from 'Rent' to four distinct accountypes we need to update the search here to catch all four types of charge. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Freshly rebased and ready for QA
Created attachment 91800 [details] [review] Bug 11573: (follow-up) Handle daily rental in db update
Created attachment 91801 [details] [review] Bug 11573: Make rental accountlines translatable To test: 1. Set up an item type with a rental charge 2. Issue an item with that item type 3. Check fines, a charge of type 'Rent' will be visible with a description of 'Rental'. 4. Renew the item 5. Check fines, a charge of type 'Rent' will be visible with a description of 'Renewal of Rental Item TITLE BARCODE' where TITLE and BARCODE are the items title and barcode. 5. Apply the patch 6. Repeat steps 1-4, charge descriptions should now be empty and charge types should display 'Rental fee' and 'Renewal of rental item'. 7. Repeat steps 1-6 for an item type with a daily rental charge and note the charge types are now 'Daily rental fee' and 'Renewal of daily rental item' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 91802 [details] [review] Bug 11573: Update existing accountlines for 'Rent' Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 91803 [details] [review] Bug 11573: Update of unit tests This patch updates the unit tests to reflect the changes to the core routines. The relevant changes are the removal of a hard coded 'description' and the splitting up of the 'Rent' accounttype into 'RENT', 'RENT_RENEW', 'RENT_DAILY' and 'RENT_DAILY_RENEW'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 91804 [details] [review] Bug 11573: (follow-up) Correction to accountype search on opac-user.pl With the update of accountype from 'Rent' to four distinct accountypes we need to update the search here to catch all four types of charge. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 91805 [details] [review] Bug 11573: (follow-up) Handle daily rental in db update Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Created attachment 91806 [details] [review] Bug 11573: (QA follow-up) Correct spelling typo Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Nice work! Pushed to master for 19.11.00
Depends on Bug 19919 not in 19.05.x