https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|24381 |26689 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24381 [Bug 24381] ACCOUNT_CREDIT and ACCOUNT_DEBIT slip not printing information about paid fines/fees https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26689 [Bug 26689] Monetary accounts notices should be definable at the credit_type/debit_type level -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #1 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- I mispoke, they already use TT, but they do not follow the usual variable names and they use getletter directly when they should really use GetPreparedLetter to ensure they consistently get the same variables as other TT notices. (Like [% today %]) -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #3 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 111977 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=111977&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #111976|0 |1 is obsolete| | --- Comment #5 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 112023 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=112023&action=edit Bug 26734: Ratify account slip printing This patch simplifies the members/print*.pl controller scripts to only pass around the minimum required data for the templates. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #111978|0 |1 is obsolete| | --- Comment #7 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 112025 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=112025&action=edit Bug 26734: Update sample notices to use standardised syntax -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@bugs.koha-c | |ommunity.org, | |katrin.fischer@bsz-bw.de, | |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #9 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- This still applies.. be nice to get it off my list. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #11 from Kyle M Hall <kyle@bywatersolutions.com> --- I'm getting: ERROR PROCESSING TEMPLATE: file error - account_type_description: not found at /kohadevbox/koha/members/printfeercpt.pl line 58. at /usr/share/perl/5.24/Carp.pm line 167 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |27602 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27602 [Bug 27602] It would be helpful to have some form of tracking for when a notice is changed -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #13 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116257 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116257&action=edit Bug 26734: (follow-up) Replace db update with backup and default The inline update of variable for the notice template was proving troublesome.. this patch replaces it was a backup of the existing notice followed by replacing the notice with the default. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #112024|0 |1 is obsolete| | --- Comment #15 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116260 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116260&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #112026|0 |1 is obsolete| | --- Comment #17 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116262 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116262&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|27602 | Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27602 [Bug 27602] It would be helpful to have some form of tracking for when a notice is changed -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #20 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Final patch changes the database update to be more reliable.. instead of attempting to update modified notices inline, we now take a backup copy to the action_logs and then replace the entire notice with the default. This should resolve Kyles issue. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116259|0 |1 is obsolete| | Attachment #116260|0 |1 is obsolete| | Attachment #116261|0 |1 is obsolete| | Attachment #116262|0 |1 is obsolete| | Attachment #116263|0 |1 is obsolete| | --- Comment #21 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 116272 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116272&action=edit Bug 26734: Ratify account slip printing This patch simplifies the members/print*.pl controller scripts to only pass around the minimum required data for the templates. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #23 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 116276 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116276&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #25 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 116278 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116278&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Joonas Kylmälä <joonas.kylmala@helsinki.fi> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |joonas.kylmala@helsinki.fi --- Comment #27 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- Martin, could you please provide a test plan / what things are most likely to break and should be tested carefully. This is quite big refactoring so I feel like things are gonna break. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116276|0 |1 is obsolete| | --- Comment #31 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116645 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116645&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. Test plan 1/ Update the ACCOUNT_CREDIT and ACCOUNT_DEBIT notices to use 'accounts.inc' include for account descriptions 1a/ Add `[% PROCESS 'accounts.inc' %]` to the top of the notice 1b/ Replace manual account descriptions with `[% PROCESS account_type_description account=credit %]` 2/ Print one of each slip and check that descriptions are properly substituted 3/ Clone the notice to another language 4/ Print the in the other language and note the translated descriptions are properly substituted. 5/ Signoff -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116278|0 |1 is obsolete| | --- Comment #33 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116647 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116647&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |14233 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14233 [Bug 14233] Add logging support to notices and slips management -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116645|0 |1 is obsolete| | --- Comment #36 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116656 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116656&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. Test plan 1/ Update the ACCOUNT_CREDIT and ACCOUNT_DEBIT notices to use 'accounts.inc' include for account descriptions 1a/ Add `[% PROCESS 'accounts.inc' %]` to the top of the notice 1b/ Replace manual account descriptions with `[% PROCESS account_type_description account=credit %]` 2/ Print one of each slip and check that descriptions are properly substituted 3/ Clone the notice to another language 4/ Print the in the other language and note the translated descriptions are properly substituted. 5/ Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116647|0 |1 is obsolete| | --- Comment #38 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116658 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116658&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #40 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Restore the signoff lines I inadvertently wiped out whilst adding a proper test plan to each patch. I've also slightly updated the final patch to accommodate the changes made by adding bug 14233 as a dependency. You should now be able to filter to the right logs actions for notices more easily. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116656|0 |1 is obsolete| | --- Comment #42 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116664 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116664&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. Test plan 1/ Update the ACCOUNT_CREDIT and ACCOUNT_DEBIT notices to use 'accounts.inc' include for account descriptions 1a/ Add `[% PROCESS 'accounts.inc' %]` to the top of the notice 1b/ Replace manual account descriptions with `[% PROCESS account_type_description account=credit %]` 2/ Print one of each slip and check that descriptions are properly substituted 3/ Clone the notice to another language 4/ Print the in the other language and note the translated descriptions are properly substituted. 5/ Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116658|0 |1 is obsolete| | --- Comment #44 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 116666 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=116666&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #46 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- (In reply to Joonas Kylmälä from comment #27)

