Created attachment 25075 [details] adding note When in acquisitions you can enter notes on the receive page. Those notes go no where though - they don't show on the invoice as you'd expect or even on the order under 'already received'
Created attachment 25076 [details] no note
Created attachment 25835 [details] [review] Bug 11699: Notes entered when receiving are not saved Test plan: 1/ Create an order with 2 items 2/ Receive 1 item and enter a note for the order 3/ Verify the note is correctly saved 4/ Receive the second item and enter a note for the order 5/ Verify the note is correctly saved
Created attachment 25836 [details] [review] Bug 11699: ModReceiveOrder should take a hashref in parameter Test plan: prove t/db_dependent/Acquisition.t prove t/db_dependent/Acquisition/Invoices.t prove t/db_dependent/Acquisition/OrderFromSubscription.t all should return green.
Not sure this is critical.
I tried to apply it but got: mtompset@ubuntu:~/kohaclone$ git bz apply 11699 Bug 11699 - notes entered when receiving are not saved 25835 - Bug 11699: Notes entered when receiving are not saved 25836 - Bug 11699: ModReceiveOrder should take a hashref in parameter Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11699: Notes entered when receiving are not saved fatal: sha1 information is lacking or useless (C4/Acquisition.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 11699: Notes entered when receiving are not saved 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/Bug-11699-Notes-entered-when-receiving-are-not-sav-IBUgWg.patch Please rebase.
Created attachment 25895 [details] [review] Bug 11699: Notes entered when receiving are not saved Test plan: 1/ Create an order with 2 items 2/ Receive 1 item and enter a note for the order 3/ Verify the note is correctly saved 4/ Receive the second item and enter a note for the order 5/ Verify the note is correctly saved
Created attachment 25896 [details] [review] Bug 11699: ModReceiveOrder should take a hashref in parameter Test plan: prove t/db_dependent/Acquisition.t prove t/db_dependent/Acquisition/Invoices.t prove t/db_dependent/Acquisition/OrderFromSubscription.t all should return green.
Created attachment 25900 [details] [review] [SIGNED OFF] Bug 11699: Notes entered when receiving are not saved Revised test plan: 1/ Create an order with 2 items 2/ Receive 1 item and enter a note for the order 3/ Verify the note is not saved The note should be visible on the Mod Order Details screen, but it isn't there. 4/ Apply patch 5/ Receive the second item and enter a note for the order 6/ Verify the note is correctly saved The note is visible on the Mod Order Details screen. Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 25901 [details] [review] [SIGNED OFF] Bug 11699: ModReceiveOrder should take a hashref in parameter Test plan: prove t/db_dependent/Acquisition.t prove t/db_dependent/Acquisition/Invoices.t prove t/db_dependent/Acquisition/OrderFromSubscription.t all should return green. NOTE: Any error messages are the same between master and this patch, and are unrelated to the added/revised tests. Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
What did I do wrong? nengard@kohavm:~/kohaclone$ git bz apply 11699 Bug 11699 - notes entered when receiving are not saved 25900 - [SIGNED OFF] Bug 11699: Notes entered when receiving are not saved 25901 - [SIGNED OFF] Bug 11699: ModReceiveOrder should take a hashref in parameter Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11699: Notes entered when receiving are not saved Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm Auto-merging t/db_dependent/Acquisition.t CONFLICT (content): Merge conflict in t/db_dependent/Acquisition.t Failed to merge in the changes. Patch failed at 0001 Bug 11699: Notes entered when receiving are not saved 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/SIGNED-OFF-Bug-11699-Notes-entered-when-receiving--I7IJ4M.patch nengard@kohavm:~/kohaclone$
I blame bug 11224. Though, I haven't honestly confirmed that to be the problem point, but it looks like it without checking. :)
See also bug 9416 Mathieu
And see also bug 10928
the last one is probably a duplicate. I thought the issue was fixed, but it is probably not the case Mathieu
Jonathan, could you please rebase? I am a bit confused by the merge conflict in Acquisition.t.
(In reply to Katrin Fischer from comment #15) > Jonathan, could you please rebase? I am a bit confused by the merge conflict > in Acquisition.t. me too... :-/
My bug 11224 altered the UT for Acquisition.t. I cannot make tests (new laptop, no vm on it...) but if you need some information about it, just ask. I will answer you after my work hours. Mathieu
Created attachment 26273 [details] [review] Bug 11699: Notes entered when receiving are not saved Revised test plan: 1/ Create an order with 2 items 2/ Receive 1 item and enter a note for the order 3/ Verify the note is not saved The note should be visible on the Mod Order Details screen, but it isn't there. 4/ Apply patch 5/ Receive the second item and enter a note for the order 6/ Verify the note is correctly saved The note is visible on the Mod Order Details screen. Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 26274 [details] [review] Bug 11699: ModReceiveOrder should take a hashref in parameter Test plan: prove t/db_dependent/Acquisition.t prove t/db_dependent/Acquisition/Invoices.t prove t/db_dependent/Acquisition/OrderFromSubscription.t all should return green. NOTE: Any error messages are the same between master and this patch, and are unrelated to the added/revised tests. Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Created attachment 26289 [details] [review] [PASSED QA] Bug 11699: Notes entered when receiving are not saved Revised test plan: 1/ Create an order with 2 items 2/ Receive 1 item and enter a note for the order 3/ Verify the note is not saved The note should be visible on the Mod Order Details screen, but it isn't there. 4/ Apply patch 5/ Receive the second item and enter a note for the order 6/ Verify the note is correctly saved The note is visible on the Mod Order Details screen. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes all tests and QA script. Works as described. The note now saves correctly and also remains when you undo a receipt. Note: it would be nice to show the note on the receive page as well.
Created attachment 26290 [details] [review] [PASSED QA] Bug 11699: ModReceiveOrder should take a hashref in parameter Test plan: prove t/db_dependent/Acquisition.t prove t/db_dependent/Acquisition/Invoices.t prove t/db_dependent/Acquisition/OrderFromSubscription.t all should return green. NOTE: Any error messages are the same between master and this patch, and are unrelated to the added/revised tests. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Pushed to master. Thanks, Jonathan!
Pushed to 3.14.x, will be in 3.14.10 I've manually corrected conflicts in Acquisition.t