http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|koha-bugs@lists.koha-commun |fridolin.somers@biblibre.co |ity.org |m -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 --- Comment #2 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 41396 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41396&action=edit Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #41396|0 |1 is obsolete| | --- Comment #3 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Created attachment 41397 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41397&action=edit Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 --- Comment #4 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Thanks a lot Jonathan, you where faster than me for patching ;) I of course signoff.

Note that this patch impacts the CSV export, which does not work, so it cannot be tested. I have a correction I will set in another bug.

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Needs Signoff --- Comment #6 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Small followup needs signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Mirko Tietgen <mirko@abunchofthings.net> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mirko@abunchofthings.net --- Comment #7 from Mirko Tietgen <mirko@abunchofthings.net> --- (In reply to Fridolin SOMERS from comment #5)

=> You see in URL that budget_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=

=> you see in URL that budget_id is defined like in planning page :

/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2

Do you mean »budget_period_id is empty/defined« (not budget_id) in both cases? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #41398|0 |1 is obsolete| | --- Comment #9 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Created attachment 41703 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41703&action=edit Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #41397|0 |1 is obsolete| | --- Comment #10 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 42268 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42268&action=edit Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #41703|0 |1 is obsolete| | --- Comment #11 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 42269 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42269&action=edit Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 --- Comment #12 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 42367 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42367&action=edit [PASSED QA] Bug 14649: Followup - correct budget_period_id in fund name link Now that fund name is displayed in the table as a link, you see that arg budget_period_id is never defined in this link. This is because the template var is [% budget_line.budget_period_id %] instead of [% budget_period_id %]. This looks like a mistake when converting from tmpl to tt. Test plan : - Without patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => You see in URL that budget_period_id is empty : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id= - Apply patch - Look for a planning with funds : /cgi-bin/koha/admin/aqplan.pl?budget_period_id=2&authcat=MONTHS - Click on a fund name => you see in URL that budget_period_id is defined like in planning page : /cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=6&budget_period_id=2 Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #42268|0 |1 is obsolete| | Attachment #42269|0 |1 is obsolete| | Attachment #42367|0 |1 is obsolete| | --- Comment #13 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 42368 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42368&action=edit [PASSED QA] Bug 14649: Fix regression - display fund name on budget planning A patch from bug 11714 removes 'budget_name_indent', which was useless. The script and the template should use the budget_name value. Note that this patch impacts the CSV export, which does not work, so it cannot be tested. Test plan: Edit a fund and click on one of the Planning value (by months, etc.) The "Fund name" column should be correctly populated with the fund names. Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14649 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com Status|Passed QA |Pushed to Master --- Comment #15 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patches pushed to master. Good catch Jonathan and Frido! -- You are receiving this mail because: You are watching all bug changes.