|
Description
Dobrica Pavlinusic
2018-10-25 10:40:26 UTC
Created attachment 81129 [details] [review] Bug 21659: Acquisitions Receipt summary Basket group links missing params Acquisitions Receipt summary report is missing parameters required for it to work. To test open Acquisitions Receipt summary report and verify that basket group links are now working. Hi Dobrica Thanks for your patch. Can you please rebase your patch against master as it is failing when I try to apply it, as the below output shows: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21659: Acquisitions Receipt summary Basket group links missing params Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Failed to merge in the changes. Patch failed at 0001 Bug 21659: Acquisitions Receipt summary Basket group links missing params The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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/Bug-21659-Acquisitions-Receipt-summary-Basket-grou-KsKk2c.patch Have the patch almost ready, will finish here later. Created attachment 86556 [details] [review] Bug 21659: Fix links to basket groups from order receive page Fixes a problem with the template variables on the order receive page, so that the links to basket groups work correctly again. To test: - Create some orders with and without basket groups - Receive shipment - Verify that the basket group links for pending orders work right - Receive an order line - Verify that the basket group links for received orders work right Hi Dobrica, hope it's ok I stole this one. Fixed it a little differently to your patch. Created attachment 86688 [details] [review] Bug 21659: Fix links to basket groups from order receive page Fixes a problem with the template variables on the order receive page, so that the links to basket groups work correctly again. To test: - Create some orders with and without basket groups - Receive shipment - Verify that the basket group links for pending orders work right - Receive an order line - Verify that the basket group links for received orders work right Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> I've signed it off because the links actually work now, but I wonder if the additional "&basketgroupid=X" parameter in the url does anything. When I tested, including it in the url or not brought me to the same page both times (all basket groups for that vendor) Created attachment 87399 [details] [review] Bug 21659: Change link to basket group edit page I have taken another look at other links like the one from acq order search and changed the link to not lead to the vendor's basket group page but to the edit page of the invidividual basket group. To test: - Same as first patch, verify links now lead to the basket grou edit page https://bugs.koha-community.org/show_bug.cgi?id=21650 Thank you, Jose. I have changed the link so it matches the one from the order search - would you test again? Created attachment 87455 [details] [review] Bug 21659: Fix links to basket groups from order receive page Fixes a problem with the template variables on the order receive page, so that the links to basket groups work correctly again. To test: - Create some orders with and without basket groups - Receive shipment - Verify that the basket group links for pending orders work right - Receive an order line - Verify that the basket group links for received orders work right Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Created attachment 87456 [details] [review] Bug 21659: Change link to basket group edit page I have taken another look at other links like the one from acq order search and changed the link to not lead to the vendor's basket group page but to the edit page of the invidividual basket group. To test: - Same as first patch, verify links now lead to the basket grou edit page https://bugs.koha-community.org/show_bug.cgi?id=21650 Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Thank you! Created attachment 87508 [details] [review] Bug 21659: Fix links to basket groups from order receive page Fixes a problem with the template variables on the order receive page, so that the links to basket groups work correctly again. To test: - Create some orders with and without basket groups - Receive shipment - Verify that the basket group links for pending orders work right - Receive an order line - Verify that the basket group links for received orders work right Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Created attachment 87509 [details] [review] Bug 21659: Change link to basket group edit page I have taken another look at other links like the one from acq order search and changed the link to not lead to the vendor's basket group page but to the edit page of the invidividual basket group. To test: - Same as first patch, verify links now lead to the basket grou edit page https://bugs.koha-community.org/show_bug.cgi?id=21650 Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Thanks all, works as expected.. PQA Awesome work all! Pushed to master for 19.05 Pushed to 18.11.x for 18.11.05 backported to 18.05.x for 18.05.12 |