[Bug 8037] New: Add holds and funds to items already received in parcel.pl
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Priority: P5 - low Change sponsored?: --- Bug ID: 8037 Assignee: henridamien@koha-fr.org Summary: Add holds and funds to items already received in parcel.pl Severity: enhancement Classification: Unclassified OS: All Reporter: kyle.m.hall@gmail.com Hardware: All Status: NEW Version: master Component: Acquisitions Product: Koha Created attachment 9383 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9383&action=edit Example of Updated Table FUND COLUMN adjustments Add a FUND column to the “Already Received” table, placing it between the “quantity” and “est cost” columns. The FUND column would contain the fund account number (e.g. 402000, GIFT, 20351, etc.) relating to the associated title on the same line in “Summary” column. The fund column would extend into the “subtotal” section on the “Already Received” table. In that section, each fund would have the subtotal of all titles received on that fund, under the “TOTAL” column. The “TOTAL” line on the “Already Received” table would be a total of all titles received on that receipt summary (which would be the total of all fund subtotals). See screen shot. HOLDS COLUMN or HOLDS INDICATOR Add a column to the “Already Received” table, placing it between the “order line” and “summary” columns. This column would contain a red X on the same line as a title that has holds. OR Make titles with holds, appear in red font, on the “Summary” line of the “Already Received” table. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|henridamien@koha-fr.org |kyle.m.hall@gmail.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #1 from Kyle M Hall <kyle.m.hall@gmail.com> --- Created attachment 9384 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9384&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle.m.hall@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |chris@bigballofwax.co.nz --- Comment #2 from Chris Cormack <chris@bigballofwax.co.nz> --- CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9384|0 |1 is obsolete| | --- Comment #3 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 11089 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11089&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff CC| |kyle@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |In Discussion --- Comment #4 from Chris Cormack <chris@bigballofwax.co.nz> --- This is mostly working well. However we have one issue. The patch is doing this + my ($count) = &GetReservesFromBiblionumber($line{biblionumber}); + $line{holds} = $count; So if I have 3 items attached to a biblio, one of them being one I received and can see on this screen, it will tell me I have a hold on it. But I might have a hold on one specific item, not the one attached to this order. Do we care about that? (IE this works fine for biblio level holds, false positives for item level ones) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #5 from Kyle M Hall <kyle@bywatersolutions.com> --- GetParcels does not return any itemnumbers, so we would have to add an additional check to aqorders_items. Then we could modify GetReservesFromBiblionumber to add an optional itemnumber parameter such that the count returned is only for bib-level reserves + item level reserves for that item. Should I file a separate bug for this behavior, or do you feel that it is important enough that I write a followup? (In reply to comment #4)
This is mostly working well.
However we have one issue.
The patch is doing this + my ($count) = &GetReservesFromBiblionumber($line{biblionumber}); + $line{holds} = $count;
So if I have 3 items attached to a biblio, one of them being one I received and can see on this screen, it will tell me I have a hold on it. But I might have a hold on one specific item, not the one attached to this order.
Do we care about that? (IE this works fine for biblio level holds, false positives for item level ones)
-- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|In Discussion |Needs Signoff --- Comment #6 from Kyle M Hall <kyle@bywatersolutions.com> --- Resetting to needs signoff. If anyone has an opinion on comments 4/5, please let me know. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11089|0 |1 is obsolete| | --- Comment #7 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 13152 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13152&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #8 from Kyle M Hall <kyle@bywatersolutions.com> --- This new patch solves the problem Chris brought up in comment 4. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #9 from Kyle M Hall <kyle@bywatersolutions.com> --- On further view, I don't think it does solve the problem. I'll have to post a followup. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13152|0 |1 is obsolete| | --- Comment #10 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 13153 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13153&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |jonathan.druart@biblibre.co | |m --- Comment #11 from Jonathan Druart <jonathan.druart@biblibre.com> --- Hi Kyle, 2 problems: - Your patch breaks the sort on the table (js error: "a.aoColumns[c] is undefined") - The total per fund is wrong I think, you don't multiply by the quantity (in your example the total for "Test Fund 1" would be 180) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #13153|0 |1 is obsolete| | --- Comment #12 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 14892 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=14892&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Alex Arnaud <alex.arnaud@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |alex.arnaud@biblibre.com --- Comment #13 from Alex Arnaud <alex.arnaud@biblibre.com> --- This patch does not apply on master: error: patch failed: C4/Acquisition.pm:2336 error: C4/Acquisition.pm: patch does not apply -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #14892|0 |1 is obsolete| | --- Comment #14 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 16336 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16336&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |koha@univ-lyon3.fr --- Comment #15 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- The new columns are added. I try an hold on a specific item : column holds is filled only for the item on hold. But if a tax rate is added in the vendor and the invoice price don't include tax, the tax has to be added in the subtotal per fund. Mark "failed QA" for this point. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #16 from Kyle M Hall <kyle@bywatersolutions.com> --- (In reply to comment #15)
The new columns are added. I try an hold on a specific item : column holds is filled only for the item on hold. But if a tax rate is added in the vendor and the invoice price don't include tax, the tax has to be added in the subtotal per fund. Mark "failed QA" for this point.
I'm having a hard time figuring out how this should be solved. Could you post a screenshot and describe which numbers should be changed? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #17 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #16)
(In reply to comment #15)
The new columns are added. I try an hold on a specific item : column holds is filled only for the item on hold. But if a tax rate is added in the vendor and the invoice price don't include tax, the tax has to be added in the subtotal per fund. Mark "failed QA" for this point.
I'm having a hard time figuring out how this should be solved. Could you post a screenshot and describe which numbers should be changed?
Same here. Koha Team Lyon 3, could you describe more precisely the issue please? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff --- Comment #18 from Kyle M Hall <kyle@bywatersolutions.com> --- (In reply to comment #15)
The new columns are added. I try an hold on a specific item : column holds is filled only for the item on hold. But if a tax rate is added in the vendor and the invoice price don't include tax, the tax has to be added in the subtotal per fund. Mark "failed QA" for this point.
I'm going to reset this to needs signoff and here is my reasoning. The subtotals should total estimated and actual costs as they are displayed. I don't think it would be a good idea to "magically" add the tax in which would make the numbers not add up correctly. I hope that makes sense. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off CC| |paul.poulain@biblibre.com --- Comment #19 from Paul Poulain <paul.poulain@biblibre.com> --- Patch tested with a sandbox, by Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16336|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=8037 --- Comment #20 from Paul Poulain <paul.poulain@biblibre.com> --- Created attachment 16635 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16635&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Needs Signoff --- Comment #21 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- I complete my comment : 1. change gist in syspref 2. edit a vendor and change tax rate and choose invoice prices don't include tax 3. make some orders 4. when you receive your books : you put a price HT in actual cost 5. in the table of "already receive" you only see the HT price but your library have to pay TTC price, so you don't see the amount that really be deduct from your fund... (I attach a screenshot..) -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #22 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 16651 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16651&action=edit screenshot problem with GST -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16651|0 |1 is obsolete| | --- Comment #23 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- Created attachment 16660 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16660&action=edit screenshot problem with GST -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Pierre Angot <tredok.pierre@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |tredok.pierre@gmail.com --- Comment #24 from Pierre Angot <tredok.pierre@gmail.com> --- I have not tested this problem. So failed qa -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Brendan Gallagher <brendan@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off CC| |brendan@bywatersolutions.co | |m -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #25 from Brendan Gallagher <brendan@bywatersolutions.com> --- A group here at the hackfest communicated and felt that they were asking for something that was outside of this scope of this patch. Setting back to signed off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16660|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=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9383|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=8037 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Medium patch QA Contact| |paul.poulain@biblibre.com -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA Patch complexity|Medium patch |Small patch --- Comment #26 from Paul Poulain <paul.poulain@biblibre.com> --- QA comments: * the new sub GetBudgetByOrderNumber needs a unit test * there is an unconditionnal warn: + warn "ITEMNUMBER: $itemnumber"; * instead of CURRENT_DATE() please use cast(now() AS date) http://wiki.koha-community.org/wiki/PostgreSQL sorry, failed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #27 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 16749 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=16749&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #28 from Paul Poulain <paul.poulain@biblibre.com> --- OK, after some more explanations in french from Sonia, I think I've got the point she wanted to explain: whatever is the GIST status of the prices you've setup, the final cost for you will be the "all taxes included" price, so it's the "all included" price that must be removed from the budget. In other terms, it means that the budget split should not just sum all lines. How to fix this problem ? The best option, imo, would be to completely relook this screen to have both GIST excluded&included prices & totals & sub-total But that's a long term goal. So, at the end, I feel what would be enough is to just display a message if the vendor is "prices exclude GIST" saying ("GIST not summed", or something like that) In the meantime, failed QA. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #16635|0 |1 is obsolete| | Attachment #16749|0 |1 is obsolete| | --- Comment #29 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18021 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18021&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #30 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18022 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18022&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #31 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 18023 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18023&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Adds the note "GST exc." for subtotals by fund. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #32 from Kyle M Hall <kyle.m.hall@gmail.com> --- (In reply to comment #28)
OK, after some more explanations in french from Sonia, I think I've got the point she wanted to explain: whatever is the GIST status of the prices you've setup, the final cost for you will be the "all taxes included" price, so it's the "all included" price that must be removed from the budget. In other terms, it means that the budget split should not just sum all lines.
How to fix this problem ? The best option, imo, would be to completely relook this screen to have both GIST excluded&included prices & totals & sub-total But that's a long term goal. So, at the end, I feel what would be enough is to just display a message if the vendor is "prices exclude GIST" saying ("GIST not summed", or something like that)
In the meantime, failed QA.
Paul, is this second followup what you are looking for? -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Melia Meggs <melia@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |melia@bywatersolutions.com --- Comment #33 from Melia Meggs <melia@bywatersolutions.com> --- Hi Paul and Sonia, Just checking in - any chance you could retest this with Kyle's new follow up patch to see if it resolves the problem you described? If so, that would be wonderful! Thank you, Melia -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #34 from Pierre Angot <tredok.pierre@gmail.com> --- Sandbox setup by tredok.pierre@gmail.com with database 2 and bug 8037 on Thu Jun 6 09:08:01 2013 Something went wrong ! Applying: Bug 8037 - Add holds and funds to items already received in parcel.pl Applying: Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup Applying: Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 8037 - Add holds and funds to items already received in parcel.pl Bug 8037 - Add holds and funds to items already received in parcel.pl Apply? [yn] Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup Apply? [yn] Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Apply? [yn] Patch left in /tmp/Bug-8037---Add-holds-and-funds-to-items-already-re-9gNZuE.patch -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #35 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to comment #34)
Sandbox setup by tredok.pierre@gmail.com with database 2 and bug 8037 on Thu Jun 6 09:08:01 2013
Something went wrong !
Works for me -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Paul Poulain <paul.poulain@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #36 from Paul Poulain <paul.poulain@biblibre.com> --- Patch tested with a sandbox, by Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #37 from Paul Poulain <paul.poulain@biblibre.com> --- Created attachment 18693 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=18693&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Adds the note "GST exc." for subtotals by fund. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #38 from Pierre Angot <tredok.pierre@gmail.com> --- I've created a basket with 2 order. I've placed a hold on one of them. The second order was associated with an other fund. The total per fund is correct. It maybe a good idea to add the holds columns in Pending orders. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18023|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=8037 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |m.de.rooy@rijksmuseum.nl --- Comment #39 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Applying: Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18693|0 |1 is obsolete| | --- Comment #40 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 19672 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19672&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Adds the note "GST exc." for subtotals by fund. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA QA Contact|paul.poulain@biblibre.com |jonathan.druart@biblibre.co | |m --- Comment #41 from Jonathan Druart <jonathan.druart@biblibre.com> --- QA comment: Looks good to me. minor: - a css class named font-weight-normal is not well chosen. - unit test inserts manually an order instead of calling C4::Acq::AddOrder Inconsistent things still exist on this page but this patch does not introduce regression neither add another inconsistency. I validated this patch with Sonia (from the Koha Team Lyon 3), thanks to her! Marked as Passed QA. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18021|0 |1 is obsolete| | --- Comment #42 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19789 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19789&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #18022|0 |1 is obsolete| | --- Comment #43 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19790 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19790&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19672|0 |1 is obsolete| | --- Comment #44 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19791 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19791&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Adds the note "GST exc." for subtotals by fund. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |rel_3_14_candidate -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gmcharlt@gmail.com --- Comment #45 from Galen Charlton <gmcharlt@gmail.com> --- Created attachment 22244 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22244&action=edit duplication of baskets on the already-received table In testing I discovered that the change to GetInvoiceDetails() resulted in each order being returned multiple times if more than zero or one items was attached to it. I've attached a screenshot demonstrating this, and am setting this to failed QA. One suggestion -- leave GetInvoiceDetails alone, and use GetItemnumbersFromOrder() to grab the list of items. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #46 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22390 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22390&action=edit Bug 8037: FIX bad sql query and variable renaming The first patch does a left join on aqorders_items which returns too much order lines. This patch follows the Galen's suggestion: it removes the join and calls the GetItemnumbersFromOrder routine for retrieving itemnumbers. Bonus: the "parcelitems" variable is badly named and obfuscates the code. I changed it for "orders". -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19789|0 |1 is obsolete| | --- Comment #47 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 22636 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22636&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl Adds a column to indicate holds on recieved items, as well as adding a new column for fund and showing the subtotals per fund above the total subtotal. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19790|0 |1 is obsolete| | --- Comment #48 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 22637 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22637&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19791|0 |1 is obsolete| | --- Comment #49 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 22638 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22638&action=edit Bug 8037 - Add holds and funds to items already received in parcel.pl - QA Followup 2 Adds the note "GST exc." for subtotals by fund. Signed-off-by: Pierre Angot <tredok.pierre@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 --- Comment #50 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Rebased the "first three" but this last followup Applying: Bug 8037: FIX bad sql query and variable renaming 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 8037: FIX bad sql query and variable renaming -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22390|0 |1 is obsolete| | --- Comment #51 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 22639 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22639&action=edit Bug 8037: FIX bad sql query and variable renaming The first patch does a left join on aqorders_items which returns too much order lines. This patch follows the Galen's suggestion: it removes the join and calls the GetItemnumbersFromOrder routine for retrieving itemnumbers. Bonus: the "parcelitems" variable is badly named and obfuscates the code. I changed it for "orders". -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #22639|0 |1 is obsolete| | --- Comment #52 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 22647 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=22647&action=edit Bug 8037: FIX bad sql query and variable renaming The first patch does a left join on aqorders_items which returns too much order lines. This patch follows the Galen's suggestion: it removes the join and calls the GetItemnumbersFromOrder routine for retrieving itemnumbers. Bonus: the "parcelitems" variable is badly named and obfuscates the code. I changed it for "orders". Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 M. de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA --- Comment #53 from M. de Rooy <m.de.rooy@rijksmuseum.nl> --- QA Comment: I signed off on the last patch and looked at that one specifically. no koha-qa warnings on all four patches there was no test plan but I tested with AcqCreateItem=receiving, two orders on one basket, received lines separately with second partially, placed hold on the first item ran perl t/db_dependent/Acquisition/Invoices.t: pass ran perl t/Acquisition/Invoice.t: pass I checked the calls to GetInvoiceDetails; removing the itemnumber from aqorder_items seems to be no problem :) and solves the duplication problem. Furthermore, the code looks good to me (code in last patch). Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8037 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #54 from Galen Charlton <gmcharlt@gmail.com> --- Pushed to master, along with some follow-ups. Thanks, Kyle! -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org