Bug 11699 - notes entered when receiving are not saved
Summary: notes entered when receiving are not saved
Status: CLOSED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Acquisitions (show other bugs)
Version: Main
Hardware: All All
: P5 - low major (vote)
Assignee: Jonathan Druart
QA Contact: Testopia
URL:
Keywords:
Depends on:
Blocks: 9416
  Show dependency treegraph
 
Reported: 2014-02-06 14:07 UTC by Nicole C. Engard
Modified: 2015-06-04 23:30 UTC (History)
6 users (show)

See Also:
Change sponsored?: ---
Patch complexity: Small patch
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments
adding note (76.07 KB, image/png)
2014-02-06 14:07 UTC, Nicole C. Engard
Details
no note (61.16 KB, image/png)
2014-02-06 14:08 UTC, Nicole C. Engard
Details
Bug 11699: Notes entered when receiving are not saved (6.02 KB, patch)
2014-03-05 12:31 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 11699: ModReceiveOrder should take a hashref in parameter (9.87 KB, patch)
2014-03-05 12:32 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 11699: Notes entered when receiving are not saved (6.20 KB, patch)
2014-03-06 13:59 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 11699: ModReceiveOrder should take a hashref in parameter (9.87 KB, patch)
2014-03-06 14:00 UTC, Jonathan Druart
Details | Diff | Splinter Review
[SIGNED OFF] Bug 11699: Notes entered when receiving are not saved (6.41 KB, patch)
2014-03-06 14:42 UTC, Mark Tompsett
Details | Diff | Splinter Review
[SIGNED OFF] Bug 11699: ModReceiveOrder should take a hashref in parameter (10.05 KB, patch)
2014-03-06 14:43 UTC, Mark Tompsett
Details | Diff | Splinter Review
Bug 11699: Notes entered when receiving are not saved (7.43 KB, patch)
2014-03-13 13:25 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 11699: ModReceiveOrder should take a hashref in parameter (10.46 KB, patch)
2014-03-13 13:25 UTC, Jonathan Druart
Details | Diff | Splinter Review
[PASSED QA] Bug 11699: Notes entered when receiving are not saved (7.68 KB, patch)
2014-03-13 14:32 UTC, Katrin Fischer
Details | Diff | Splinter Review
[PASSED QA] Bug 11699: ModReceiveOrder should take a hashref in parameter (10.52 KB, patch)
2014-03-13 14:33 UTC, Katrin Fischer
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Nicole C. Engard 2014-02-06 14:07:49 UTC
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'
Comment 1 Nicole C. Engard 2014-02-06 14:08:18 UTC
Created attachment 25076 [details]
no note
Comment 2 Jonathan Druart 2014-03-05 12:31:56 UTC Comment hidden (obsolete)
Comment 3 Jonathan Druart 2014-03-05 12:32:02 UTC Comment hidden (obsolete)
Comment 4 Jonathan Druart 2014-03-05 12:32:36 UTC
Not sure this is critical.
Comment 5 Mark Tompsett 2014-03-06 13:47:11 UTC
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.
Comment 6 Jonathan Druart 2014-03-06 13:59:33 UTC Comment hidden (obsolete)
Comment 7 Jonathan Druart 2014-03-06 14:00:18 UTC Comment hidden (obsolete)
Comment 8 Mark Tompsett 2014-03-06 14:42:07 UTC Comment hidden (obsolete)
Comment 9 Mark Tompsett 2014-03-06 14:43:00 UTC Comment hidden (obsolete)
Comment 10 Nicole C. Engard 2014-03-10 17:27:18 UTC
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$
Comment 11 Mark Tompsett 2014-03-10 20:12:15 UTC
I blame bug 11224. Though, I haven't honestly confirmed that to be the problem point, but it looks like it without checking. :)
Comment 12 Mathieu Saby 2014-03-11 07:49:17 UTC
See also bug 9416

Mathieu
Comment 13 Mathieu Saby 2014-03-11 07:50:06 UTC
And see also bug 10928
Comment 14 Mathieu Saby 2014-03-11 07:50:55 UTC
the last one is probably a duplicate. I thought the issue was fixed, but it is probably not the case

Mathieu
Comment 15 Katrin Fischer 2014-03-11 10:03:50 UTC
Jonathan, could you please rebase? I am a bit confused by the merge conflict in Acquisition.t.
Comment 16 Jonathan Druart 2014-03-11 10:56:52 UTC
(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... :-/
Comment 17 Mathieu Saby 2014-03-11 12:47:06 UTC
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
Comment 18 Jonathan Druart 2014-03-13 13:25:34 UTC Comment hidden (obsolete)
Comment 19 Jonathan Druart 2014-03-13 13:25:41 UTC Comment hidden (obsolete)
Comment 20 Katrin Fischer 2014-03-13 14:32:33 UTC
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.
Comment 21 Katrin Fischer 2014-03-13 14:33:15 UTC
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>
Comment 22 Galen Charlton 2014-04-19 15:12:55 UTC
Pushed to master.  Thanks, Jonathan!
Comment 23 Fridolin Somers 2014-08-06 13:03:39 UTC
Pushed to 3.14.x, will be in 3.14.10

I've manually corrected conflicts in Acquisition.t