gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <isabelle.beroud@univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
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 <gmc@esilibrary.com>
This commit is contained in:
Mathieu Saby 2013-09-20 13:09:38 +02:00 committed by Galen Charlton
parent 9237ee80c4
commit 1b56285e22
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
View File

@ -383,7 +383,7 @@ $(document).ready(function()
[% END %][%# UNLESS subscriptionid %]
[% END %][%# IF (AcqCreateItemOrdering) %]
<fieldset class="rows">
<legend>Accounting details</legend>
<legend>Accounting details [% close %]</legend>
<ol>
<li>
[% IF ( close ) %]
@ -445,10 +445,10 @@ $(document).ready(function()
<li>
[% IF ( close ) %]
<span class="label">Vendor price: </span>
<input type="hidden" name="listprice" id="listprice" value="[% listprice %]" />[% listprice %]
<input type="hidden" name="listprice" id="listprice" value="[% listprice %]" />[% listprice %] [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
[% ELSE %]
<label for="listprice">Vendor price: </label>
<input type="text" size="20" name="listprice" id="listprice" value="[% listprice %]" onchange="updateCosts()" />
<input type="text" size="20" name="listprice" id="listprice" value="[% listprice %]" onchange="updateCosts()" /> [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
[% END %]
</li>
[% UNLESS ( close ) %]
@ -501,19 +501,19 @@ $(document).ready(function()
<li>
[% IF ( close ) %]
<span class="label">Replacement cost: </span>
<input type="hidden" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %]
<input type="hidden" name="rrp" id="rrp" value="[% rrp %]" />[% rrp %] (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
[% ELSE %]
<label for="rrp">Replacement cost: </label>
<input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /> (adjusted for [% cur_active %])
<input type="text" size="20" name="rrp" id="rrp" value="[% rrp %]" /> (adjusted for [% cur_active %], [% IF (listincgst == 1) %]tax inc.[% ELSE %]tax exc.[% END %])
[% END %]
</li>
<li>
[% IF ( close ) %]
<label for="ecost">Budgeted cost: </label>
<input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" readonly="readonly" />
<input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" readonly="readonly" /> [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
[% ELSE %]
<label for="ecost">Budgeted cost: </label>
<input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" />
<input type="text" size="20" name="ecost" id="ecost" value="[% ecost %]" /> [% IF (listincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
[% END %]
</li>
<li>
@ -528,10 +528,10 @@ $(document).ready(function()
<li>
[% IF ( close ) %]
<label for="unitprice">Actual cost: </label>
<input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice %]" readonly="readonly" />
<input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice %]" readonly="readonly" /> [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
[% ELSE %]
<label for="unitprice">Actual cost: </label>
<input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice %]" />
<input type="text" id="unitprice" size="20" name="unitprice" value="[% unitprice %]" /> [% IF (invoiceincgst == 1) %](tax inc.)[% ELSE %](tax exc.)[% END %]
[% END %]
</li>
<li>