From 1b56285e2250737a1a2282f2e3e8b4d0f1e0818c Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Fri, 20 Sep 2013 13:09:38 +0200 Subject: [PATCH] Bug 10922: Display whether prices are include or don't include tax when creating a new order This patch adds "(tax inc.)" or "(tax exc.)" after the "Vendor price", "Replacement cost", "Budgeted cost" and "Actual cost" when entering a new order. This reflects the value of the list and invoice prices include/don't include tax flags in the vendor record. Actual cost must probably not be displayed here, but it will be the subject of an other patch. To test : - create 2 vendors, with differents values for "List prices includes tax" and "Invoiced prices does includes tax" options - create baskets for these 2 vendors - create an order in each basket, and look at the "tax. inc." and "tax exc" mention. It should be consistent with the options for each vendor - look at an order adding "&close=1" to the normal URL of the order. You must see the order without ability to edit it, but with the same mentions "tax inc." and "tax exc." Signed-off-by: Isabelle Beroud Signed-off-by: Katrin Fischer Passes tests and QA script. I have some doubts about the calculations done here, but the display changes are correct. Signed-off-by: Galen Charlton --- .../prog/en/modules/acqui/neworderempty.tt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index c261530629..859ea72613 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -383,7 +383,7 @@ $(document).ready(function() [% END %][%# UNLESS subscriptionid %] [% END %][%# IF (AcqCreateItemOrdering) %]
- Accounting details + Accounting details [% close %]
  1. [% IF ( close ) %] @@ -445,10 +445,10 @@ $(document).ready(function()
  2. [% IF ( close ) %] Vendor price: - [% listprice %] + [% listprice %] [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] [% ELSE %] - + [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] [% END %]
  3. [% UNLESS ( close ) %] @@ -501,19 +501,19 @@ $(document).ready(function()
  4. [% IF ( close ) %] Replacement cost: - [% rrp %] + [% rrp %] (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %]) [% ELSE %] - (adjusted for [% cur_active %]) + (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %]) [% END %]
  5. [% IF ( close ) %] - + [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] [% ELSE %] - + [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] [% END %]
  6. @@ -528,10 +528,10 @@ $(document).ready(function()
  7. [% IF ( close ) %] - + [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] [% ELSE %] - + [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %] [% END %]
  8. -- 2.39.5