Bugzilla – Attachment 45541 Details for
Bug 12993
Add a default tax rate on item types
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12993: (qa-follow-up) Display the column only when it is useful
Bug-12993-qa-follow-up-Display-the-column-only-whe.patch (text/plain), 3.17 KB, created by
Alex Arnaud
on 2015-12-09 16:00:50 UTC
(
hide
)
Description:
Bug 12993: (qa-follow-up) Display the column only when it is useful
Filename:
MIME Type:
Creator:
Alex Arnaud
Created:
2015-12-09 16:00:50 UTC
Size:
3.17 KB
patch
obsolete
>From f5709f1a7b68375feee70c1950ca0728783bb967 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 19 Jan 2015 16:46:56 +0100 >Subject: [PATCH] Bug 12993: (qa-follow-up) Display the column only when it is > useful > >As mention by comment 19, the default tax rate defined for item types is >only useful when the items are created on ordering and the item type is >defined at the biblio level. >--- > .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index eaf4cef..3f400f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -222,10 +222,13 @@ Item types administration > <label for="rentalcharge">Rental charge: </label> > <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="[% rentalcharge %]" /> > </li> >+ >+ [%# The tax rate is only useful if the item are created on ordering and if the item type is defined at the biblio level %] >+ [% IF Koha.Preference('AcqCreateItem') eq 'ordering' and Koha.Preference('item-level_itypes') eq '0' %] > <li> > <label for="gstrate">Tax rate: </label> > <select name="gstrate" id="gstrate"> >- <option value="">No default</option> >+ <option value="">Manual</option> > [% FOREACH gst IN gst_values %] > [% IF gst.option == gstrate %] > <option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format("%.1f") %]%</option> >@@ -235,6 +238,7 @@ Item types administration > [% END %] > </select> > </li> >+ [% END %] > <li> > <label for="checkinmsg">Checkin message: </label> > <textarea id="checkinmsg" name="checkinmsg" cols="55" rows="5">[% checkinmsg %]</textarea> >@@ -323,7 +327,10 @@ Item types administration > <th>Not for loan</th> > <th>Hide in OPAC</th> > <th>Charge</th> >- <th>Tax rate</th> >+ [%# The tax rate is only useful if the item are created on ordering and if the item type is defined at the biblio level %] >+ [% IF Koha.Preference('AcqCreateItem') eq 'ordering' and Koha.Preference('item-level_itypes') eq '0' %] >+ <th>Tax rate</th> >+ [% END %] > <th>Checkin message</th> > <th>Actions</th> > </thead> >@@ -358,10 +365,16 @@ Item types administration > [% loo.rentalcharge %] > [% END %] > </td> >+ [%# The tax rate is only useful if the item are created on ordering and if the item type is defined at the biblio level %] >+ [% IF Koha.Preference('AcqCreateItem') eq 'ordering' and Koha.Preference('item-level_itypes') eq '0' %] > <td> > [% IF loo.gstrate.length > 0 %] > [% loo.gstrate * 100 | format("%.1f") %]% >+ [% ELSE %] >+ Manual > [% END %] >+ </td> >+ [% END %] > <td>[% loo.checkinmsg | html_line_break %]</td> > <td> > <a href="[% loo.script_name %]?op=add_form&itemtype=[% loo.itemtype |html %]">Edit</a> >-- >1.7.10.4
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 12993
:
31863
|
32018
|
32284
|
33305
|
33306
|
33307
|
34797
|
35394
|
39566
|
39567
|
39568
|
39569
|
45538
|
45539
|
45540
| 45541 |
45542
|
45543