http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|gmcharlt@gmail.com |jonathan.druart@biblibre.co | |m Summary|Some prices calculation are |Some prices calculation are |done in ttemplate side |done in template side -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 33776 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=33776&action=edit 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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |12826 Depends on|12826 |13001 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #33776|0 |1 is obsolete| | --- Comment #3 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 34755 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=34755&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #34033|0 |1 is obsolete| | --- Comment #4 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 34756 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=34756&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 34760 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=34760&action=edit parcel - patch applied Both screenshots show the parcel page. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 34812 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=34812&action=edit on master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Signed Off --- Comment #9 from Jonathan Druart <jonathan.druart@biblibre.com> --- (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. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #11 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 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? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #34755|0 |1 is obsolete| | --- Comment #13 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 35429 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=35429&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 --- Comment #15 from Jonathan Druart <jonathan.druart@biblibre.com> --- Conflicts with bug 11944 fixed. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA Patch complexity|--- |Small patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 --- Comment #18 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 35565 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=35565&action=edit [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> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com Status|Passed QA |Pushed to Master --- Comment #20 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Patches pushed to master. Thanks Jonathan! -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13320 --- Comment #22 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- 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 -- You are receiving this mail because: You are watching all bug changes.