Martin, could you please provide a test plan / what things are most likely to break and should be tested carefully. This is quite big refactoring so I feel like things are gonna break.

Test plans added to patches as discussed... I've also now made it dependant upon bug 14233 which adds a nicer way to filter the action logs for Notices as well as implementing the 'diff' view. Would love some feedback on that one.. I imagine at the very least people will want it put behind a system preference on top of what I've already implimented. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116664|0 |1 is obsolete| | --- Comment #48 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 117262 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=117262&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. Test plan 1/ Update the ACCOUNT_CREDIT and ACCOUNT_DEBIT notices to use 'accounts.inc' include for account descriptions 1a/ Add `[% PROCESS 'accounts.inc' %]` to the top of the notice 1b/ Replace manual account descriptions with `[% PROCESS account_type_description account=credit %]` 2/ Print one of each slip and check that descriptions are properly substituted 3/ Clone the notice to another language 4/ Print the in the other language and note the translated descriptions are properly substituted. 5/ Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #116666|0 |1 is obsolete| | --- Comment #50 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 117264 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=117264&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=27660 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #53 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Jonathan Druart from comment #52)

Marcel, can you QA this one please?

Will have a look probably tomorrow -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #55 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- No license in pos/pay.pl Unusual copyright in registers.pl # c 2020 PTFS-Europe Ltd The abbreviation pos in unintuitive. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #57 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- (In reply to Marcel de Rooy from comment #56)

+ tendered => scalar $input->param('tendered'), + change => scalar $input->param('change') Please clarify these two parameters?

