|
Description
Andrew Fuerste-Henry
2019-03-19 19:55:50 UTC
Created attachment 86842 [details] [review] Bug 22541: Use invoicenumber and link to invoice on spent and ordered pages To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Created attachment 86871 [details] [review] Bug 22541: Use invoicenumber and link to invoice on spent and ordered pages To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea <wizzyrea@gmail.com> Comment on attachment 86871 [details] [review] Bug 22541: Use invoicenumber and link to invoice on spent and ordered pages Review of attachment 86871 [details] [review]: ----------------------------------------------------------------- Hi Nick, can you take a look at the code comments please? Thx! ::: acqui/ordered.pl @@ +77,4 @@ > (quantity > quantityreceived OR quantityreceived IS NULL) > GROUP BY aqorders.biblionumber, aqorders.basketno, aqorders.ordernumber, > tleft, > + ecost_tax_included, budgetdate, entrydate, While this change appears to make sense, it seems totally unrelated to the patch. Can you please explain? Related to: http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=9d595e36a7844f99fa5d74aad418717d12eeae37 ? ::: acqui/spent.pl @@ +93,4 @@ > aqorders.invoiceid, > aqinvoices.invoicenumber, > quantityreceived, > + unitprice_tax_included, Same here as for ordered.pl ::: circ/ysearch.pl @@ +40,4 @@ > print $input->header( -type => 'text/plain', -charset => 'UTF-8' ); > > my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { catalogue => '1' } ); > +warn "$auth_status is what?"; Quite sure this should not be here. :) Created attachment 86972 [details] [review] Bug 22541: Invoice adjustments should show invoice number and include link on ordered.pl and spent.pl To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea <wizzyrea@gmail.com> bsoletes: 86871 - Bug 22541: Use invoicenumber and link to invoice on spent and ordered pages (In reply to Katrin Fischer from comment #3) Bad use of -a :-) Removed the ysearch change, oops Moved the spent/ordered changes to a followup on 21622 Created attachment 87334 [details] [review] Bug 19380: Use Koha::Item::get_transfer instead of GetTransfers Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Michal Denar <black23@gmail.com> https://bugs.koha-community.org/show_bug.cgi?id=22541 Signed-off-by: Michal Denar <black23@gmail.com> Created attachment 87335 [details] [review] Bug 22541: Use invoicenumber and link to invoice on spent and ordered pages To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Michal Denar <black23@gmail.com> Something has gone wrong here - the patch now signed off is the one including hte false changes. Also another unrelated patch has been attached. I am resetting the patches. It looks like the last action was from Liz to reset to 'Needs signoff' - so changing status too. Hi Katrin, because status is set to "Need to sing off" it's call for other round of test? Thank you. Hi Michal, that would be great. Created attachment 87536 [details] [review] Bug 22541: Invoice adjustments should show invoice number and include link on ordered.pl and spent.pl To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Liz Rea <wizzyrea@gmail.com> retested, still works as described but without the extra not applicable bits! Created attachment 87570 [details] [review] Bug 22541: Invoice adjustments should show invoice number and include link on ordered.pl and spent.pl To test: 1 - Find a vendor in acquisitions 2 - Click 'receive shipment' 3 - Create an invoice 4 - Click 'Finish receiving' 5 - Add an adjustment that encumbers while open and update adjustments 6 - Go to acqui-home and click on the ordered total for the fund with the adjustment 7 - Note the invoice adjustment shows the invoice id and does not link 8 - Add another invoice and another adjustment, but close the invoice this time 9 - Go to acqui-home and click on the spent total for the fund with the adjustment 10 - Note the invoice adjustment shows the invoice id and does not link 11 - Apply patch 12 - Visit the spent and ordered pages and note the adjustments show invoicenumber and are links 13 - prove -v t/db_dependent/Koha/Acquisition/Invoice/Adjustments.t Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Awesome work all! Pushed to master for 19.05 Enhancement, will not be backported to 18.11.x series. Oops, I made a mistake here.. Whilst going back through the release notes I appear to have backported this enhancement and so it will be available in 18.11.05. It's a trivial, but nice enhancement so I'm included to keep it rather than revert. No complaints here, thanks for the backporting! |