[MT2370] Basket header workflow improvement

The "Data Recorded" page was useless, I removed it.

diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl
index 58e5773..47f210e 100755 (executable)
--- a/acqui/basketheader.pl
+++ b/acqui/basketheader.pl
@@ -112,13 +112,14 @@ if ( $op eq 'add_form' ) {
 #End Edit
 } elsif ( $op eq 'add_validate' ) {
 #we are confirming the changes, save the basket
-    $template->param(add_validate => 1);
+    my $basketno;
     if ( $is_an_edit ) {
+        $basketno = $input->param('basketno');
         ModBasketHeader($input->param('basketno'),$input->param('basketname'),$input->param('basketnote'),$input->param('basketbooksellernote'),$input->param('basketcontractnumber'));
-        $template->param( basketno => $basketno );
     } else { #New basket
-        my $basketno = NewBasket($booksellerid, $loggedinuser, $input->param('basketname'), $input->param('basketnote'), $input->param('basketbooksellernote'), $input->param('basketcontractnumber'));
-        $template->param( basketno => $basketno );
+        $basketno = NewBasket($booksellerid, $loggedinuser, $input->param('basketname'), $input->param('basketnote'), $input->param('basketbooksellernote'), $input->param('basketcontractnumber'));
     }
+    print $input->redirect('basket.pl?basketno='.$basketno);
+    exit 0;
 }
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl
index 91e6773..1fb9d4f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl
@@ -94,7 +94,7 @@ li.list2 {
     <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR name="booksellername" --></a> &rsaquo;
     <!-- TMPL_IF NAME="add_form" -->
         <!-- TMPL_IF NAME="basketno" -->Edit basket '<!-- TMPL_VAR NAME="basketname" -->'
-        <!-- TMPL_ELSE -->Add a basket
+        <!-- TMPL_ELSE -->add a basket to <!-- TMPL_VAR name="booksellername" -->
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
 </div>
@@ -155,10 +155,6 @@ li.list2 {
         </fieldset>
     </form>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="add_validate" -->
-        <h3>Data recorded</h3>
-        <META HTTP-EQUIV=Refresh CONTENT="0; URL=basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">
-     <!-- /TMPL_IF -->
 </div>
 </div>
 <div class="yui-b">