We will add a table deletedaqorders that will keep track of all deleted orders. From a given basket, there will be a link to display deleted orders line
In fact, no new tables will be created, aqorders.datecancellationprinted will be used.
I'm working on it.
Created attachment 6222 [details] [review]
Display a table below orders, in basket page, which contains cancelled orders of this basket.
Created attachment 6632 [details] [review]
Signed off patch
Applying: Bug 5358: Show cancelled orders in basket page
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Recorded preimage for 'koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt'
Failed to merge in the changes.
Patch failed at 0001 Bug 5358: Show cancelled orders in basket page
Created attachment 7011 [details] [review]
ok fine, easy and usefull.
Created attachment 7065 [details] [review]
Adds new subroutine and template params to access it. All in all, very clean and easy to read. Existing unit tests passed. Marking Passed QA.
Only part missing is a new unit test for the subroutine, but since t/db_dependent/Acquisition.t is a stub now anyway, this shouldn't block the addition of this feature.
Steps to reproduce:
* open an acquisition basket, with some lines
* cancel one of the order line by hitting "Delete order" option
=> a new table appear, with the cancelled order, below the remaining order lines.
Patch pushed, please test
Ok in master, marked as resolved