(In reply to Jonathan Druart from comment #10)

...

1. 69 tendered => scalar $input->param('tendered'),

Looks like this var is not used in the notice template.

This is used in the subsequent bug that enhances the printed slip to include >'change' and 'tendered' amounts (These are both in our local slips for customers)

-- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #117262|0 |1 is obsolete| | --- Comment #59 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 118192 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118192&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. Test plan 1/ Update the ACCOUNT_CREDIT and ACCOUNT_DEBIT notices to use 'accounts.inc' include for account descriptions 1a/ Add `[% PROCESS 'accounts.inc' %]` to the top of the notice 1b/ Replace manual account descriptions with `[% PROCESS account_type_description account=credit %]` 2/ Print one of each slip and check that descriptions are properly substituted 3/ Clone the notice to another language 4/ Print the in the other language and note the translated descriptions are properly substituted. 5/ Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #117264|0 |1 is obsolete| | --- Comment #61 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 118194 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118194&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #63 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 118196 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118196&action=edit Bug 26734: (QA follow-up) Add missing copyright statement -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #65 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Add a couple of followups as requested.. one adds the missing copyright statement.. not sure how that was missed prior to now.. oops. I wasn't sure what you meant by 'Unusual copyright in registers.pl'.. doesn't it follow the usual form? Second followup adds tests for the addition of include file handling in template toolkit based notices. (This gives us nice descriptions for account line types along with supporting translations of those descriptions is the usual way used in templates elsewhere in Koha). Thanks for testing Marcel :) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #67 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 118200 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118200&action=edit Bug 26734: (QA follow-up) Add 'tendered' and 'change' to notice We include 'tendered' and 'change' parameters in the call to GetPreparedLetter for the fee receipt slip.. we may as well include them in the sample notice ;) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |BLOCKED --- Comment #69 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- QAing -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118191|0 |1 is obsolete| | --- Comment #70 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 118482 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118482&action=edit Bug 26734: Ratify account slip printing This patch simplifies the members/print*.pl controller scripts to only pass around the minimum required data for the templates. Test plan Slips should continue to print as they did prior to the patch 1/ Add a manual invoice and manual debit to a patrons account 2/ Print a slip for the manual invoice, compare to a printed slip prior to the patch. 3/ Print a slip for the manual debit, compare to a printed slip prior to the patch. 4/ Signoff. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118193|0 |1 is obsolete| | --- Comment #72 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 118484 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118484&action=edit Bug 26734: Update sample notices to use standardised syntax This patch updates the default notices shiped with Koha to use the new syntax. Test plan 1/ Install Koha afresh 2/ Check the notices print as expected 3/ Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118195|0 |1 is obsolete| | --- Comment #74 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 118486 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118486&action=edit Bug 26734: (follow-up) Replace db update with backup and default The inline update of variable for the notice template was proving troublesome.. this patch replaces it was a backup of the existing notice followed by replacing the notice with the default. Test plan 1/ Run the database update 2/ Check that the templates have been replaced by the defaults (for all languages enabled) 3/ Check that a backup of the original notices was made by naviagating to view the action log (/tools/viewlog.pl) and selecting 'all modules' + 'all actions' Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118197|0 |1 is obsolete| | --- Comment #76 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 118488 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=118488&action=edit Bug 26734: (QA follow-up) Unit tests for C4::Letters This patch adds unit tests for the addition of 'include handling' to the C4::Letters template toolkit functionality. Test plan 1/ Run t/db_dependant/Letters/TemplateToolkit.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #78 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- 1. We are not adjusting the installer translated files 2. We are not adjusting notice templates for existing installations How bad is that? -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |ASSIGNED --- Comment #79 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Redoing bug 14233, I dropped: koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt:[% CASE 'UPGRADE' %]Upgrade It didn't belong there. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the| |This enhancement updates release notes| |the existing slip printing | |code to utilise the | |internal GetPreparedLetter | |function as our other | |notices do. | | | |This leads to | |code clarity improvements | |and consistency and is part | |of the path to migrating | |all notices to use template | |toolkit consistently as | |well as exposing more | |variables to the template | |system for notices. | | | |NOTE: | |We replace any existing | |notices for the monetary | |slips with a modern | |equivalent using template | |toolkit. Any customised | |templates will be recorded | |in the action logs and | |should be used as | |inspiration for updating | |the new slips to include | |your libraries | |customisations. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118483|0 |1 is obsolete| | --- Comment #82 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 119351 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=119351&action=edit Bug 26734: Convert printfeercpt/printinvoice to use GetPreparedLetter This patch updates C4::Letters to allow use of existing koha template includes from notices, then updates the printfeercpt and printinvoice slip print option to use GetPreparedLetter rather than calling getletter directly. As part of this work, we also add credits and debits handling to the _parseletter_sth and _get_tt_params routines in C4::Letters to allow for recognisable variable names in the notice template. Test plan 1/ Update the ACCOUNT_CREDIT and ACCOUNT_DEBIT notices to use 'accounts.inc' include for account descriptions 1a/ Add `[% PROCESS 'accounts.inc' %]` to the top of the notice 1b/ Replace manual account descriptions with `[% PROCESS account_type_description account=credit %]` 2/ Print one of each slip and check that descriptions are properly substituted 3/ Clone the notice to another language 4/ Print the in the other language and note the translated descriptions are properly substituted. 5/ Signoff Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118485|0 |1 is obsolete| | --- Comment #84 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 119353 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=119353&action=edit Bug 26734: Update existing notices to new syntax This patch adds a database update to replace existing notice variable used in ACCOUNT_CREDIT and ACCOUNT_DEBIT notices with the modern equivilents. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118487|0 |1 is obsolete| | --- Comment #86 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 119355 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=119355&action=edit Bug 26734: (QA follow-up) Add missing copyright statement Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #118489|0 |1 is obsolete| | --- Comment #88 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 119357 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=119357&action=edit Bug 26734: (QA follow-up) Add 'tendered' and 'change' to notice We include 'tendered' and 'change' parameters in the call to GetPreparedLetter for the fee receipt slip.. we may as well include them in the sample notice ;) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #91 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- (In reply to Jonathan Druart from comment #90)

I need more QA opinions about the upgrade step here.

You mean the breakage of the letter templates? Only other solution I see here is two maintain both template syntaxes in parallel for few releases and deprecate the old one. It sounds tricky solution as well. For our use case breaking this feature after the upgrade until librarian has fixed the situation is OK because the upgrade could be done at a time when the library is still closed and a superlibrarian can go update the credit/debit receipt templates before it is opened. This breakage needs to be widely communicated though so that people can prepare the new templates ahead of time and it won't be a surprise. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|release-notes-needed | -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #92 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Pushed to master for 21.05, thanks to everybody involved! -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to master |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #94 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- (In reply to Jonathan Druart from comment #92)

Pushed to master for 21.05, thanks to everybody involved!

Sorry, wrong manip from my side. Only the first patch has been pushed and I didn't mean it (forgot to remove one line from a rebase -i apparently). Will revert in a bit. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #96 from Joonas Kylmälä <joonas.kylmala@helsinki.fi> --- (In reply to Jonathan Druart from comment #95)

Maybe we should 1. Add a warning during the update DB and 2. provide the necessary changes for the translated notices (even if some may be deleted when 21.05 is released).

I think adding warning is a good idea, I always look those logs when doing updates for anything unexpected and things that need manual intervention. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #98 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 120077 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=120077&action=edit Bug 26734: Add notices for translations This patch updates the translated sample_notices.sql files for each of the remaining translations. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #99 from Katrin Fischer <katrin.fischer@bsz-bw.de> ---

So, to clarify, I am still not sure we should push this patchset as it.

Maybe we should 1. Add a warning during the update DB and 2. provide the necessary changes for the translated notices (even if some may be deleted when 21.05 is released).

Better late than... I'd also add my voice that making these slips more flexible is a good thing. Breaking changes are always a hard choice. I think they need really good advertising, but sometimes cannot be avoided in a good way. Release notes notes should be updated I think to have more of a warning sign. And it would be great to have some documentation for the new templates/changes to look out for. I think these are the wiki pages, that could be good to add to: https://wiki.koha-community.org/wiki/Notices_with_Template_Toolkit (especially last section) And here: https://wiki.koha-community.org/wiki/Notices_and_Slips_Library#Notices_and_s... -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords|additional_work_needed | --- Comment #102 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- (In reply to Jonathan Druart from comment #100)

(In reply to Katrin Fischer from comment #99)

...

And it would be great to have some documentation for the new templates/changes to look out for. I think these are the wiki pages, that could be good to add to:

https://wiki.koha-community.org/wiki/Notices_with_Template_Toolkit (especially last section)

And here: https://wiki.koha-community.org/wiki/ Notices_and_Slips_Library#Notices_and_slips_using_template_toolkit

Martin, can you deal with that please? Adding the "additional_work_needed", remove it when done.

All done :) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |28374 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=28374 [Bug 28374] Convert pos/printreceipt.pl to use GetPreparedLetter -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Text to go in the|This enhancement updates |This enhancement updates release notes|the existing slip printing |the existing slip printing |code to utilise the |code to utilise the |internal GetPreparedLetter |internal GetPreparedLetter |function as our other |function as our other |notices do. |notices do. | | |This leads to |This leads to |code clarity improvements |code clarity improvements |and consistency and is part |and consistency and is part |of the path to migrating |of the path to migrating |all notices to use template |all notices to use template |toolkit consistently as |toolkit consistently as |well as exposing more |well as exposing more |variables to the template |variables to the template |system for notices. |system for notices. | | |*WARNING*: We replace any |*WARNING*: We replace any |existing notices for the |existing notices for the |monetary slips with a |monetary slips with a |modern equivalent using |modern equivalent using |template toolkit. Any |template toolkit. Any |customised templates will |customised templates will |be recorded in the action |be recorded in the action |logs and should be used as |logs and should be used as |inspiration for updating |inspiration for updating |the new slips to include |the new slips to include |your libraries |your libraries |customizations. |customizations. Letter | |codes: ACCOUNT_CREDIT, | |ACCOUNT_DEBIT -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #105 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 121449 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=121449&action=edit Bug 26734: [ALT] Renamed activethemes with availablethemes There was an existing call to $self->activethemes that behave as setter: 85 $self->activethemes($activethemes); I am not sure what are the side-effects but it does not look good. It caused warning in the logs: Use of uninitialized value $interface in string eq at /kohadevbox/koha/C4/Templates.pm line 279. Use of uninitialized value $interface in string eq at /kohadevbox/koha/C4/Templates.pm line 280. Use of uninitialized value $interface in string eq at /kohadevbox/koha/C4/Templates.pm line 282. Use of uninitialized value $lang in concatenation (.) or string at /kohadevbox/koha/C4/Templates.pm line 296. Use of uninitialized value $lang in concatenation (.) or string at /kohadevbox/koha/C4/Templates.pm line 296. Use of uninitialized value $lang in concatenation (.) or string at /kohadevbox/koha/C4/Templates.pm line 296 Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 --- Comment #106 from Jonathan Druart <jonathan.druart+koha@gmail.com> --- Follow-up pushed to master. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |https://bugs.koha-community | |.org/bugzilla3/show_bug.cgi | |?id=28712 -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26734 Bug 26734 depends on bug 14233, which changed state. Bug 14233 Summary: Add logging support to notices and slips management https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14233 What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to master |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.