From 5d69ebdc4cf2108073881cce3382f570ed76208e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 15 Apr 2014 16:31:18 +0200 Subject: [PATCH] Bug 7180: (follow-up) fix various issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * fix calculation of discount * add CSS for unselected rows * fix Javascript error * correct capitalization * use “Statistic” instead of “Planning value” * improve description of system preference Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton --- acqui/addorderiso2709.pl | 2 +- .../prog/en/css/staff-global.css | 6 ++++++ koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 3 +++ .../prog/en/modules/acqui/addorderiso2709.tt | 21 ++++++++++--------- .../admin/preferences/acquisitions.pref | 3 ++- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 54c4414aba..f3c124ec8a 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 aa6a0fd6b8..829d9ae418 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 c2c3cf247a..3bac18bc8a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/acq.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/acq.js @@ -215,6 +215,9 @@ function calcNewsuggTotal(){ } function getAuthValueDropbox( name, cat, destination, selected ) { + if ( typeof(selected) == 'undefined' ) { + selected = ""; + } if (cat == null || cat == "") { $(destination).replaceWith(' ' ); 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 0e5dd12d3e..f0fda558ee 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -146,8 +146,8 @@
- Check All - Uncheck All + Check all + Uncheck all @@ -165,9 +165,9 @@ [% biblio.citation %] - ( Show MARC | Card ; Add order ) - - + + ( MARC | Card | Add order ) +
  1. @@ -196,7 +196,7 @@
  2. - + %
  3. @@ -216,11 +216,11 @@ [% END %]
  4. - +
  5. - +
@@ -266,6 +266,7 @@ [% END %]
+

Import all the checked items in the basket with the following accounting details (used only if no information is filled for the item):

Accounting details
    @@ -314,7 +315,7 @@
  1. The 2 following fields are available for your own usage. They can be useful for statistical purposes
    - + [% IF CGIsort1 %] [% FOREACH sort_opt IN CGIsort2 %] 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 008d2143f0..66829e7332 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:
    price: 947$a|947$c
    quantity: 969$h
    budget_code: 922$a" + - "You can use the following fields: price, quantity, budget_code, discount, sort1, sort2" + - "
    For example:
    price: 947$a|947$c
    quantity: 969$h
    budget_code: 922$a" Printing: - - Use the -- 2.39.5