Attachment 27423 Details for Bug 7180 – Bug 7180: QA followup 2

[patch] Bug 7180: QA followup 2

Bug-7180-QA-followup-2.patch (text/plain), 9.42 KB, created by Jonathan Druart on 2014-04-22 15:43:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-04-22 15:43:09 UTC

Size: 9.42 KB

patch

obsolete

>From 51684d346835ca50b39a8c8a141be45c651d5869 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 +-
> .../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       |   21 ++++++++++----------
> .../en/modules/admin/preferences/acquisitions.pref |    3 ++-
> 5 files changed, 23 insertions(+), 12 deletions(-)
>
>diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
>index 54c4414..f3c124e 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 8abe90d..7c7a5d9 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 c2c3cf2..3bac18b 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(' <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 c1af7ea..fcbe4d0 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&amp;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 %]&amp;basketno=[% basketno %]&amp;breedingid=[% biblio.import_record_id %]&amp;import_batch_id=[% biblio.import_batch_id %]&amp;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&amp;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 %]&amp;basketno=[% basketno %]&amp;breedingid=[% biblio.import_record_id %]&amp;import_batch_id=[% biblio.import_batch_id %]&amp;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 %] 
>                       </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>
>@@ -319,7 +320,7 @@
>                                 </li>
>                                 <li>
>                                     <div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
>-                                    <label for="sort1">Planning value 1: </label>
>+                                    <label for="sort1">Statistic 1: </label>
>                                     [% IF CGIsort1 %]
>                                         <select id="all_sort1" size="1" name="all_sort1">
>                                         [% FOREACH sort_opt IN CGIsort1 %]
>@@ -336,7 +337,7 @@
>                                 </li>
>                                 <li>
>                                   <span id="sort2_zone">
>-                                    <label for="sort2">Planning value 2: </label>
>+                                    <label for="sort2">Statistic 2: </label>
>                                     [% IF CGIsort2 %]
>                                         <select id="all_sort2" size="1" name="all_sort1">
>                                         [% 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 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

Actions: View | Diff | Splinter Review

Attachments on bug 7180: 6234 | 13019 | 15023 | 15048 | 15617 | 15677 | 15934 | 15935 | 16014 | 16505 | 16511 | 16544 | 16566 | 16613 | 19066 | 19067 | 19068 | 19316 | 19587 | 19588 | 19589 | 19590 | 19641 | 19645 | 20900 | 20901 | 20902 | 20903 | 20904 | 20926 | 20933 | 20934 | 20935 | 20978 | 20979 | 21004 | 21014 | 21017 | 21117 | 21462 | 21463 | 21464 | 21465 | 21466 | 21467 | 21468 | 21469 | 21470 | 21471 | 21472 | 21473 | 21474 | 21514 | 22546 | 22547 | 22548 | 22549 | 22550 | 22551 | 22552 | 22553 | 22554 | 22555 | 22556 | 22557 | 22558 | 22559 | 24052 | 24053 | 24054 | 24055 | 24056 | 24057 | 24058 | 24059 | 24060 | 24061 | 24062 | 24063 | 24064 | 24065 | 24636 | 24637 | 24638 | 24639 | 24640 | 24641 | 24642 | 24643 | 24644 | 24645 | 24646 | 24647 | 24648 | 24649 | 24708 | 24709 | 24710 | 24711 | 24712 | 24713 | 24714 | 24715 | 24716 | 24717 | 24718 | 24719 | 24720 | 24721 | 25908 | 26950 | 26951 | 26952 | 26953 | 26954 | 26955 | 26956 | 26957 | 26958 | 26959 | 26960 | 26961 | 26962 | 26963 | 26964 | 27128 | 27131 | 27136 | 27160 | 27325 | 27408 | 27409 | 27410 | 27411 | 27412 | 27413 | 27414 | 27415 | 27416 | 27417 | 27418 | 27419 | 27420 | 27421 | 27422 | 27423 | 27424 | 27451 | 27520 | 27561 | 27562 | 27563 | 27564 | 27565 | 27566 | 27567 | 27568 | 27569 | 27570 | 27571 | 27572 | 27573 | 27574 | 27575 | 27576 | 27577 | 27578 | 27829 | 27830 | 27831 | 27832 | 27833 | 27834 | 27835 | 27836 | 27837 | 27838 | 27839 | 27840 | 27841 | 27842 | 27843 | 27844 | 27845 | 27846 | 27847 | 27848 | 27849 | 27850 | 27851 | 27852 | 27853 | 27854 | 27855 | 27856 | 27857 | 27858 | 27859 | 27860 | 27861 | 27862 | 27863 | 27864 | 27865 | 27866