Bugzilla – Attachment 24110 Details for
Bug 10922
Display if prices are tax exc. or inc. when creating a new order
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10922: Display if prices are tax exc. or inc. when creating a new order
Bug-10922-Display-if-prices-are-tax-exc-or-inc-whe.patch (text/plain), 5.38 KB, created by
Biblibre Sandboxes
on 2014-01-10 10:23:32 UTC
(
hide
)
Description:
Bug 10922: Display if prices are tax exc. or inc. when creating a new order
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2014-01-10 10:23:32 UTC
Size:
5.38 KB
patch
obsolete
>From 2d49a2cd8d778d7dc59ac0dacc3a6ebf2832b386 Mon Sep 17 00:00:00 2001 >From: Mathieu Saby <mathieu.saby@univ-rennes2.fr> >Date: Fri, 20 Sep 2013 13:09:38 +0200 >Subject: [PATCH] Bug 10922: Display if prices are tax exc. or inc. 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. >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@univ-lyon3.fr <isabelle.beroud@univ-lyon3.fr> >--- > .../prog/en/modules/acqui/neworderempty.tt | 18 +++++++++--------- > 1 files 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 c261530..859ea72 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) %] > <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> >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10922
:
21273
|
24110
|
24555