(BUG #4355) Basket.pl: withdrawal of the "can not close the basket" button

Basket.pl: withdrawal of the "can not close the basket"button. only Uncerain
prices button is displayed. And removing the "??" in the price columns,
replaced by "uncertain" in rrp column

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 60c2a64..1e27d8f 100755 (executable)
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -257,10 +257,8 @@ if ( $op eq 'delete_confirm' ) {
         $line{line_total}     = sprintf( "%.2f", $line_total );
         $line{odd}            = $i % 2;
         if ($line{uncertainprice}) {
-            $template->param( unclosable => 1 );
-            for my $key (qw/ecost line_total rrp/) {
-                $line{$key} .= '??';
-            }
+            $template->param( uncertainprices => 1 );
+            $line{rrp} .= ' (Uncertain)';
         }
        if ($line{'title'}){
            my $volume = $results[$i]->{'volume'};

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index e518f6d..18631d1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -78,8 +78,9 @@
                         // YUI Toolbar Functions
                         function yuiToolbar() {
                             <!-- TMPL_IF name="unclosable" -->
-                                new YAHOO.widget.Button("uncertpricesbutton");
                                 new YAHOO.widget.Button("closebutton", {disabled:true});
+                            <!-- TMPL_ELSIF name="uncertainprices" -->
+                                new YAHOO.widget.Button("uncertpricesbutton");
                             <!-- TMPL_ELSE -->
                                 new YAHOO.widget.Button("closebutton");
                             <!-- /TMPL_IF -->
@@ -94,6 +95,7 @@
                     <li><a href="javascript:confirm_deletion();" class="button" id="delbasketbutton">Delete this basket</a></li>
                     <!-- TMPL_IF name="unclosable" -->
                         <li><button onclick="confirm_close()" class="yui-button-disabled" id="closebutton" type="push" disabled="true" title="You can not close this basket" >Can not close basket</a></li>
+                    <!-- TMPL_ELSIF name="uncertainprices" -->
                         <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&amp;owner=1" class="button" id="uncertpricesbutton">Uncertain prices</a></li>
                     <!-- TMPL_ELSE -->
                         <li><a href="<!-- TMPL_VAR name="script_name" -->?op=close&amp;basketno=<!-- TMPL_VAR name="basketno" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->" class="button" id="closebutton">Close this basket</a></li>