In acquisitions there are "delete order" links next to the order lines that are actually "cancelling" the order. As this switches the status of the order line to "cancelled" and the order line is kept in the database - it should be named accordingly. The same links are also visible on receiving order lines. There is also a confusing with the "delete this order" button on top of the summary page. This actually will delete the basket and the order lines from the database, so differentiating between both features would avoid confusion. If the column headings are changed, it would be nice to avoid a single "cancel" but use "cancel order line" instead, as the verb without context is a translation issue at least for the German translations where cancel can have different meanings.
Created attachment 50691 [details] [review] Bug 16253: Changing 'delete order' to 'cancel order' To test: 1) Go to Acqui -> do a vendor search and view an open basket 2) Confirm last column heading says cancel instead of delete 3) Confirm link to cancel order says cancel instead of delete 4) If can't delete record, confirm reasons say cancel order instead of delete 5) Click the vendor name, then Baskets tab, then Receive Shipment 6) Fill vendor invoice field and click next 7) If there are any pending orders, confirm that all instances of 'delete order' now say cancel Sponsored-by: Catalyst IT
Created attachment 50851 [details] [review] Bug 16253: Changing 'delete order' to 'cancel order' To test: 1) Go to Acqui -> do a vendor search and view an open basket 2) Confirm last column heading says cancel instead of delete 3) Confirm link to cancel order says cancel instead of delete 4) If can't delete record, confirm reasons say cancel order instead of delete 5) Click the vendor name, then Baskets tab, then Receive Shipment 6) Fill vendor invoice field and click next 7) If there are any pending orders, confirm that all instances of 'delete order' now say cancel Sponsored-by: Catalyst IT Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Created attachment 50854 [details] [review] [PASSED QA] Bug 16253: Changing 'delete order' to 'cancel order' To test: 1) Go to Acqui -> do a vendor search and view an open basket 2) Confirm last column heading says cancel instead of delete 3) Confirm link to cancel order says cancel instead of delete 4) If can't delete record, confirm reasons say cancel order instead of delete 5) Click the vendor name, then Baskets tab, then Receive Shipment 6) Fill vendor invoice field and click next 7) If there are any pending orders, confirm that all instances of 'delete order' now say cancel Sponsored-by: Catalyst IT Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Pushed to master for the 16.05 release. Thanks Aleisha!
Patch pushed to 3.22.x, will be in 3.22.7