Created attachment 105107 [details] adjustments Hi, Tested on 19.05.04: - Add adjustemts in an invoice - Display all details of invoice - See in the column "Total tax inc." on row "Total+Adjustments+Shipment" that Total does not include amount of Adjustment. See the attached screeshot. Regards, Marjorie
I was able to confirm this issue on master. To test: - Add a basket with at least one order - Close it - Receive shipment - Receive the order - Finish receiving - Add an adjustment of any amount - Verify in the invoice details table: - Total tax exc. is showing including the adjustmnt - Total tax inc. is missing the adjustment
Note: click on 'show details' to see the column with the problem.
How is this supposed to work? The adjustment contains the tax or not? It seems that we are only adding that value to the "total tax excluded" value so far.
Created attachment 105381 [details] [review] Bug 25545: Add adjustments to total tax included Adjustments are not affected by tax, they are meant as a way to alter invoice values after receiving (damaged items, refuneds, extra charges, etc) When adjustments were added the tax included column was missed To test: - Add a basket with at least one order - Close it - Receive shipment - Receive the order - Finish receiving - Add an adjustment of any amount - Verify in the invoice details table: - Total tax exc. is showing including the adjustmnt - Total tax inc. is missing the adjustment - Apply patch - Reload - Total tax exc. is showing including the adjustmnt - Total tax inc. is showing including the adjustment
Created attachment 105443 [details] [review] Bug 25545: Add adjustments to total tax included Adjustments are not affected by tax, they are meant as a way to alter invoice values after receiving (damaged items, refuneds, extra charges, etc) When adjustments were added the tax included column was missed To test: - Add a basket with at least one order - Close it - Receive shipment - Receive the order - Finish receiving - Add an adjustment of any amount - Verify in the invoice details table: - Total tax exc. is showing including the adjustmnt - Total tax inc. is missing the adjustment - Apply patch - Reload - Total tax exc. is showing including the adjustmnt - Total tax inc. is showing including the adjustment Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 105444 [details] [review] Bug 25545: (follow-up) Fix capitalization Total + Adjustments + Shipment cost ($) changed to: Total + adjustments + shipment cost ($)
Not sure I agree with the capitalization change.. I'd say each 'piece' in the sum is it's own title.. as such should be treated as a noun and thus capitalized.. no?
Created attachment 105646 [details] [review] Bug 25545: Add adjustments to total tax included Adjustments are not affected by tax, they are meant as a way to alter invoice values after receiving (damaged items, refuneds, extra charges, etc) When adjustments were added the tax included column was missed To test: - Add a basket with at least one order - Close it - Receive shipment - Receive the order - Finish receiving - Add an adjustment of any amount - Verify in the invoice details table: - Total tax exc. is showing including the adjustmnt - Total tax inc. is missing the adjustment - Apply patch - Reload - Total tax exc. is showing including the adjustmnt - Total tax inc. is showing including the adjustment Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Created attachment 105647 [details] [review] Bug 25545: (follow-up) Fix capitalization Total + Adjustments + Shipment cost ($) changed to: Total + adjustments + shipment cost ($) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
No point in holding up QA.. I've SO'd on both, but leave the decision about capitalization I've raised to the RM
I think the follow-up is correct: "Total + adjustments + shipment cost"
Pushed to master for 20.11, thanks to everybody involved!
backported to 20.05.x for 20.05.01
backported to 19.11.x for 19.11.07
Backported to 19.05.x branch for 19.05.12