Created attachment 33776 [details] [review] Bug 13320: Move price calculation from tt to pl In parcel.tt, total are calculated for subtotal. This could be done in the pl script for more consistency. Test plan: Go on a parcel page with several already received orders. Orders must be linked to different funds. If possible ecost and unitprice (price on ordering and on receiving) should changed (different values will be displayed in the table). The values displayed before and after the patch must be the same.
Created attachment 34033 [details] [review] Bug 13320: Fix "Tax inc." vs "Tax exc." The parcel page always displayes "Tax exc." even when values don't include taxes. Test plan: On the parcel page, verify that the string "Tax *" is correct. This appears in the already received order table.
Created attachment 34755 [details] [review] Bug 13320: Move price calculation from tt to pl In parcel.tt, total are calculated for subtotal. This could be done in the pl script for more consistency. Test plan: Go on a parcel page with several already received orders. Orders must be linked to different funds. If possible ecost and unitprice (price on ordering and on receiving) should changed (different values will be displayed in the table). The values displayed before and after the patch must be the same. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Created attachment 34756 [details] [review] Bug 13320: Fix "Tax inc." vs "Tax exc." The parcel page always displayes "Tax exc." even when values don't include taxes. Test plan: On the parcel page, verify that the string "Tax *" is correct. This appears in the already received order table. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Created attachment 34759 [details] invoice - master Hi Jonathan, I hope I applied all the dependencies correctly: 12896 12969 13001 13320 I see a difference in the total, the actual cost seems not to be used for the total amount, I am attaching 2 screenshots - one for master and one with the patches applied.
Created attachment 34760 [details] parcel - patch applied Both screenshots show the parcel page.
Created attachment 34812 [details] on master
Comment on attachment 34812 [details] on master forget that.
(In reply to Katrin Fischer from comment #5) > Created attachment 34759 [details] > invoice - master > > Hi Jonathan, > > I hope I applied all the dependencies correctly: > 12896 > 12969 > 13001 > 13320 Bug 13001 depends on bug 12976, which is missing. The issue is fixed when the patches from bug 12976 are applied.
As some of the dependencies still need QA, I will work on them first.
Hi Jonathan, it looks like all dependencies are in master now, but I got problems applying this patch: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 13320: Move price calculation from tt to pl fatal: sha1 information is lacking or useless (acqui/parcel.pl). Can you take a look?
Bug 13001 is not in master, the status seems to be wrong.
Created attachment 35429 [details] [review] Bug 13320: Move price calculation from tt to pl In parcel.tt, total are calculated for subtotal. This could be done in the pl script for more consistency. Test plan: Go on a parcel page with several already received orders. Orders must be linked to different funds. If possible ecost and unitprice (price on ordering and on receiving) should changed (different values will be displayed in the table). The values displayed before and after the patch must be the same. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Created attachment 35430 [details] [review] Bug 13320: Fix "Tax inc." vs "Tax exc." The parcel page always displayes "Tax exc." even when values don't include taxes. Test plan: On the parcel page, verify that the string "Tax *" is correct. This appears in the already received order table. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Conflicts with bug 11944 fixed.
Created attachment 35563 [details] Screenshot of parcel page - TOTAL wrong? Hi Jonathan, this applies cleanly now and the values are the same as before - so this is looking good. But I am still wondering - could you take a look at the attachd screenshot? The sum of the TOTAL column doesn't make sense?
Created attachment 35564 [details] [review] [PASSED QA] Bug 13320: Move price calculation from tt to pl In parcel.tt, total are calculated for subtotal. This could be done in the pl script for more consistency. Test plan: Go on a parcel page with several already received orders. Orders must be linked to different funds. If possible ecost and unitprice (price on ordering and on receiving) should changed (different values will be displayed in the table). The values displayed before and after the patch must be the same. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 35565 [details] [review] [PASSED QA] Bug 13320: Fix "Tax inc." vs "Tax exc." The parcel page always displayes "Tax exc." even when values don't include taxes. Test plan: On the parcel page, verify that the string "Tax *" is correct. This appears in the already received order table. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Patch doesn't change display apart from optional formatting of the amounts. So I am passing it - still curious about the TOTAL column, maybe something for yet another tax bug?
Patches pushed to master. Thanks Jonathan!
(In reply to Katrin Fischer from comment #19) > Patch doesn't change display apart from optional formatting of the amounts. > So I am passing it - still curious about the TOTAL column, maybe something > for yet another tax bug? Jonathan?
Jonathan and I discussed it on IRC and I think we agreed that some other patch in the series will fix it, so there was no need for a new bug report
Yes, as I noted in the commit msg "The values displayed before and after the patch must be the same". I tested on the 13323 branch, and the values are fixed.