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

Merge remote-tracking branch 'origin/new/bug_8832' into 3.10.x

This commit is contained in:
Paul Poulain 2012-11-12 14:23:14 +01:00
parent 9a8d24b99b 06016055c6
commit 2c3e313ff1
4 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
installer/data/mysql/updatedatabase.pl
View File

@ -6020,6 +6020,27 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
$DBversion = "3.09.00.063";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
my $gst_booksellers = $dbh->selectcol_arrayref("SELECT DISTINCT(gstrate) FROM aqbooksellers");
my $gist_syspref = C4::Context->preference("gist");
# remove the undef values and construct and array with the syspref and the supplier values
my @gstrates = map { defined $_ ? $_ : () } @$gst_booksellers;
push @gstrates, split ('\|', $gist_syspref);
# we want to compare integer (or float)
$_ = $_ + 0 for @gstrates;
use List::MoreUtils qw/uniq/;
# remove duplicate values
@gstrates = uniq sort @gstrates;
my $new_syspref_value = join '|', @gstrates;
# update the syspref with the new values
my $sth = $dbh->prepare("UPDATE systempreferences set value=? WHERE variable='gist'");
$sth->execute( $new_syspref_value );
print "Upgrade to $DBversion done (Bug 8832, Set the syspref gist with the existing values)\n";
SetVersion ($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)

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

@ -451,23 +451,27 @@ $(document).ready(function()
[% END %]
</li>
[% END %]
<li>
[% IF ( close ) %]
<span class="label">Tax rate: </span>
<input type="hidden" size="20" name="gstrate" id="gstrate" value="[% gstrate %]" />[% gstrate %]%
[% ELSE %]
<label for="gst">Tax rate: </label>
<select name="gstrate" id="gstrate" onchange="updateCosts();">
[% FOREACH gst IN gst_values %]
[% IF ( gst.option == gstrate ) %]
<option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format("%.1f") %]%</option>
[% ELSE %]
<option value="[% gst.option %]">[% gst.option * 100 | format("%.1f") %]%</option>
[% END %]
[% IF ( gst_values ) %]
<li>
[% IF ( close ) %]
<span class="label">Tax rate: </span>
<input type="hidden" size="20" name="gstrate" id="gstrate" value="[% gstrate %]" />[% gstrate %]%
[% ELSE %]
<label for="gst">Tax rate: </label>
<select name="gstrate" id="gstrate" onchange="updateCosts();">
[% FOREACH gst IN gst_values %]
[% IF ( gst.option == gstrate ) %]
<option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format("%.1f") %]%</option>
[% ELSE %]
<option value="[% gst.option %]">[% gst.option * 100 | format("%.1f") %]%</option>
[% END %]
[% END %]
</select>
[% END %]
</select>
[% END %]
</li>
[% ELSE %]
<input type="hidden" name="gstrate" value="0" />
</li>
[% END %]
<li>
<label for="discount">Discount: </label>
[% IF ( close ) %]

12
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
View File

@ -156,8 +156,9 @@ if (f.company.value == "") {
<label for="invoice_gstno">Don't include tax</label> <input type="radio" id="invoice_gstno" name="invoice_gst" value="0" checked="checked" />
[% END %]</li>
</ol>
<ol>
<li>
[% IF gst_values %]
<ol>
<li>
<label for="gst">Tax rate</label>
<select name="gstrate" id="gstrate">
[% FOREACH gst IN gst_values %]
@ -168,8 +169,11 @@ if (f.company.value == "") {
[% END %]
[% END %]
</select>
</li>
</ol>
</li>
</ol>
[% ELSE %]
<input type="hidden" name="gstrate" value="0" />
[% END %]
<ol>
<li><label for="discount">Discount</label>
<input type="text" size="6" id="discount" name="discount" value="[% discount %]" />%</li>

2
kohaversion.pl
View File

@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
use strict;
sub kohaversion {
our $VERSION = '3.09.00.062';
our $VERSION = '3.09.00.063';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install