[Bug 12772] New: Overdue Notice/Status triggers tool
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Bug ID: 12772 Summary: Overdue Notice/Status triggers tool Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Notices Assignee: koha-bugs@lists.koha-community.org Reporter: francois.charbonnier@inlibro.com QA Contact: testopia@bugs.koha-community.org Sponsored by Halland County Library RFC (with mockup) : http://wiki.koha-community.org/wiki/Overdue_Notice_Enhancement#Overdue_Notic... Description : The ergonomy of the notice triggers tool will be enhanced with two new parameters : the item type et the on-hold status. We will re-use the ergonomy and the logic of the circulation rules model. The rules will apply from the more specific to the less specific. One will be able to set up a notice trigger for a specific patron catagory and a specific item type. A default value for the item types and the patron categories will be available to generalize the rules. For a specific notice level, we will prevent the user to set up different delay for the same combination of options. For each rule created, the new "on-hold" option will specify that the rule applies for the « on hold » items only. These new features will allow for example : to set up different rules for free of charge items or items with rental fee (since we can set up rules per item types). to set up different rules for available item or "on hold" item. -- 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=12772 Francois Charbonnier <francois.charbonnier@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |eric.begin@inLibro.com, | |philippe.blouin@inlibro.com Change sponsored?|--- |Sponsored Assignee|koha-bugs@lists.koha-commun |simith.doliveira@inlibro.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=12772 Francois Charbonnier <francois.charbonnier@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Viktor Sarge <viktor.sarge@regionhalland.se> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |viktor.sarge@regionhalland. | |se -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #1 from Francois Charbonnier <francois.charbonnier@inlibro.com> --- This patch will include the work on Bug 12771. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Maxime Beaulieu <maxime.beaulieu@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |maxime.beaulieu@inlibro.com Assignee|simith.doliveira@inlibro.co |maxime.beaulieu@inlibro.com |m | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Blou <philippe.blouin@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- See Also| |http://bugs.koha-community. | |org/bugzilla3/show_bug.cgi? | |id=9296 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #2 from Maxime Beaulieu <maxime.beaulieu@inlibro.com> --- Created attachment 41477 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41477&action=edit Bug 12772 - Update Database (Based on Bug13624) This patch applies to Bug13624. Removes letter number from overduerules and overdurules_transport_types modified: installer/data/mysql/atomicupdate/update_13624_overduerules_transport_type.pl modified: installer/data/mysql/kohastructure.sql -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #3 from Maxime Beaulieu <maxime.beaulieu@inlibro.com> --- Created attachment 41478 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41478&action=edit Bug 12772 - Overdue rules tool and backend library modified: C4/Overdues.pm modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt modified: tools/overduerules.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #4 from Maxime Beaulieu <maxime.beaulieu@inlibro.com> --- Created attachment 41479 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41479&action=edit Bug 12772 - Reworked overdue_notices.pl script modified: misc/cronjobs/overdue_notices.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #5 from Maxime Beaulieu <maxime.beaulieu@inlibro.com> --- Created attachment 41480 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41480&action=edit Bug 12772 - Renames atomic update file, .pl -> .perl renamed: update_13624_overduerules_transport_type.pl -> update_13624_overduerules_transport_type.perl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Maxime Beaulieu <maxime.beaulieu@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |13624 Status|ASSIGNED |Needs Signoff --- Comment #6 from Maxime Beaulieu <maxime.beaulieu@inlibro.com> --- Test plan Apply patches (Bugs 13624 and 12772) Run updatedatabase.pl Add rules in Tools > Overdue notice/status triggers Change checked out items due date to match the rules defined above Run the overdue_notices.pl script (in /misc/cronjobs) You should receive emails corresponding to your overdue rules Referenced Bugs: http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13624 [Bug 13624] Remove columns branchcode, categorytype from table overduerules_transport_types -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #7 from Francois Charbonnier <francois.charbonnier@inlibro.com> --- Since we had to rewrite part of the overdue_notices.pl script, I put together all the information you'll need to understand what changes with this new script here : http://wiki.koha-community.org/wiki/Overdue_Notice_Enhancement#Complete_Over... Also, I put all the test cases I used here : http://wiki.koha-community.org/wiki/Overdue_Notice_Enhancement#Complete_Over... -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #8 from Francois Charbonnier <francois.charbonnier@inlibro.com> --- The first link is wrong. The changings in the script is here : http://wiki.koha-community.org/wiki/Overdue_Notice_Enhancement#Changings_in_... -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #9 from Martin Persson <xarragon@gmail.com> --- Created attachment 41855 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=41855&action=edit Bug 12772 - Fix warnings This commit fixes a bunch of warnings for verbose messages which would clutter up the output. They should not affect normal excution. Sponsored-By: Halland County Library -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Martin Persson <xarragon@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xarragon@gmail.com --- Comment #10 from Martin Persson <xarragon@gmail.com> --- I have done basic testing with this and it seems to work for simple cases at least. I plan to work throught the test plan before I sign off on it. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #11 from Martin Stenberg <martin@bugs.koha-community.org.xinxidi.net> --- Created attachment 42126 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=42126&action=edit Bug 12772 - Fix rule updates Overduerules ID was not sent correctly when editing rules, resulting in rule being cleared instead of updated. This patch fixes this issue, and a couple of uninitilized values as a bonus. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Zeno Tajoli <z.tajoli@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Medium patch CC| |z.tajoli@cineca.it -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Zeno Tajoli <z.tajoli@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- CC|z.tajoli@cineca.it | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Andreas Hedström Mace <andreas.hedstrom.mace@sub.su.se> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |andreas.hedstrom.mace@sub.s | |u.se -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Marjorie Barry-Vila <marjorie.barry-vila@ccsr.qc.ca> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |marjorie.barry-vila@ccsr.qc | |.ca -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #41477|0 |1 is obsolete| | Attachment #41478|0 |1 is obsolete| | Attachment #41479|0 |1 is obsolete| | Attachment #41480|0 |1 is obsolete| | Attachment #41855|0 |1 is obsolete| | Attachment #42126|0 |1 is obsolete| | --- Comment #12 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45184 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45184&action=edit Bug 12772: tmp commit rename db updatefile back to .pl for 12772 The file needs to be renamed so that the next patch can go through. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #13 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45185 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45185&action=edit Bug 12772 - Update Database (Based on Bug13624) This patch applies to Bug13624. Removes letter number from overduerules and overdurules_transport_types modified: installer/data/mysql/atomicupdate/update_13624_overduerules_transport_type.pl modified: installer/data/mysql/kohastructure.sql -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #14 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45186 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45186&action=edit Bug 12772 - Overdue rules tool and backend library modified: C4/Overdues.pm modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt modified: tools/overduerules.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #15 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45187 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45187&action=edit Bug 12772 - Reworked overdue_notices.pl script modified: misc/cronjobs/overdue_notices.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #16 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45188 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45188&action=edit Bug 12772 - Renames atomic update file, .pl -> .perl renamed: update_13624_overduerules_transport_type.pl -> update_13624_overduerules_transport_type.perl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #17 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45189 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45189&action=edit Bug 12772 - Fix warnings This commit fixes a bunch of warnings for verbose messages which would clutter up the output. They should not affect normal excution. Sponsored-By: Halland County Library -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #18 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45190 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45190&action=edit Bug 12772 - Fix rule updates Overduerules ID was not sent correctly when editing rules, resulting in rule being cleared instead of updated. This patch fixes this issue, and a couple of uninitilized values as a bonus. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45184|0 |1 is obsolete| | Attachment #45185|0 |1 is obsolete| | --- Comment #19 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45191 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45191&action=edit Bug 12772 - Update Database (Based on Bug13624) This patch applies to Bug13624. Removes letter number from overduerules and overdurules_transport_types modified: installer/data/mysql/atomicupdate/update_13624_overduerules_transport_type.pl modified: installer/data/mysql/kohastructure.sql -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45186|0 |1 is obsolete| | --- Comment #20 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45192 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45192&action=edit Bug 12772 - Overdue rules tool and backend library modified: C4/Overdues.pm modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt modified: tools/overduerules.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45187|0 |1 is obsolete| | --- Comment #21 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45193 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45193&action=edit Bug 12772 - Reworked overdue_notices.pl script modified: misc/cronjobs/overdue_notices.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45188|0 |1 is obsolete| | --- Comment #22 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45194 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45194&action=edit Bug 12772 - Renames atomic update file, .pl -> .perl renamed: update_13624_overduerules_transport_type.pl -> update_13624_overduerules_transport_type.perl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45189|0 |1 is obsolete| | --- Comment #23 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45195 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45195&action=edit Bug 12772 - Fix warnings This commit fixes a bunch of warnings for verbose messages which would clutter up the output. They should not affect normal excution. Sponsored-By: Halland County Library -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45190|0 |1 is obsolete| | --- Comment #24 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45196 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45196&action=edit Bug 12772 - Fix rule updates Overduerules ID was not sent correctly when editing rules, resulting in rule being cleared instead of updated. This patch fixes this issue, and a couple of uninitilized values as a bonus. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #25 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45197 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45197&action=edit Bug 12772: Add back file so next patch does not fail This file is needed so that Update Database (Based in Bug13624) can succeed. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45197|0 |1 is obsolete| | --- Comment #26 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45198 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45198&action=edit Bug 12772: Add back file so next patch does not fail -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45191|0 |1 is obsolete| | --- Comment #27 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45199 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45199&action=edit Bug 12772 - Update Database (Based on Bug13624) This patch applies to Bug13624. Removes letter number from overduerules and overdurules_transport_types modified: installer/data/mysql/atomicupdate/update_13624_overduerules_transport_type.pl modified: installer/data/mysql/kohastructure.sql -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45192|0 |1 is obsolete| | --- Comment #28 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45200 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45200&action=edit Bug 12772 - Overdue rules tool and backend library modified: C4/Overdues.pm modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt modified: tools/overduerules.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45193|0 |1 is obsolete| | --- Comment #29 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45201 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45201&action=edit Bug 12772 - Reworked overdue_notices.pl script modified: misc/cronjobs/overdue_notices.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45194|0 |1 is obsolete| | --- Comment #30 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45202 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45202&action=edit Bug 12772 - Renames atomic update file, .pl -> .perl renamed: update_13624_overduerules_transport_type.pl -> update_13624_overduerules_transport_type.perl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45195|0 |1 is obsolete| | --- Comment #31 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45203 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45203&action=edit Bug 12772 - Fix warnings This commit fixes a bunch of warnings for verbose messages which would clutter up the output. They should not affect normal excution. Sponsored-By: Halland County Library -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45196|0 |1 is obsolete| | --- Comment #32 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45204 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45204&action=edit Bug 12772 - Fix rule updates Overduerules ID was not sent correctly when editing rules, resulting in rule being cleared instead of updated. This patch fixes this issue, and a couple of uninitilized values as a bonus. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |eivin@sysmystic.com --- Comment #33 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Sorry for the clutter of updates. This was a bit of a tricky rebase but the patch now applies again. Remember that applying 13624 is a prereq for applying this patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |kyle@bywatersolutions.com --- Comment #34 from Kyle M Hall <kyle@bywatersolutions.com> --- I see merge conflict markers in the first patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 --- Comment #35 from Kyle M Hall <kyle@bywatersolutions.com> --- (In reply to Kyle M Hall from comment #34)
I see merge conflict markers in the first patch.
Make that the second patch. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45199|0 |1 is obsolete| | --- Comment #36 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45544 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45544&action=edit Remove merge conflict markers http://bugs.koha-community.org/show_bug.cgi?id=1277 -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45199|1 |0 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45544|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45199|0 |1 is obsolete| | --- Comment #37 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45545 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45545&action=edit Bug 12772 - Update Database (Based on Bug13624) This patch applies to Bug13624. Removes letter number from overduerules and overdurules_transport_types modified: installer/data/mysql/atomicupdate/update_13624_overduerules_transport_type.pl modified: installer/data/mysql/kohastructure.sql Remove merge conflict markers -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45198|0 |1 is obsolete| | --- Comment #38 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45546 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45546&action=edit Bug 12772: Add back file so next patch does not fail -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45545|0 |1 is obsolete| | --- Comment #39 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45547 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45547&action=edit Bug 12772 - Update Database (Based on Bug13624) This patch applies to Bug13624. Removes letter number from overduerules and overdurules_transport_types modified: installer/data/mysql/atomicupdate/update_13624_overduerules_transport_type.pl modified: installer/data/mysql/kohastructure.sql Remove merge conflict markers -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45200|0 |1 is obsolete| | --- Comment #40 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45548 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45548&action=edit Bug 12772 - Overdue rules tool and backend library modified: C4/Overdues.pm modified: koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt modified: tools/overduerules.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45201|0 |1 is obsolete| | --- Comment #41 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45549 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45549&action=edit Bug 12772 - Reworked overdue_notices.pl script modified: misc/cronjobs/overdue_notices.pl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45202|0 |1 is obsolete| | --- Comment #42 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45550 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45550&action=edit Bug 12772 - Renames atomic update file, .pl -> .perl renamed: update_13624_overduerules_transport_type.pl -> update_13624_overduerules_transport_type.perl -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45203|0 |1 is obsolete| | --- Comment #43 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45551 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45551&action=edit Bug 12772 - Fix warnings This commit fixes a bunch of warnings for verbose messages which would clutter up the output. They should not affect normal excution. Sponsored-By: Halland County Library -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #45204|0 |1 is obsolete| | --- Comment #44 from Eivin Giske Skaaren <eivin@sysmystic.com> --- Created attachment 45552 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=45552&action=edit Bug 12772 - Fix rule updates Overduerules ID was not sent correctly when editing rules, resulting in rule being cleared instead of updated. This patch fixes this issue, and a couple of uninitilized values as a bonus. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Eivin Giske Skaaren <eivin@sysmystic.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #45 from Eivin Giske Skaaren <eivin@sysmystic.com> --- I have fixed so that this patch can be applied to current master again and removed the merge conflict markers. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Needs Signoff CC| |jonathan.druart@bugs.koha-c | |ommunity.org -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org