From 2259cf017fcca0916d2590e9279c259b1879b054 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Tue, 15 Apr 2014 16:31:18 +0200
Subject: [PATCH] Bug 7180: QA followup 2
This patch takes into account all QA failures raised in comment 207.
---
acqui/addorderiso2709.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css | 6 ++++++
koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 3 +++
.../prog/en/modules/acqui/addorderiso2709.tt | 17 +++++++++--------
.../en/modules/admin/preferences/acquisitions.pref | 3 ++-
5 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index f165a25..c34393e 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -174,7 +174,7 @@ if ($op eq ""){
my $c_quantity = shift( @quantities ) || GetMarcQuantity($marcrecord, C4::Context->preference('marcflavour') ) || 1;
my $c_budget_id = shift( @budgets_id ) || $input->param('all_budget_id') || $budget_id;
my $c_discount = shift ( @discount);
- $c_discount = $c_discount / 100 if $c_discount > 100;
+ $c_discount = $c_discount / 100 if $c_discount > 1;
my $c_sort1 = shift( @sort1 ) || $input->param('all_sort1') || '';
my $c_sort2 = shift( @sort2 ) || $input->param('all_sort2') || '';
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 8557977..1a174bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -554,6 +554,12 @@ padding: 0;
width: 100%;
}
+fieldset.rows.unselected {
+ background-color: white;
+ border-width : 0px;
+ border: 0;
+}
+
fieldset.rows legend {
margin-left: 1em;
font-weight: bold;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
index 3af97bb..dbd2989 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js
@@ -673,6 +673,9 @@ function calcNewsuggTotal(){
}
function getAuthValueDropbox( name, cat, destination, selected ) {
+ if ( typeof(selected) == 'undefined' ) {
+ selected = "";
+ }
if (cat == null || cat == "") {
$(destination).replaceWith(' <input type="text" name="' + name + '" value="' + selected + '" />' );
return;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 3abb053..f540186 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -151,8 +151,8 @@
</ul>
<div id="records_to_import">
- <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
- <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
+ <span class="checkall"><a id="checkAll" href="#">Check all</a></span>
+ <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck all</a></span>
<input type="hidden" name="op" value="import_records"/>
<input type="hidden" name="basketno" value="[% basketno %]" />
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
@@ -170,9 +170,9 @@
<input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
<span class="citation">[% biblio.citation %]</span>
</label>
- ( Show <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% biblio.import_record_id %]" title="Card" rel="gb_page_center[600,500]">Card</a> ; <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&breedingid=[% biblio.import_record_id %]&import_batch_id=[% biblio.import_batch_id %]&biblionumber=[% biblio.match_biblionumber %]">Add order</a> )
-
-
+ <span class="links" style="font-weight: normal;">
+ ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% biblio.import_record_id %]" title="Card" rel="gb_page_center[600,500]">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]&breedingid=[% biblio.import_record_id %]&import_batch_id=[% biblio.import_batch_id %]&biblionumber=[% biblio.match_biblionumber %]">Add order</a> )
+ </span>
</legend>
<ol>
<li class="status">
@@ -201,7 +201,7 @@
</li>
<li class="discount">
<label for="discount_record_[% biblio.import_record_id %]">Discount: </label>
- <input id="discount_record_[% biblio.import_record_id %]" type="text" value="[% biblio.discount %]" name="discount" />
+ <input id="discount_record_[% biblio.import_record_id %]" type="text" value="[% biblio.discount %]" name="discount" size="6" /> %
</li>
<li class="budget">
<label for="fund_record_[% biblio.import_record_id %]">Fund: </label>
@@ -221,11 +221,11 @@
[% END %]
</li>
<li class="sort1">
- <label for="sort1_record_[% biblio.import_record_id %]">Planning value 1: </label>
+ <label for="sort1_record_[% biblio.import_record_id %]">Statistic 1: </label>
<input id="sort1_record_[% biblio.import_record_id %]" type="text" id="sort1" size="20" name="sort1" value="[% biblio.sort1 %]" />
</li>
<li class="sort2">
- <label for="sort2_record_[% biblio.import_record_id %]">Planning value 2: </label>
+ <label for="sort2_record_[% biblio.import_record_id %]">Statistic 2: </label>
<input id="sort2_record_[% biblio.import_record_id %]" type="text" id="sort2" size="20" name="sort2" value="[% biblio.sort2 %]" />
</li>
</ol>
@@ -271,6 +271,7 @@
[% END %] <!-- items -->
</div>
<div id="accounting_details">
+ <p>Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):</p>
<fieldset class="rows" style="float:none;">
<legend>Accounting details</legend>
<ol>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index 008d214..66829e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -49,7 +49,8 @@ Acquisitions:
- Set the mapping values for a new order line created from a marcrecord (staged file).
- pref: MarcFieldsToOrder
type: textarea
- - "For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a<rb/>"
+ - "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2"
+ - "<br/>For example:<br/>price: 947$a|947$c<br/>quantity: 969$h<br/>budget_code: 922$a"
Printing:
-
- Use the
--
1.7.10.4