[Bug 20318] New: Merge invoices can lead to an merged invoice without Invoice number
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Bug ID: 20318 Summary: Merge invoices can lead to an merged invoice without Invoice number Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: normal Priority: P5 - low Component: Acquisitions Assignee: koha-bugs@lists.koha-community.org Reporter: christophe.croullebois@biblibre.com QA Contact: testopia@bugs.koha-community.org When you want to merge invoices you have a page with a non editable field 'Invoice number:' it shows the content of the first invoice to be merged. But if you validate by clicking the 'merge' button you arrive on the next page which says that 'Invoice has been modified' and if you quit this page without saving you have now a merged invoice without Invoice number. This tiny patch just prevents this issue to occur. Test plan : 1° go to the acqui/invoices.pl page and search invoices to merge. You must have at least 2 invoices on the same vendor 2° check boxes to select invoices to merge and click on 'merge selected invoices' button 3° next page you see the non editable field 'Invoice number:' 4° click on the 'merge' button 5° next page you see 'Invoice has been modified' 6° leave this page i.e click on the left link 'Invoices' 7° search invoices you'll see the merged invoice without invoice number. Apply the patch, replay the steps 1 to 3 4° on this page you can enter your invoice number and click on the 'merge' button. If you leave this field empty and click merge, a message informs you that it is required and you can not merge. Thx -- 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=20318 Christophe Croullebois <christophe.croullebois@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff CC| |christophe.croullebois@bibl | |ibre.com Assignee|koha-bugs@lists.koha-commun |christophe.croullebois@bibl |ity.org |ibre.com --- Comment #1 from Christophe Croullebois <christophe.croullebois@biblibre.com> --- Created attachment 72306 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72306&action=edit Merge invoices can lead to an merged invoice without Invoice number thx to test -- 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=20318 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |severine.queune@bulac.fr Status|Needs Signoff |Failed QA --- Comment #2 from Séverine Queune <severine.queune@bulac.fr> --- Applying: Bug 20318: Merge invoices can lead to an merged invoice without Invoice number Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt Failed to merge in the changes. Patch failed at 0001 Bug 20318: Merge invoices can lead to an merged invoice without Invoice number The copy of the patch that failed is found in: /var/repositories/koha/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Merge-invoices-can-lead-to-an-merged-invoice-witho-SIyTfk.patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Patch doesn't apply -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Christophe Croullebois <christophe.croullebois@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #72306|0 |1 is obsolete| | --- Comment #3 from Christophe Croullebois <christophe.croullebois@biblibre.com> --- Created attachment 72873 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72873&action=edit rebased patch rebased thx fot the tests -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Séverine Queune <severine.queune@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 --- Comment #4 from Séverine Queune <severine.queune@bulac.fr> --- Created attachment 72881 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72881&action=edit Bug 20318: Merge invoices can lead to an merged invoice without Invoice number Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 --- Comment #5 from Séverine Queune <severine.queune@bulac.fr> --- Thanks for quick rebase ! One thing though : if I try to merge without choosing a name for the new invoice, the alerte message is in french "Veuillez compléter ce champ.". -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 --- Comment #6 from Christophe Croullebois <christophe.croullebois@biblibre.com> --- Thx Séverine, in fact this message is not coded in koha but depend of your language, I presume it is French on your machine. Maybe someone can test with English to validate. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 --- Comment #7 from Josef Moravec <josef.moravec@gmail.com> --- Comment on attachment 72881 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72881 Bug 20318: Merge invoices can lead to an merged invoice without Invoice number Review of attachment 72881: --> (https://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=20318&attachment=72881) ----------------------------------------------------------------- ::: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -351,4 @@
$(row).click(function () { $('#merge_table tbody tr').removeClass('active'); $(this).addClass('active'); - $('#merge_invoicenumber').text(invoice.invoicenumber);
Why do you remove this? The functionality of using one of merged invoices number just by clicking on it could be still useful. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Josef Moravec <josef.moravec@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA QA Contact|testopia@bugs.koha-communit |josef.moravec@gmail.com |y.org | CC| |josef.moravec@gmail.com --- Comment #8 from Josef Moravec <josef.moravec@gmail.com> --- Failed QA means I need answer here. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Christophe Croullebois <christophe.croullebois@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #72873|0 |1 is obsolete| | Attachment #72881|0 |1 is obsolete| | --- Comment #9 from Christophe Croullebois <christophe.croullebois@biblibre.com> --- Created attachment 72958 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72958&action=edit Merge invoices can lead to an merged invoice without Invoice number -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Christophe Croullebois <christophe.croullebois@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 --- Comment #10 from Christophe Croullebois <christophe.croullebois@biblibre.com> --- (In reply to Josef Moravec from comment #8)
Failed QA means I need answer here.
Hi Josef, you'r right, so I have added this functionality. Thx -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Christophe Croullebois <christophe.croullebois@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #72958|0 |1 is obsolete| | --- Comment #11 from Christophe Croullebois <christophe.croullebois@biblibre.com> --- Created attachment 72969 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72969&action=edit Merge invoices can lead to an merged invoice without Invoice number -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Séverine Queune <severine.queune@bulac.fr> 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=20318 --- Comment #12 from Séverine Queune <severine.queune@bulac.fr> --- Created attachment 72975 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=72975&action=edit Bug 20318: Merge invoices can lead to an merged invoice without Invoice number Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 --- Comment #13 from Séverine Queune <severine.queune@bulac.fr> --- Thanks Josef and Christophe, the onclick feature is a great idea ! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Josef Moravec <josef.moravec@gmail.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=20318 --- Comment #14 from Josef Moravec <josef.moravec@gmail.com> --- Created attachment 73415 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=73415&action=edit Bug 20318: Merge invoices can lead to an merged invoice without Invoice number Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jonathan.druart@bugs.koha-c | |ommunity.org Attachment #72969|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #72975|0 |1 is obsolete| | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 --- Comment #15 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Created attachment 73532 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=73532&action=edit Bug 20318: Add class 'required' to the label -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #16 from Jonathan Druart <jonathan.druart@bugs.koha-community.org> --- Pushed to master for 18.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=20318 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |Pushed to Stable CC| |nick@bywatersolutions.com --- Comment #17 from Nick Clemens <nick@bywatersolutions.com> --- Pushed to stable for 17.11.06 Awesome work all! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m --- Comment #18 from Fridolin SOMERS <fridolin.somers@biblibre.com> --- Pushed to 17.05.x for v17.05.12 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20318 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Stable |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org