when closing a basket without creating a basketgroup, the group is still created => corrected + replace "create a basketgroup?" by "create a purchase order now?" in confirmation step. --- acqui/basket.pl | 2 +- .../prog/en/modules/acqui/basket.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/acqui/basket.pl b/acqui/basket.pl index 5947b0b..96c3a32 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -161,7 +161,7 @@ if ( $op eq 'delete_confirm' ) { basketgroupid => $basketgroupid } ); print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid='.$booksellerid); } else { - print $query->redirect('/cgi-bin/koha/acqui/basketgroup.pl?basketno='.$basketno.'&op=attachbasket&booksellerid=' . $booksellerid); + print $query->redirect('/cgi-bin/koha/acqui/booksellers.pl?supplierid=' . $booksellerid); } exit; } else { 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 d54906b..665e2a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -298,7 +298,7 @@ <form action="/cgi-bin/koha/acqui/basket.pl" class="confirm"> <h1>Are you sure you want to close basket <!-- TMPL_VAR name="basketname" -->?</h1> <p> - <label for="createbasketgroup">Create basket group?</label> + <label for="createbasketgroup">create a purchase order now?</label> <input type="checkbox" id="createbasketgroup" name="createbasketgroup"/> </p> <input type="hidden" id="basketno" value="<!-- TMPL_VAR name="basketno" -->" name="basketno" /> -- 1.6.3.3 _______________________________________________ Koha-patches mailing list Koha-patches@lists.koha.org http://lists.koha.org/mailman/listinfo/koha-patches